You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2010/01/07 17:24:58 UTC

svn commit: r896917 - in /james/jspf/trunk: ./ stage/ stage/commons-cli/jars/ stage/commons-cli/poms/ stage/dnsjava/jars/ stage/dnsjava/poms/ stage/uk.nominet/jars/ stage/uk.nominet/poms/

Author: bago
Date: Thu Jan  7 16:23:40 2010
New Revision: 896917

URL: http://svn.apache.org/viewvc?rev=896917&view=rev
Log:
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)

Added:
    james/jspf/trunk/stage/commons-cli/jars/commons-cli-1.2.jar   (with props)
    james/jspf/trunk/stage/commons-cli/poms/commons-cli-1.2.pom   (with props)
    james/jspf/trunk/stage/dnsjava/jars/dnsjava-2.0.8.jar   (with props)
    james/jspf/trunk/stage/dnsjava/poms/dnsjava-2.0.8.pom
    james/jspf/trunk/stage/uk.nominet/jars/dnsjnio-1.0.3.jar   (with props)
    james/jspf/trunk/stage/uk.nominet/poms/dnsjnio-1.0.3.pom
Removed:
    james/jspf/trunk/stage/commons-cli/jars/commons-cli-1.1.jar
    james/jspf/trunk/stage/commons-cli/poms/commons-cli-1.1.pom
    james/jspf/trunk/stage/dnsjava/jars/dnsjava-2.0.6.jar
    james/jspf/trunk/stage/dnsjava/poms/dnsjava-2.0.6.pom
    james/jspf/trunk/stage/uk.nominet/jars/dnsjnio-1.0.2.jar
    james/jspf/trunk/stage/uk.nominet/poms/dnsjnio-1.0.2.pom
Modified:
    james/jspf/trunk/pom.xml
    james/jspf/trunk/stage/pom.xml

Modified: james/jspf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/pom.xml?rev=896917&r1=896916&r2=896917&view=diff
==============================================================================
--- james/jspf/trunk/pom.xml (original)
+++ james/jspf/trunk/pom.xml Thu Jan  7 16:23:40 2010
@@ -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>

Added: james/jspf/trunk/stage/commons-cli/jars/commons-cli-1.2.jar
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/commons-cli/jars/commons-cli-1.2.jar?rev=896917&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/jspf/trunk/stage/commons-cli/jars/commons-cli-1.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/jspf/trunk/stage/commons-cli/poms/commons-cli-1.2.pom
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/commons-cli/poms/commons-cli-1.2.pom?rev=896917&view=auto
==============================================================================
--- james/jspf/trunk/stage/commons-cli/poms/commons-cli-1.2.pom (added)
+++ james/jspf/trunk/stage/commons-cli/poms/commons-cli-1.2.pom Thu Jan  7 16:23:40 2010
@@ -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>

Propchange: james/jspf/trunk/stage/commons-cli/poms/commons-cli-1.2.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Added: james/jspf/trunk/stage/dnsjava/jars/dnsjava-2.0.8.jar
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/dnsjava/jars/dnsjava-2.0.8.jar?rev=896917&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/jspf/trunk/stage/dnsjava/jars/dnsjava-2.0.8.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/jspf/trunk/stage/dnsjava/poms/dnsjava-2.0.8.pom
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/dnsjava/poms/dnsjava-2.0.8.pom?rev=896917&view=auto
==============================================================================
--- james/jspf/trunk/stage/dnsjava/poms/dnsjava-2.0.8.pom (added)
+++ james/jspf/trunk/stage/dnsjava/poms/dnsjava-2.0.8.pom Thu Jan  7 16:23:40 2010
@@ -0,0 +1,33 @@
+<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">
+  <!--
+    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.    
+  -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>dnsjava</groupId>
+  <artifactId>dnsjava</artifactId>
+  <name>dnsjava</name>
+  <version>2.0.8</version>
+  <packaging>jar</packaging>
+  <url>http://www.dnsjava.org</url>
+  <licenses>
+    <license>
+      <name>BSD license</name>
+      <url>http://www.dnsjava.org/README</url>
+    </license>
+  </licenses>
+</project>
\ No newline at end of file

Modified: james/jspf/trunk/stage/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/pom.xml?rev=896917&r1=896916&r2=896917&view=diff
==============================================================================
--- james/jspf/trunk/stage/pom.xml (original)
+++ james/jspf/trunk/stage/pom.xml Thu Jan  7 16:23:40 2010
@@ -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>
 

Added: james/jspf/trunk/stage/uk.nominet/jars/dnsjnio-1.0.3.jar
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/uk.nominet/jars/dnsjnio-1.0.3.jar?rev=896917&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/jspf/trunk/stage/uk.nominet/jars/dnsjnio-1.0.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/jspf/trunk/stage/uk.nominet/poms/dnsjnio-1.0.3.pom
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/uk.nominet/poms/dnsjnio-1.0.3.pom?rev=896917&view=auto
==============================================================================
--- james/jspf/trunk/stage/uk.nominet/poms/dnsjnio-1.0.3.pom (added)
+++ james/jspf/trunk/stage/uk.nominet/poms/dnsjnio-1.0.3.pom Thu Jan  7 16:23:40 2010
@@ -0,0 +1,32 @@
+<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">
+  <!--
+    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.    
+  -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>uk.nominet</groupId>
+  <artifactId>dnsjnio</artifactId>
+  <name>dnsjnio</name>
+  <version>1.0.3</version>
+  <packaging>jar</packaging>
+  <url>http://sourceforge.net/projects/dnsjnio</url>
+  <licenses>
+    <license>
+      <name>ASLv2 license</name>
+    </license>
+  </licenses>
+</project>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org