Author: chtompki
Date: Mon Oct 29 11:52:28 2018
New Revision: 1845106
URL: http://svn.apache.org/viewvc?rev=1845106&view=rev
Log:
Merge in 2.4 release, upversion 2.5-SNAPSHOT in pom.xml
Added:
commons/proper/configuration/trunk/RELEASE-NOTES.txt
- copied unchanged from r1845105,
commons/proper/configuration/tags/CONFIGURATION_2_4/RELEASE-NOTES.txt
Modified:
commons/proper/configuration/trunk/ (props changed)
commons/proper/configuration/trunk/pom.xml
commons/proper/configuration/trunk/src/changes/changes.xml
commons/proper/configuration/trunk/src/site/xdoc/ (props changed)
commons/proper/configuration/trunk/src/site/xdoc/download_configuration.xml
Propchange: commons/proper/configuration/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 29 11:52:28 2018
@@ -1,3 +1,6 @@
/commons/proper/configuration/branches/CONFIGURATION_390:819412-822131
+/commons/proper/configuration/branches/RELEASE_2_4_BRANCH:1844455-1844713
/commons/proper/configuration/branches/configuration2-alpha:1624597-1624751
/commons/proper/configuration/branches/immutableNodes:1561338-1588830
+/commons/proper/configuration/tags/CONFIGURATION_2_4:1845105
+/commons/proper/configuration/tags/CONFIGURATION_2_4_RC2:1844714-1845104
Modified: commons/proper/configuration/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/pom.xml?rev=1845106&r1=1845105&r2=1845106&view=diff
==============================================================================
--- commons/proper/configuration/trunk/pom.xml (original)
+++ commons/proper/configuration/trunk/pom.xml Mon Oct 29 11:52:28 2018
@@ -27,7 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-configuration2</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.5-SNAPSHOT</version>
<name>Apache Commons Configuration</name>
<inceptionYear>2001</inceptionYear>
@@ -537,12 +537,11 @@
<properties>
<commons.componentid>configuration</commons.componentid>
<commons.module.name>org.apache.commons.configuration2</commons.module.name>
- <commons.release.version>2.3</commons.release.version>
+ <commons.release.version>2.4</commons.release.version>
<commons.release.desc>(reworked 2.x version)</commons.release.desc>
<commons.release.2.name>commons-configuration-${commons.release.2.version}</commons.release.2.name>
<commons.release.2.version>1.10</commons.release.2.version>
<commons.release.2.desc>(old 1.x version)</commons.release.2.desc>
- <commons.rc.version>RC2</commons.rc.version>
<commons.jira.id>CONFIGURATION</commons.jira.id>
<commons.jira.pid>12310467</commons.jira.pid>
<maven.compiler.source>1.8</maven.compiler.source>
@@ -566,10 +565,20 @@
</commons.osgi.import>
<slf4j.version>1.7.25</slf4j.version>
<spring.version>4.3.19.RELEASE</spring.version>
- <commons.japicmp.version>0.11.1</commons.japicmp.version>
+ <!-- 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>2.3</commons.bc.version>
+ <commons.rc.version>RC2</commons.rc.version>
<commons.release.isDistModule>true</commons.release.isDistModule>
-
<commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/configuration</commons.distSvnStagingUrl>
+
<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>
<build>
@@ -723,6 +732,24 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!--
+ The below setting for not failing upon error stems from the fact
that javacc's generated
+ code.
+
+ Javacc is responsible for a portion of the code in the package
org.apache.commons.configuration2.plist,
+ and only generates a portion of the package. Furthermore, the
javacc parser generator
+ generates javadoc that does not conform to the java 1.8 standard
and causes the build to fail. For the
+ sake of releasing commons-configuration-2.4.
+ -->
+ <failOnError>false</failOnError>
+ <links>
+ <link>https://docs.oracle.com/javase/8/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -846,6 +873,37 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ <configuration>
+ <!--
+ The below setting for not failing upon error stems from the
fact that javacc's generated
+ code.
+
+ Javacc is responsible for a portion of the code in the package
org.apache.commons.configuration2.plist,
+ and only generates a portion of the package. Furthermore, the
javacc parser generator
+ generates javadoc that does not conform to the java 1.8
standard and causes the build to fail. For the
+ sake of releasing commons-configuration-2.4.
+ -->
+ <failOnError>false</failOnError>
+ <links>
+ <link>https://docs.oracle.com/javase/8/docs/api/</link>
+ </links>
+ </configuration>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <failOnError>false</failOnError>
+ <links>
+ <link>https://docs.oracle.com/javase/8/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
Modified: commons/proper/configuration/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/changes/changes.xml?rev=1845106&r1=1845105&r2=1845106&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/changes/changes.xml (original)
+++ commons/proper/configuration/trunk/src/changes/changes.xml Mon Oct 29
11:52:28 2018
@@ -25,7 +25,7 @@
</properties>
<body>
- <release version="2.4" date="in SVN"
+ <release version="2.4" date="2018-10-23"
description="Minor release with new features and updated
dependencies.">
<action dev="oheger" type="fix" issue="CONFIGURATION-710"
due-to="thc202">
Fixed numerous typos in user guides.
Propchange: commons/proper/configuration/trunk/src/site/xdoc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 29 11:52:28 2018
@@ -1,3 +1,6 @@
/commons/proper/configuration/branches/CONFIGURATION_390/xdocs:819412-822131
+/commons/proper/configuration/branches/RELEASE_2_4_BRANCH/src/site/xdoc:1844455-1844713
/commons/proper/configuration/branches/configuration2-alpha/src/site/xdoc:1624597-1624751
/commons/proper/configuration/branches/configuration2_experimental/xdocs:757105-757112
+/commons/proper/configuration/tags/CONFIGURATION_2_4/src/site/xdoc:1845105
+/commons/proper/configuration/tags/CONFIGURATION_2_4_RC2/src/site/xdoc:1844714-1845104
Modified:
commons/proper/configuration/trunk/src/site/xdoc/download_configuration.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/site/xdoc/download_configuration.xml?rev=1845106&r1=1845105&r2=1845106&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/site/xdoc/download_configuration.xml
(original)
+++ commons/proper/configuration/trunk/src/site/xdoc/download_configuration.xml
Mon Oct 29 11:52:28 2018
@@ -111,32 +111,36 @@ limitations under the License.
</p>
</subsection>
</section>
- <section name="Apache Commons Configuration 2.3 (reworked 2.x version)">
+ <section name="Apache Commons Configuration 2.4 (reworked 2.x version)">
<subsection name="Binaries">
<table>
<tr>
- <td><a
href="[preferred]/commons/configuration/binaries/commons-configuration2-2.3-bin.tar.gz">commons-configuration2-2.3-bin.tar.gz</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.3-bin.tar.gz.sha1";>sha1</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.3-bin.tar.gz.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/configuration/binaries/commons-configuration2-2.4-bin.tar.gz">commons-configuration2-2.4-bin.tar.gz</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.tar.gz.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.tar.gz.sha512";>sha512</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/configuration/binaries/commons-configuration2-2.3-bin.zip">commons-configuration2-2.3-bin.zip</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.3-bin.zip.sha1";>sha1</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.3-bin.zip.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/configuration/binaries/commons-configuration2-2.4-bin.zip">commons-configuration2-2.4-bin.zip</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.zip.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.zip.sha512";>sha512</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.4-bin.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a
href="[preferred]/commons/configuration/source/commons-configuration2-2.3-src.tar.gz">commons-configuration2-2.3-src.tar.gz</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.3-src.tar.gz.sha1";>sha1</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.3-src.tar.gz.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/configuration/source/commons-configuration2-2.4-src.tar.gz">commons-configuration2-2.4-src.tar.gz</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.tar.gz.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.tar.gz.sha512";>sha512</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/configuration/source/commons-configuration2-2.3-src.zip">commons-configuration2-2.3-src.zip</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.3-src.zip.sha1";>sha1</a></td>
- <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.3-src.zip.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/configuration/source/commons-configuration2-2.4-src.zip">commons-configuration2-2.4-src.zip</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.zip.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.zip.sha512";>sha512</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.4-src.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
