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 no...@apache.org on 2010/01/19 15:33:25 UTC

svn commit: r900794 - in /james/jspf/trunk: ./ assemble/ stage/ stage/commons-cli/jars/ stage/commons-cli/poms/ stage/junit/ stage/log4j/ stage/org.apache.james/poms/ stage/org.apache.james/xmls/ stage/org.apache.maven.skins/ stage/org.apache/ stage/or...

Author: norman
Date: Tue Jan 19 14:33:24 2010
New Revision: 900794

URL: http://svn.apache.org/viewvc?rev=900794&view=rev
Log:
* Upgrade to james-project 1.5
* Cleanup stage
* jvyaml artifact name changed

Removed:
    james/jspf/trunk/stage/commons-cli/jars/
    james/jspf/trunk/stage/commons-cli/poms/
    james/jspf/trunk/stage/junit/
    james/jspf/trunk/stage/log4j/
    james/jspf/trunk/stage/org.apache/
    james/jspf/trunk/stage/org.apache.james/poms/james-parent-1.1.pom
    james/jspf/trunk/stage/org.apache.james/poms/james-parent-1.2-SNAPSHOT.pom
    james/jspf/trunk/stage/org.apache.james/poms/james-project-1.2.pom
    james/jspf/trunk/stage/org.apache.james/poms/james-project-1.3-SNAPSHOT.pom
    james/jspf/trunk/stage/org.apache.james/xmls/
    james/jspf/trunk/stage/org.apache.maven.skins/
    james/jspf/trunk/stage/org.jvyaml/
Modified:
    james/jspf/trunk/assemble/pom.xml
    james/jspf/trunk/pom.xml
    james/jspf/trunk/stage/pom.xml
    james/jspf/trunk/tester/pom.xml

Modified: james/jspf/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/assemble/pom.xml?rev=900794&r1=900793&r2=900794&view=diff
==============================================================================
--- james/jspf/trunk/assemble/pom.xml (original)
+++ james/jspf/trunk/assemble/pom.xml Tue Jan 19 14:33:24 2010
@@ -48,9 +48,9 @@
   		<artifactId>log4j</artifactId>
   	</dependency>
   	<dependency>
-  		<groupId>org.jvyaml</groupId>
-  		<artifactId>jvyaml</artifactId>
-  	</dependency>
+        <groupId>net.java.dev</groupId>
+        <artifactId>jvyaml</artifactId>
+	</dependency>
   	<dependency>
   		<groupId>commons-cli</groupId>
   		<artifactId>commons-cli</artifactId>

Modified: james/jspf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/pom.xml?rev=900794&r1=900793&r2=900794&view=diff
==============================================================================
--- james/jspf/trunk/pom.xml (original)
+++ james/jspf/trunk/pom.xml Tue Jan 19 14:33:24 2010
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.james</groupId>
     <artifactId>james-project</artifactId>
-    <version>1.3</version>
+    <version>1.5</version>
   </parent>
   <name>Apache JAMES jSPF</name>
   <version>0.9.8-SNAPSHOT</version>
@@ -167,8 +167,8 @@
 	      <version>1.2.14</version>
 	    </dependency>
 	    <dependency>
-	      <groupId>org.jvyaml</groupId>
-	      <artifactId>jvyaml</artifactId>
+          <groupId>net.java.dev</groupId>
+          <artifactId>jvyaml</artifactId>
 	      <version>0.2.1</version>
 	    </dependency>
 	    <dependency>

Modified: james/jspf/trunk/stage/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/pom.xml?rev=900794&r1=900793&r2=900794&view=diff
==============================================================================
--- james/jspf/trunk/stage/pom.xml (original)
+++ james/jspf/trunk/stage/pom.xml Tue Jan 19 14:33:24 2010
@@ -47,47 +47,13 @@
   </repositories>
 
   <dependencies>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-parent</artifactId>
-      <version>1.2</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-project</artifactId>
-      <version>1.3</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-parent</artifactId>
-      <version>1.2-SNAPSHOT</version>
-      <type>xml</type>
-      <classifier>site</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-project</artifactId>
-      <version>1.3-SNAPSHOT</version>
-      <type>xml</type>
-      <classifier>site</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.skins</groupId>
-      <artifactId>maven-default-skin</artifactId>
-      <version>1.0</version>
-    </dependency>
+    
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>maven-skin</artifactId>
       <version>1.1</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache</groupId>
-      <artifactId>apache-jar-resource-bundle</artifactId>
-      <version>1.4</version>
-    </dependency>
+   
     <dependency>
       <groupId>dnsjava</groupId>
       <artifactId>dnsjava</artifactId>
@@ -98,28 +64,7 @@
       <artifactId>dnsjnio</artifactId>
       <version>1.0.3</version>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jvyaml</groupId>
-      <artifactId>jvyaml</artifactId>
-      <version>0.2.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.2</version>
-    </dependency>
+  
   </dependencies>
 
   <reporting>

Modified: james/jspf/trunk/tester/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/tester/pom.xml?rev=900794&r1=900793&r2=900794&view=diff
==============================================================================
--- james/jspf/trunk/tester/pom.xml (original)
+++ james/jspf/trunk/tester/pom.xml Tue Jan 19 14:33:24 2010
@@ -44,8 +44,8 @@
       <groupId>dnsjava</groupId>
       <artifactId>dnsjava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jvyaml</groupId>
+	<dependency>
+      <groupId>net.java.dev</groupId>
       <artifactId>jvyaml</artifactId>
     </dependency>
     <dependency>



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