Author: henning
Date: Tue Oct 22 09:28:09 2013
New Revision: 1534557
URL: http://svn.apache.org/r1534557
Log:
backport pom changes from 1.10 release
Modified:
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/pom.xml
Modified:
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/pom.xml?rev=1534557&r1=1534556&r2=1534557&view=diff
==============================================================================
--- commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/pom.xml
(original)
+++ commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/pom.xml
Tue Oct 22 09:28:09 2013
@@ -18,10 +18,7 @@
<!-- ===================================================================== -->
<!-- $Id$ -->
<!-- ===================================================================== -->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
@@ -31,13 +28,10 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.10-SNAPSHOT</version>
- <name>Commons Configuration</name>
+ <name>Apache Commons Configuration</name>
<inceptionYear>2001</inceptionYear>
- <description>
- Tools to assist in the reading of configuration/preferences files in
- various formats
- </description>
+ <description>Tools to assist in the reading of configuration/preferences
files in various formats.</description>
<url>http://commons.apache.org/configuration/</url>
@@ -59,152 +53,152 @@
</site>
</distributionManagement>
- <developers>
- <developer>
- <name>Daniel Rall</name>
- <id>dlr</id>
- <email>d...@finemaltcoding.com</email>
- <organization>CollabNet, Inc.</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Jason van Zyl</name>
- <id>jvanzyl</id>
- <email>ja...@zenplex.com</email>
- <organization>Zenplex</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Martin Poeschl</name>
- <id>mpoeschl</id>
- <email>mpoes...@marmot.at</email>
- <organization>tucana.at</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>dIon Gillard</name>
- <id>dion</id>
- <email>d...@multitask.com.au</email>
- <organization>Multitask Consulting</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Henning P. Schmiedehausen</name>
- <id>henning</id>
- <email>henn...@schmiedehausen.org</email>
- <timezone>-8</timezone>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Eric Pugh</name>
- <id>epugh</id>
- <email>ep...@upstate.com</email>
- <organization>upstate.com</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Brian E. Dunbar</name>
- <id>bdunbar</id>
- <email>bdun...@dunbarconsulting.org</email>
- <organization>dunbarconsulting.org</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Emmanuel Bourg</name>
- <id>ebourg</id>
- <email>ebo...@apache.org</email>
- <organization>Ariane Software</organization>
- <timezone>+1</timezone>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Oliver Heger</name>
- <id>oheger</id>
- <email>ohe...@apache.org</email>
- <organization>Agfa HealthCare</organization>
- <timezone>+1</timezone>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Jörg Schaible</name>
- <id>joehni</id>
- <email>joerg.schai...@gmx.de</email>
- <timezone>+1</timezone>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Ralph Goers</name>
- <id>rgoers</id>
- <email>rgo...@apache.org</email>
- <organization>Intuit</organization>
- <timezone>-8</timezone>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Konstantin Shaposhnikov</name>
- <email>k...@scand.com</email>
- <organization>scand.com</organization>
- </contributor>
-
- <contributor>
- <name>Jamie M. Guillemette</name>
- <email>jmguilleme...@gmail.com</email>
- <organization>TD Bank</organization>
- </contributor>
-
- <contributor>
- <name>Jorge Ferrer</name>
- <email>jorge.fer...@gmail.com</email>
- <organization></organization>
- </contributor>
-
- <contributor>
- <name>Gabriele Garuglieri</name>
- <email>gabriele.garugli...@infoblu.it</email>
- <organization>Infoblu S.p.A</organization>
- </contributor>
-
- <contributor>
- <name>Nicolas De Loof</name>
- <email>nicolas.del...@gmail.com</email>
- <organization>Cap Gemini</organization>
- </contributor>
- </contributors>
+ <developers>
+ <developer>
+ <name>Daniel Rall</name>
+ <id>dlr</id>
+ <email>d...@finemaltcoding.com</email>
+ <organization>CollabNet, Inc.</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Jason van Zyl</name>
+ <id>jvanzyl</id>
+ <email>ja...@zenplex.com</email>
+ <organization>Zenplex</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Martin Poeschl</name>
+ <id>mpoeschl</id>
+ <email>mpoes...@marmot.at</email>
+ <organization>tucana.at</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>dIon Gillard</name>
+ <id>dion</id>
+ <email>d...@multitask.com.au</email>
+ <organization>Multitask Consulting</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Henning P. Schmiedehausen</name>
+ <id>henning</id>
+ <email>henn...@schmiedehausen.org</email>
+ <timezone>-8</timezone>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Eric Pugh</name>
+ <id>epugh</id>
+ <email>ep...@upstate.com</email>
+ <organization>upstate.com</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Brian E. Dunbar</name>
+ <id>bdunbar</id>
+ <email>bdun...@dunbarconsulting.org</email>
+ <organization>dunbarconsulting.org</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Emmanuel Bourg</name>
+ <id>ebourg</id>
+ <email>ebo...@apache.org</email>
+ <organization>Ariane Software</organization>
+ <timezone>+1</timezone>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Oliver Heger</name>
+ <id>oheger</id>
+ <email>ohe...@apache.org</email>
+ <organization>Agfa HealthCare</organization>
+ <timezone>+1</timezone>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Jörg Schaible</name>
+ <id>joehni</id>
+ <email>joerg.schai...@gmx.de</email>
+ <timezone>+1</timezone>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Ralph Goers</name>
+ <id>rgoers</id>
+ <email>rgo...@apache.org</email>
+ <organization>Intuit</organization>
+ <timezone>-8</timezone>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Konstantin Shaposhnikov</name>
+ <email>k...@scand.com</email>
+ <organization>scand.com</organization>
+ </contributor>
+
+ <contributor>
+ <name>Jamie M. Guillemette</name>
+ <email>jmguilleme...@gmail.com</email>
+ <organization>TD Bank</organization>
+ </contributor>
+
+ <contributor>
+ <name>Jorge Ferrer</name>
+ <email>jorge.fer...@gmail.com</email>
+ <organization></organization>
+ </contributor>
+
+ <contributor>
+ <name>Gabriele Garuglieri</name>
+ <email>gabriele.garugli...@infoblu.it</email>
+ <organization>Infoblu S.p.A</organization>
+ </contributor>
+
+ <contributor>
+ <name>Nicolas De Loof</name>
+ <email>nicolas.del...@gmail.com</email>
+ <organization>Cap Gemini</organization>
+ </contributor>
+ </contributors>
<dependencies>
<dependency>
@@ -226,18 +220,18 @@
<version>1.1.1</version>
<exclusions>
<exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
</exclusion>
<exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
+ <groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.8.1</version>
<optional>true</optional>
@@ -278,12 +272,12 @@
<optional>true</optional>
<exclusions>
<exclusion>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
</exclusion>
<exclusion>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -302,11 +296,11 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
- <scope>test</scope>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -360,12 +354,12 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
</exclusion>
<exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -451,161 +445,145 @@
</properties>
<build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
- <directory>src/main/resources</directory>
- <includes>
- <include>*.dtd</include>
- </includes>
- </testResource>
- <!-- hack to ensure the N&L appear in jars -->
- <testResource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </testResource>
- </testResources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>*.dtd</include>
+ </includes>
+ </testResource>
+ <!-- hack to ensure the N&L appear in jars -->
+ <testResource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <!-- create the source and binary assemblies -->
+ <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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- Uncomment to enable profiling unit tests -->
+ <!--
<argLine>-agentpath:"${yourkit.home}/bin/mac/libyjpagent.jnilib"</argLine> -->
+ <forkMode>once</forkMode>
+ <excludes>
+ <exclude>**/TestWebdavConfigurationBuilder.java</exclude>
+ </excludes>
+ <systemPropertyVariables>
+ <java.awt.headless>true</java.awt.headless>
+
<org.apache.commons.logging.Log>org.apache.commons.configuration.Logging</org.apache.commons.logging.Log>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>install</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>javacc</id>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
- <!-- Uncomment to enable profiling unit tests -->
- <!--
<argLine>-agentpath:"${yourkit.home}/bin/mac/libyjpagent.jnilib"</argLine> -->
- <forkMode>once</forkMode>
- <excludes>
- <exclude>**/TestWebdavConfigurationBuilder.java</exclude>
- </excludes>
- <systemPropertyVariables>
- <java.awt.headless>true</java.awt.headless>
-
<org.apache.commons.logging.Log>org.apache.commons.configuration.Logging</org.apache.commons.logging.Log>
- </systemPropertyVariables>
+ <ignorePathsToDelete>
+ <ignorePathToDelete>javadocs**</ignorePathToDelete>
+ </ignorePathsToDelete>
</configuration>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself.-->
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
<configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>
+ [0,)
+ </versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.codehaus.mojo
+ </groupId>
+ <artifactId>
+ javacc-maven-plugin
+ </artifactId>
+ <versionRange>
+ [0,)
+ </versionRange>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>install</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>javacc</id>
- <goals>
- <goal>javacc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- Uncomment to instrument with Clover
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>2.4.2</version>
- <configuration>
- <jdk>1.4</jdk>
- </configuration>
- <executions>
- <execution>
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- </executions>
- </plugin> -->
</plugins>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <ignorePathsToDelete>
- <ignorePathToDelete>javadocs</ignorePathToDelete>
- </ignorePathsToDelete>
- </configuration>
- </plugin>
- <!--This plugin's configuration is used to store Eclipse m2e
settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>
- [0,)
- </versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.codehaus.mojo
- </groupId>
- <artifactId>
- javacc-maven-plugin
- </artifactId>
- <versionRange>
- [0,)
- </versionRange>
- <goals>
- <goal>javacc</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ </pluginManagement>
</build>
<profiles>
<profile>
@@ -629,8 +607,8 @@
<configuration>
<forkMode>once</forkMode>
<systemPropertyVariables>
- <java.awt.headless>true</java.awt.headless>
- <test.webdav.base>${test.webdav.base}</test.webdav.base>
+ <java.awt.headless>true</java.awt.headless>
+ <test.webdav.base>${test.webdav.base}</test.webdav.base>
</systemPropertyVariables>
<includes>
<include>**/TestWebdavConfigurationBuilder.java</include>
@@ -640,14 +618,6 @@
</plugins>
</build>
</profile>
- <!-- Uncomment this and set the path accordingly to enable YourKit -->
- <!-- http://www.yourkit.com/docs/80/help/agent.jsp -->
- <!-- <profile>
- <id>yourkit-profile</id>
- <properties>
-
<yourkit.home>/Applications/YourKit_Java_Profiler_8.0.17.app/</yourkit.home>
- </properties>
- </profile> -->
</profiles>
<reporting>
<plugins>
@@ -673,13 +643,13 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<exclude>src/java/org/apache/commons/configuration/plist/*.java</exclude>
<exclude>velocity.log</exclude>
</excludes>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.1</version>
@@ -687,17 +657,17 @@
<threshold>Normal</threshold>
<effort>Default</effort>
<excludeFilterFile>${basedir}/conf/findbugs-exclude-filter.xml</excludeFilterFile>
- </configuration>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>${commons.cobertura.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>${commons.clirr.version}</version>
<configuration>
<excludes>
<exclude>org/apache/commons/configuration/plist/PropertyListParser*</exclude>
