Author: henning
Date: Mon Oct 28 07:06:15 2013
New Revision: 1536262
URL: http://svn.apache.org/r1536262
Log:
Feedback from 1.10 RC1
backport of r1535297.
Removed:
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/build.properties.sample
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/build.xml
Modified:
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/NOTICE.txt
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/pom.xml
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/assembly/bin.xml
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/assembly/src.xml
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
Modified:
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/NOTICE.txt?rev=1536262&r1=1536261&r2=1536262&view=diff
==============================================================================
---
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/NOTICE.txt
(original)
+++
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/NOTICE.txt
Mon Oct 28 07:06:15 2013
@@ -1,5 +1,5 @@
Apache Commons Configuration
Copyright 2001-2013 The Apache Software Foundation
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
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=1536262&r1=1536261&r2=1536262&view=diff
==============================================================================
--- commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/pom.xml
(original)
+++ commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/pom.xml
Mon Oct 28 07:06:15 2013
@@ -147,7 +147,7 @@
</developer>
<developer>
- <name>Jörg Schaible</name>
+ <name>Jörg Schaible</name>
<id>joehni</id>
<email>joerg.schai...@gmx.de</email>
<timezone>+1</timezone>
@@ -184,7 +184,7 @@
<contributor>
<name>Jorge Ferrer</name>
<email>jorge.fer...@gmail.com</email>
- <organization></organization>
+ <organization />
</contributor>
<contributor>
@@ -556,7 +556,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -575,7 +575,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
@@ -638,6 +638,13 @@
<enableRulesSummary>false</enableRulesSummary>
<propertyExpansion>basedir=${basedir}</propertyExpansion>
</configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>checkstyle</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -661,11 +668,6 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${commons.cobertura.version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<version>${commons.clirr.version}</version>
<configuration>
@@ -676,5 +678,4 @@
</plugin>
</plugins>
</reporting>
-
</project>
Modified:
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/assembly/bin.xml?rev=1536262&r1=1536261&r2=1536262&view=diff
==============================================================================
---
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/assembly/bin.xml
(original)
+++
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/assembly/bin.xml
Mon Oct 28 07:06:15 2013
@@ -15,26 +15,31 @@
limitations under the License.
-->
<assembly>
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <includeSiteDirectory>true</includeSiteDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>RELEASE-NOTES.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${artifactId}-${commons.release.version}</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>RELEASE-NOTES*</include>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
Modified:
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/assembly/src.xml?rev=1536262&r1=1536261&r2=1536262&view=diff
==============================================================================
---
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/assembly/src.xml
(original)
+++
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/assembly/src.xml
Mon Oct 28 07:06:15 2013
@@ -15,29 +15,26 @@
limitations under the License.
-->
<assembly>
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>build.xml</include>
- <include>maven-build.properties</include>
- <include>maven-build.xml</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>pom.xml</include>
- <include>RELEASE-NOTES.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>conf</directory>
- </fileSet>
- <fileSet>
- <directory>src</directory>
- </fileSet>
- </fileSets>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${artifactId}-${commons.release.version}-src</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>RELEASE-NOTES*</include>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>conf</directory>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ </fileSets>
</assembly>
Modified:
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java?rev=1536262&r1=1536261&r2=1536262&view=diff
==============================================================================
---
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
(original)
+++
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
Mon Oct 28 07:06:15 2013
@@ -1711,7 +1711,7 @@ public class TestDataConfiguration
@Test(expected = ConversionException.class)
public void testGetInetAddressInvalidType()
{
- conf.setProperty("ip.unknownhost", "foo");
+ conf.setProperty("ip.unknownhost", "foo.invalid");
conf.get(InetAddress.class, "ip.unknownhost");
}
