[overlord-commits] Overlord SVN: r522 - in cdl/trunk: distribution and 10 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Wed Feb 25 21:02:25 EST 2009


Author: jeff.yuchang
Date: 2009-02-25 21:02:25 -0500 (Wed, 25 Feb 2009)
New Revision: 522

Added:
   cdl/trunk/distribution/libraries/rosetta-4.5.jar
Removed:
   cdl/trunk/distribution/libraries/config-model-1.0.1.jar
   cdl/trunk/distribution/libraries/rosetta-4.3.jar
Modified:
   cdl/trunk/distribution/libraries/dependencies.xml
   cdl/trunk/distribution/pom.xml
   cdl/trunk/distribution/src/main/assembly/bin.xml
   cdl/trunk/install.xml
   cdl/trunk/pom.xml
   cdl/trunk/runtime/jbossesb-assembly/pom.xml
   cdl/trunk/runtime/jbossesb/pom.xml
   cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml
   cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml
   cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
   cdl/trunk/samples/jbossesb/purchasing/store/pom.xml
   cdl/trunk/validator/jbossesb-assembly/pom.xml
   cdl/trunk/validator/jbossesb/pom.xml
Log:
[SOAG-90] upgrade the rosetta version
* remove the confi-model jar dependency, as we don't need it at present.
* move some libraries version in the parent pom, so that won't change a lot in the future.



Deleted: cdl/trunk/distribution/libraries/config-model-1.0.1.jar
===================================================================
(Binary files differ)

Modified: cdl/trunk/distribution/libraries/dependencies.xml
===================================================================
--- cdl/trunk/distribution/libraries/dependencies.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/distribution/libraries/dependencies.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -2,16 +2,10 @@
 			<dependency>
 				<groupId>org.jboss.jbossesb</groupId>
 				<artifactId>rosetta</artifactId>
-				<version>4.3</version>
+				<version>4.5</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.jboss.jbossesb</groupId>
-				<artifactId>config-model</artifactId>
-				<version>1.0.1</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
     				<groupId>org.pi4soa</groupId>
                    	<artifactId>common</artifactId>
                     	<version>2.0</version>

Deleted: cdl/trunk/distribution/libraries/rosetta-4.3.jar
===================================================================
(Binary files differ)

Added: cdl/trunk/distribution/libraries/rosetta-4.5.jar
===================================================================
(Binary files differ)


Property changes on: cdl/trunk/distribution/libraries/rosetta-4.5.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: cdl/trunk/distribution/pom.xml
===================================================================
--- cdl/trunk/distribution/pom.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/distribution/pom.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
-            <artifactId>cdl-jbossesb</artifactId>
+            <artifactId>cdl-runtime-jbossesb</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>

Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -113,9 +113,8 @@
         <dependencySet>
             <outputDirectory>samples/libs</outputDirectory>
             <includes>
-               <include>org.jboss.soa.overlord.cdl.runtime:cdl-jbossesb</include>
+               <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
                <include>org.jboss.jbossesb:rosetta</include>
-	           <include>org.jboss.jbossesb:config-model</include>
                <include>log4j:log4j</include>
             </includes>
         </dependencySet>
@@ -131,7 +130,7 @@
             <outputDirectory>samples/brokerage/broker/lib</outputDirectory>
 		<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
             <includes>
-               <include>org.jboss.soa.overlord.cdl.runtime:cdl-jbossesb</include>
+               <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
                <include>org.jboss.jbossesb:rosetta</include>
                <include>log4j:log4j</include>
             </includes>
@@ -140,7 +139,7 @@
             <outputDirectory>samples/brokerage/supplier/lib</outputDirectory>
 		    <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
             <includes>
-               <include>org.jboss.soa.overlord.cdl.runtime:cdl-jbossesb</include>
+               <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
                <include>org.jboss.jbossesb:rosetta</include>
                <include>log4j:log4j</include>
             </includes>
