This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch 1.X
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
The following commit(s) were added to refs/heads/1.X by this push:
new 77d8f01a Modernize build
77d8f01a is described below
commit 77d8f01a1ebc0590e9ce79c25f32d2c4b9391687
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Apr 14 09:18:41 2024 -0400
Modernize build
- Bump commons-parent from 47 to 69
- Bump Java requirement from Java 6 to 7
---
.github/workflows/maven.yml | 13 +-
pom.xml | 406 +++++++++++++++++++++-----------------------
src/changes/changes.xml | 1 +
3 files changed, 204 insertions(+), 216 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 7e06d2b9..c60fe81a 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -31,11 +31,13 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
- java: [ 8, 11 ]
+ java: [ 8, 11, 17 ]
experimental: [false]
-# include:
-# - java: 22-ea
-# experimental: true
+ include:
+ - java: 21
+ experimental: true
+ - java: 23-ea
+ experimental: true
steps:
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
@@ -53,6 +55,7 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Build with Maven
- run: mvn --show-version --batch-mode --no-transfer-progress -e
+# run: mvn --show-version --batch-mode --no-transfer-progress -e
+ run: mvn --show-version --batch-mode --no-transfer-progress -e
-Dmoditect.skip
# For Java 11, you can be more strict:
-DadditionalJOption=-Xdoclint/package:-org.apache.commons.configuration2.plist
diff --git a/pom.xml b/pom.xml
index 04c0d13b..f2bde634 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>47</version>
+ <version>69</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-beanutils</groupId>
@@ -32,50 +32,29 @@
<url>https://commons.apache.org/proper/commons-beanutils/</url>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
<commons.componentid>beanutils</commons.componentid>
- <commons.release.version>1.9.4</commons.release.version>
- <!-- use later build plugin to generate sha256 hash refs. Can be
removed when the pom moves to CP48 -->
- <commons.build-plugin.version>1.10</commons.build-plugin.version>
- <commons.release.hash>sha256</commons.release.hash>
+ <commons.release.version>1.9.5</commons.release.version>
<commons.jira.id>BEANUTILS</commons.jira.id>
<commons.jira.pid>12310460</commons.jira.pid>
<!-- limit memory size see BEANUTILS-291; allow command-line override -->
<!-- Originally 25M, increased to 50M to get round Continuum CI build
failures -->
<surefire.argLine>-Xmx50M</surefire.argLine>
-
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
-
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-beanutils</commons.scmPubUrl>
<commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
-
- <checkstyle.plugin.version>3.0.0</checkstyle.plugin.version>
- <checkstyle.version>8.21</checkstyle.version>
-
- <commons.pmd-plugin.version>3.8</commons.pmd-plugin.version>
-
- <spotbugs.plugin.version>3.1.10</spotbugs.plugin.version>
-
- <commons.jacoco.version>0.8.2</commons.jacoco.version>
-
+
<project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp>
<!-- generate report even if there are binary incompatible changes -->
<commons.japicmp.breakBuildOnBinaryIncompatibleModifications>false</commons.japicmp.breakBuildOnBinaryIncompatibleModifications>
- <!-- 0.12.0 dies with a NullPointerException -->
- <commons.japicmp.version>0.13.0</commons.japicmp.version>
<japicmp.skip>false</japicmp.skip>
-
<!-- Commons Release Plugin -->
- <commons.bc.version>1.9.3</commons.bc.version>
- <commons.rc.version>RC2</commons.rc.version>
+ <commons.bc.version>1.9.4</commons.bc.version>
+ <commons.rc.version>RC1</commons.rc.version>
<commons.release.isDistModule>true</commons.release.isDistModule>
<commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
- <commons.releaseManagerName>Rob Tompkins</commons.releaseManagerName>
-
<commons.releaseManagerKey>B6E73D84EA4FCC47166087253FAAD2CD5ECBB314</commons.releaseManagerKey>
</properties>
-
-
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/BEANUTILS</url>
@@ -95,6 +74,183 @@
</site>
</distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections-testframework</artifactId>
+ <version>3.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <defaultGoal>clean apache-rat:check verify clirr:check</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <!-- limit memory size see BEANUTILS-291 -->
+ <argLine>${surefire.argLine}</argLine>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ <excludes>
+ <!-- This test case is known to fail, and there isn't any
proposed fix
+ - so we will just exclude it until someone comes up with a
solution.
+ -->
+ <exclude>**/*MemoryTestCase.java</exclude>
+ </excludes>
+
+ <!-- Configure Logging -->
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemPropertyVariables>
+
<org.apache.commons.logging.LogFactory>org.apache.commons.logging.impl.LogFactoryImpl</org.apache.commons.logging.LogFactory>
+
<org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
+
<org.apache.commons.logging.simplelog.defaultlog>WARN</org.apache.commons.logging.simplelog.defaultlog>
+ </systemPropertyVariables>
+
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <!-- Disabled as it is not Java 6 compatible
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <version>${commons.japicmp.version}</version>
+ </plugin>
+ -->
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <!-- when moving to svnpubsub links to previous releases must be
fixed -->
+ <!-- ignore paths manual content -->
+ <ignorePathsToDelete>
+ <ignorePathToDelete>javadocs**</ignorePathToDelete>
+ <ignorePathToDelete>release-notes**</ignorePathToDelete>
+ </ignorePathsToDelete>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <linksource>true</linksource>
+ <links>
+
<link>http://docs.oracle.com/javase/1.5.0/docs/api/</link>
+
<link>http://commons.apache.org/collections/api-release/</link>
+ </links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>${commons.changes.version}</version>
+ <configuration>
+ <issueLinkTemplatePerSystem>
+ <default>%URL%/%ISSUE%</default>
+ </issueLinkTemplatePerSystem>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+
+ <profiles>
+ <profile>
+ <id>setup-checkout</id>
+ <activation>
+ <file>
+ <missing>site-content</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-checkout</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>pre-site</phase>
+ <configuration>
+ <tasks>
+ <exec executable="svn">
+ <arg line="checkout --depth immediates
${commons.scmPubUrl} ${commons.scmPubCheckoutDirectory}"/>
+ </exec>
+ <exec executable="svn">
+ <arg line="update --set-depth exclude
${commons.scmPubCheckoutDirectory}/javadocs"/>
+ </exec>
+ <pathconvert pathsep=" " property="dirs">
+ <dirset dir="${commons.scmPubCheckoutDirectory}"
includes="*"/>
+ </pathconvert>
+ <exec executable="svn">
+ <arg line="update --set-depth infinity ${dirs}"/>
+ </exec>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<developers>
<developer>
<name>Robert Burrell Donkin</name>
@@ -211,12 +367,19 @@
<organization>The Apache Software Foundation</organization>
</developer>
<developer>
- <name>Gary Gregory</name>
<id>ggregory</id>
- <email>[email protected]</email>
- <url>http://www.garygregory.com</url>
- <timezone>-5</timezone>
+ <name>Gary Gregory</name>
+ <email>ggregory at apache.org</email>
+ <url>https://www.garygregory.com</url>
<organization>The Apache Software Foundation</organization>
+ <organizationUrl>https://www.apache.org/</organizationUrl>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ <timezone>America/New_York</timezone>
+ <properties>
+
<picUrl>https://people.apache.org/~ggregory/img/garydgregory80.png</picUrl>
+ </properties>
</developer>
<developer>
<id>stain</id>
@@ -233,7 +396,6 @@
<organization>The Apache Software Foundation</organization>
</developer>
</developers>
-
<contributors>
<contributor>
<name>Paul Jack</name>
@@ -344,182 +506,4 @@
<email></email>
</contributor>
</contributors>
-
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections-testframework</artifactId>
- <version>3.2.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <defaultGoal>clean apache-rat:check verify clirr:check</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <!-- limit memory size see BEANUTILS-291 -->
- <argLine>${surefire.argLine}</argLine>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- <excludes>
- <!-- This test case is known to fail, and there isn't any
proposed fix
- - so we will just exclude it until someone comes up with a
solution.
- -->
- <exclude>**/*MemoryTestCase.java</exclude>
- </excludes>
-
- <!-- Configure Logging -->
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <systemPropertyVariables>
-
<org.apache.commons.logging.LogFactory>org.apache.commons.logging.impl.LogFactoryImpl</org.apache.commons.logging.LogFactory>
-
<org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
-
<org.apache.commons.logging.simplelog.defaultlog>WARN</org.apache.commons.logging.simplelog.defaultlog>
- </systemPropertyVariables>
-
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <!-- Disabled as it is not Java 6 compatible
- <plugin>
- <groupId>com.github.siom79.japicmp</groupId>
- <artifactId>japicmp-maven-plugin</artifactId>
- <version>${commons.japicmp.version}</version>
- </plugin>
- -->
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <!-- when moving to svnpubsub links to previous releases must be
fixed -->
- <!-- ignore paths manual content -->
- <ignorePathsToDelete>
- <ignorePathToDelete>javadocs**</ignorePathToDelete>
- <ignorePathToDelete>release-notes**</ignorePathToDelete>
- </ignorePathsToDelete>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
- <enableRulesSummary>false</enableRulesSummary>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <linksource>true</linksource>
- <links>
-
<link>http://docs.oracle.com/javase/1.5.0/docs/api/</link>
-
<link>http://commons.apache.org/collections/api-release/</link>
- </links>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>${commons.changes.version}</version>
- <configuration>
- <issueLinkTemplatePerSystem>
- <default>%URL%/%ISSUE%</default>
- </issueLinkTemplatePerSystem>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
-
- <profiles>
- <profile>
- <id>setup-checkout</id>
- <activation>
- <file>
- <missing>site-content</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-checkout</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>pre-site</phase>
- <configuration>
- <tasks>
- <exec executable="svn">
- <arg line="checkout --depth immediates
${commons.scmPubUrl} ${commons.scmPubCheckoutDirectory}"/>
- </exec>
- <exec executable="svn">
- <arg line="update --set-depth exclude
${commons.scmPubCheckoutDirectory}/javadocs"/>
- </exec>
- <pathconvert pathsep=" " property="dirs">
- <dirset dir="${commons.scmPubCheckoutDirectory}"
includes="*"/>
- </pathconvert>
- <exec executable="svn">
- <arg line="update --set-depth infinity ${dirs}"/>
- </exec>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 550d1b41..fcd22b89 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,7 @@
<body>
<release version="1.9.5" date="YYYY-MM-DD" description="This is a
maintenance release.">
<action issue="BEANUTILS-541" dev="ggregory" type="fix" due-to="Sergey
Chernov">FluentPropertyBeanIntrospector caches corrupted writeMethod (1.x
backport) #69.</action>
+ <action dev="ggregory" type="fix" due-to="Gary Gregory">Bump Java
requirement from Java 6 to 7.</action>
</release>
<release version="1.9.4" date="2019-06-12" description="The primary reason
for this release is a bugfix for
CVE-2014-0114. More specifically, our goal with BEANUTILS-520
