Upgrade dependencies (dnsjava 2.0.6=>2.0.8, dnsjnio 1.0.2=>1.0.3, commons-cli 1.1 => 1.2) (JSPF-87 and JSPF-84)
git-svn-id: https://svn.apache.org/repos/asf/james/jspf/trunk@896917 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 7120735..37298d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,12 +148,12 @@
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
- <version>2.0.6</version>
+ <version>2.0.8</version>
</dependency>
<dependency>
<groupId>uk.nominet</groupId>
<artifactId>dnsjnio</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -174,7 +174,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/stage/commons-cli/jars/commons-cli-1.1.jar b/stage/commons-cli/jars/commons-cli-1.1.jar
deleted file mode 100644
index e633afb..0000000
--- a/stage/commons-cli/jars/commons-cli-1.1.jar
+++ /dev/null
Binary files differ
diff --git a/stage/commons-cli/jars/commons-cli-1.2.jar b/stage/commons-cli/jars/commons-cli-1.2.jar
new file mode 100644
index 0000000..ce4b9ff
--- /dev/null
+++ b/stage/commons-cli/jars/commons-cli-1.2.jar
Binary files differ
diff --git a/stage/commons-cli/poms/commons-cli-1.1.pom b/stage/commons-cli/poms/commons-cli-1.1.pom
deleted file mode 100644
index ef3edac..0000000
--- a/stage/commons-cli/poms/commons-cli-1.1.pom
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <name>CLI</name>
- <version>1.1</version>
- <description>Commons CLI provides a simple API for presenting, processing and
- validating a command line interface.</description>
- <url>http://jakarta.apache.org/commons/cli/</url>
- <issueManagement>
- <url>http://issues.apache.org/jira/</url>
- </issueManagement>
- <ciManagement>
- <notifiers>
- <notifier>
- <configuration>
- <address>commons-dev@jakarta.apache.org</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
- <inceptionYear>2002</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Commons Dev List</name>
- <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
- <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
- </mailingList>
- <mailingList>
- <name>Commons User List</name>
- <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
- <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
- </mailingList>
- </mailingLists>
- <developers>
- <developer>
- <id>jstrachan</id>
- <name>James Strachan</name>
- <email>jstrachan@apache.org</email>
- <organization>SpiritSoft, Inc.</organization>
- </developer>
- <developer>
- <id>bob</id>
- <name>Bob McWhirter</name>
- <email>bob@werken.com</email>
- <organization>Werken</organization>
- <roles>
- <role>contributed ideas and code from werken.opt</role>
- </roles>
- </developer>
- <developer>
- <id>jkeyes</id>
- <name>John Keyes</name>
- <email>jbjk@mac.com</email>
- <organization>integral Source</organization>
- <roles>
- <role>contributed ideas and code from Optz</role>
- </roles>
- </developer>
- <developer>
- <id>roxspring</id>
- <name>Rob Oxspring</name>
- <email>roxspring@imapmail.org</email>
- <organization>Indigo Stone</organization>
- <roles>
- <role>designed CLI2</role>
- </roles>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>Peter Donald</name>
- <roles>
- <role>contributed ideas and code from Avalon Excalibur's cli package</role>
- </roles>
- </contributor>
- <contributor>
- <name>Brian Egge</name>
- <roles>
- <role>made the 1.1 release happen</role>
- </roles>
- </contributor>
- <contributor>
- <name>Berin Loritsch</name>
- <email>bloritsch@apache.org</email>
- <roles>
- <role>helped in the Avalon CLI merge</role>
- </roles>
- </contributor>
- <contributor>
- <name>Peter Maddocks</name>
- <email>peter_maddocks@hp.com</email>
- <organization>Hewlett-Packard</organization>
- <roles>
- <role>supplied patch</role>
- </roles>
- </contributor>
- <contributor>
- <name>Andrew Shirley</name>
- <roles>
- <role>lots of fixes for 1.1 and 2.0</role>
- </roles>
- </contributor>
- </contributors>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>/LICENSE.txt</url>
- </license>
- </licenses>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk</connection>
- <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk</url>
- </scm>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}</directory>
- <includes>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <distributionManagement>
- <repository>
- <id>default</id>
- <name>Default Repository</name>
- <url>file:///www/jakarta.apache.org/builds/jakarta-commons/cli/</url>
- </repository>
- <site>
- <id>default</id>
- <name>Default Site</name>
- <url>scp://people.apache.org//www/jakarta.apache.org/commons/cli/</url>
- </site>
- <status>converted</status>
- </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/stage/commons-cli/poms/commons-cli-1.2.pom b/stage/commons-cli/poms/commons-cli-1.2.pom
new file mode 100644
index 0000000..21e6d30
--- /dev/null
+++ b/stage/commons-cli/poms/commons-cli-1.2.pom
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<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>
+ <version>11</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ <name>Commons CLI</name>
+
+ <inceptionYear>2002</inceptionYear>
+ <description>
+ Commons CLI provides a simple API for presenting, processing and validating a command line interface.
+ </description>
+
+ <url>http://commons.apache.org/cli/</url>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/CLI</url>
+ </issueManagement>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x/</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <name>James Strachan</name>
+ <id>jstrachan</id>
+ <email>jstrachan@apache.org</email>
+ <organization>SpiritSoft, Inc.</organization>
+ </developer>
+ <developer>
+ <name>Bob McWhirter</name>
+ <id>bob</id>
+ <email>bob@werken.com</email>
+ <organization>Werken</organization>
+ <roles>
+ <role>contributed ideas and code from werken.opt</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>John Keyes</name>
+ <id>jkeyes</id>
+ <email>jbjk@mac.com</email>
+ <organization>integral Source</organization>
+ <roles>
+ <role>contributed ideas and code from Optz</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Oxspring</name>
+ <id>roxspring</id>
+ <email>roxspring@imapmail.org</email>
+ <organization>Indigo Stone</organization>
+ <roles>
+ <role>designed CLI2</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Peter Donald</name>
+ <roles>
+ <role>contributed ideas and code from Avalon Excalibur's cli package</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Brian Egge</name>
+ <roles>
+ <role>made the 1.1 release happen</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Berin Loritsch</name>
+ <email>bloritsch@apache.org</email>
+ <roles>
+ <role>helped in the Avalon CLI merge</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Peter Maddocks</name>
+ <email>peter_maddocks@hp.com</email>
+ <organization>Hewlett-Packard</organization>
+ <roles>
+ <role>supplied patch</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Andrew Shirley</name>
+ <roles>
+ <role>lots of fixes for 1.1</role>
+ </roles>
+ </contributor>
+ </contributors>
+
+ <dependencies>
+ <!-- used for unit tests -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <maven.compile.source>1.4</maven.compile.source>
+ <maven.compile.target>1.4</maven.compile.target>
+ <commons.componentid>cli</commons.componentid>
+ <commons.release.version>1.2</commons.release.version>
+ <commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
+ <commons.osgi.symbolicName>org.apache.commons.cli</commons.osgi.symbolicName>
+ <commons.binary.suffix />
+ <commons.jira.id>CLI</commons.jira.id>
+ <commons.jira.pid>12310463</commons.jira.pid>
+ <!-- The RC version used in the staging repository URL. -->
+ <commons.rc.version>RC7</commons.rc.version>
+ </properties>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ant-plugin</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ </plugin>
+ -->
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>src/conf/checkstyle.xml</configLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <comparisonVersion>1.1</comparisonVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+
+ <profiles>
+ <!-- Profile to let Gump choose the name of the jar file generated -->
+ <profile>
+ <id>gump</id>
+ <activation>
+ <property>
+ <name>maven.final.name</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <finalName>${maven.final.name}</finalName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>rc</id>
+ <distributionManagement>
+ <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
+ <site>
+ <id>apache.website</id>
+ <name>Apache Commons Release Candidate Staging Site</name>
+ <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/site</url>
+ </site>
+ </distributionManagement>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/stage/dnsjava/jars/dnsjava-2.0.6.jar b/stage/dnsjava/jars/dnsjava-2.0.6.jar
deleted file mode 100644
index e41f9b0..0000000
--- a/stage/dnsjava/jars/dnsjava-2.0.6.jar
+++ /dev/null
Binary files differ
diff --git a/stage/dnsjava/jars/dnsjava-2.0.8.jar b/stage/dnsjava/jars/dnsjava-2.0.8.jar
new file mode 100644
index 0000000..30776bb
--- /dev/null
+++ b/stage/dnsjava/jars/dnsjava-2.0.8.jar
Binary files differ
diff --git a/stage/dnsjava/poms/dnsjava-2.0.6.pom b/stage/dnsjava/poms/dnsjava-2.0.8.pom
similarity index 97%
rename from stage/dnsjava/poms/dnsjava-2.0.6.pom
rename to stage/dnsjava/poms/dnsjava-2.0.8.pom
index f8821aa..cb8fa3f 100644
--- a/stage/dnsjava/poms/dnsjava-2.0.6.pom
+++ b/stage/dnsjava/poms/dnsjava-2.0.8.pom
@@ -21,7 +21,7 @@
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<name>dnsjava</name>
- <version>2.0.6</version>
+ <version>2.0.8</version>
<packaging>jar</packaging>
<url>http://www.dnsjava.org</url>
<licenses>
diff --git a/stage/pom.xml b/stage/pom.xml
index 127b95d..45338cc 100644
--- a/stage/pom.xml
+++ b/stage/pom.xml
@@ -91,12 +91,12 @@
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
- <version>2.0.6</version>
+ <version>2.0.8</version>
</dependency>
<dependency>
<groupId>uk.nominet</groupId>
<artifactId>dnsjnio</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -118,7 +118,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</dependency>
</dependencies>
diff --git a/stage/uk.nominet/jars/dnsjnio-1.0.2.jar b/stage/uk.nominet/jars/dnsjnio-1.0.2.jar
deleted file mode 100644
index 37e4d7d..0000000
--- a/stage/uk.nominet/jars/dnsjnio-1.0.2.jar
+++ /dev/null
Binary files differ
diff --git a/stage/uk.nominet/jars/dnsjnio-1.0.3.jar b/stage/uk.nominet/jars/dnsjnio-1.0.3.jar
new file mode 100644
index 0000000..67a61a9
--- /dev/null
+++ b/stage/uk.nominet/jars/dnsjnio-1.0.3.jar
Binary files differ
diff --git a/stage/uk.nominet/poms/dnsjnio-1.0.2.pom b/stage/uk.nominet/poms/dnsjnio-1.0.3.pom
similarity index 97%
rename from stage/uk.nominet/poms/dnsjnio-1.0.2.pom
rename to stage/uk.nominet/poms/dnsjnio-1.0.3.pom
index b7c18db..17c6663 100644
--- a/stage/uk.nominet/poms/dnsjnio-1.0.2.pom
+++ b/stage/uk.nominet/poms/dnsjnio-1.0.3.pom
@@ -21,7 +21,7 @@
<groupId>uk.nominet</groupId>
<artifactId>dnsjnio</artifactId>
<name>dnsjnio</name>
- <version>1.0.2</version>
+ <version>1.0.3</version>
<packaging>jar</packaging>
<url>http://sourceforge.net/projects/dnsjnio</url>
<licenses>