@@ -149,7 +148,7 @@
             <outputDirectory>samples/purchasing/store/lib</outputDirectory>
 		    <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
             <includes>
-               <include>org.jboss.soa.overlord.cdl.runtime:cdl-jbossesb</include>
+               <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
                <include>org.jboss.jbossesb:rosetta</include>
                <include>log4j:log4j</include>
             </includes>
@@ -158,7 +157,7 @@
             <outputDirectory>samples/common/creditAgency/lib</outputDirectory>
 	    	<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
             <includes>
-               <include>org.jboss.soa.overlord.cdl.runtime:cdl-jbossesb</include>
+               <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
                <include>org.jboss.jbossesb:rosetta</include>
                <include>log4j:log4j</include>
             </includes>

Modified: cdl/trunk/install.xml
===================================================================
--- cdl/trunk/install.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/install.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -16,7 +16,7 @@
     <target name="install" depends="init">
         <echo message="Install the libraries into the local maven repo" />
 	<exec executable="${shell}">
-           <arg line="-c 'mvn install:install-file -DgroupId=org.jboss.jbossesb -DartifactId=rosetta -Dversion=4.3 -Dpackaging=jar -Dfile=${libraries.dir}/rosetta-4.3.jar'" />
+           <arg line="-c 'mvn install:install-file -DgroupId=org.jboss.jbossesb -DartifactId=rosetta -Dversion=4.5 -Dpackaging=jar -Dfile=${libraries.dir}/rosetta-4.5.jar'" />
         </exec>
 	<exec executable="${shell}">
 	   <arg line="-c 'mvn install:install-file -DgroupId=org.jboss.jbossesb -DartifactId=config-model -Dversion=1.0.1 -Dpackaging=jar -Dfile=${libraries.dir}/config-model-1.0.1.jar'" />

Modified: cdl/trunk/pom.xml
===================================================================
--- cdl/trunk/pom.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/pom.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -45,6 +45,9 @@
 
 	<properties>
 		<overlord-version>1.0-SNAPSHOT</overlord-version>
+		<junit.version>4.4</junit.version>
+		<rosetta.version>4.5</rosetta.version>
+		<log4j.version>1.2.14</log4j.version>
 	</properties>
 	
 	<profiles>

Modified: cdl/trunk/runtime/jbossesb/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/pom.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/runtime/jbossesb/pom.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -24,19 +24,14 @@
 			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
-				<version>1.2.14</version>
+				<version>${log4j.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.jbossesb</groupId>
 				<artifactId>rosetta</artifactId>
-				<version>4.3</version>
+				<version>${rosetta.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.jboss.jbossesb</groupId>
-				<artifactId>config-model</artifactId>
-				<version>1.0.1</version>
-			</dependency>
-			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate</artifactId>
 				<version>${hibernate-version}</version>
@@ -64,7 +59,7 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.4</version>
+				<version>${junit.version}</version>
 				<scope>test</scope>
 			</dependency>
 		</dependencies>

Modified: cdl/trunk/runtime/jbossesb-assembly/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb-assembly/pom.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/runtime/jbossesb-assembly/pom.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -49,7 +49,7 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.4</version>
+				<version>${junit.version}</version>
 				<scope>test</scope>
 			</dependency>
 			

Modified: cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -19,12 +19,12 @@
 			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
-				<version>1.2.14</version>
+				<version>${log4j.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
-				<artifactId>cdl-jbossesb</artifactId>
+				<artifactId>cdl-runtime-jbossesb</artifactId>
 				<version>${cdl.jbossesb.version}</version>
 				<scope>provided</scope>
 			</dependency>

Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -19,12 +19,12 @@
 			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
-				<version>1.2.14</version>
+				<version>${log4j.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
-				<artifactId>cdl-jbossesb</artifactId>
+				<artifactId>cdl-runtime-jbossesb</artifactId>
 				<version>${cdl.jbossesb.version}</version>
 				<scope>provided</scope>
 			</dependency>

Modified: cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -19,12 +19,12 @@
 			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
-				<version>1.2.14</version>
+				<version>${log4j.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
-				<artifactId>cdl-jbossesb</artifactId>
+				<artifactId>cdl-runtime-jbossesb</artifactId>
 				<version>${cdl.jbossesb.version}</version>
 				<scope>provided</scope>
 			</dependency>

Modified: cdl/trunk/samples/jbossesb/purchasing/store/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/pom.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/samples/jbossesb/purchasing/store/pom.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -19,12 +19,12 @@
 			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
-				<version>1.2.14</version>
+				<version>${log4j.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
-				<artifactId>cdl-jbossesb</artifactId>
+				<artifactId>cdl-runtime-jbossesb</artifactId>
 				<version>${cdl.jbossesb.version}</version>
 				<scope>provided</scope>
 			</dependency>

Modified: cdl/trunk/validator/jbossesb/pom.xml
===================================================================
--- cdl/trunk/validator/jbossesb/pom.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/validator/jbossesb/pom.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -18,57 +18,51 @@
 			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
-				<version>1.2.14</version>
+				<version>${log4j.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.jbossesb</groupId>
 				<artifactId>rosetta</artifactId>
-				<version>4.3</version>
+				<version>${rosetta.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.jboss.jbossesb</groupId>
-				<artifactId>config-model</artifactId>
-				<version>1.0.1</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.4</version>
+				<version>${junit.version}</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
-    				<groupId>org.pi4soa</groupId>
-                   	<artifactId>common</artifactId>
-                    	<version>2.0</version>
+    			<groupId>org.pi4soa</groupId>
+               	<artifactId>common</artifactId>
+               	<version>2.0</version>
 				<scope>provided</scope>
-          		</dependency>
+          	</dependency>
 			<dependency>
-    				<groupId>org.pi4soa</groupId>
-                   	<artifactId>cdl</artifactId>
-                    	<version>2.0</version>
+    			<groupId>org.pi4soa</groupId>
+               	<artifactId>cdl</artifactId>
+               	<version>2.0</version>
 				<scope>provided</scope>
-          		</dependency>
+          	</dependency>
 			<dependency>
-    				<groupId>org.pi4soa</groupId>
-                   	<artifactId>service</artifactId>
-                    	<version>2.0</version>
+    			<groupId>org.pi4soa</groupId>
+               	<artifactId>service</artifactId>
+               	<version>2.0</version>
 				<scope>provided</scope>
-          		</dependency>
+          	</dependency>
 			<dependency>
-    				<groupId>org.eclipse.emf</groupId>
-                   	<artifactId>common</artifactId>
+    			<groupId>org.eclipse.emf</groupId>
+               	<artifactId>common</artifactId>
 				<version>2.3.0</version>
 				<scope>provided</scope>
-          		</dependency>
+          	</dependency>
 			<dependency>
-    				<groupId>org.eclipse.emf</groupId>
-                   	<artifactId>ecore</artifactId>
+    			<groupId>org.eclipse.emf</groupId>
+               	<artifactId>ecore</artifactId>
 				<version>2.3.1</version>
 				<scope>provided</scope>
-          		</dependency>
+          	</dependency>
 		</dependencies>
 	
 	<build>

Modified: cdl/trunk/validator/jbossesb-assembly/pom.xml
===================================================================
--- cdl/trunk/validator/jbossesb-assembly/pom.xml	2009-02-25 14:20:10 UTC (rev 521)
+++ cdl/trunk/validator/jbossesb-assembly/pom.xml	2009-02-26 02:02:25 UTC (rev 522)
@@ -24,7 +24,7 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.4</version>
+				<version>${junit.version}</version>
 				<scope>test</scope>
 			</dependency>
 			




More information about the overlord-commits mailing list