Author: saminda
Date: Thu May 29 10:03:53 2008
New Revision: 17607
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17607

Log:
fixed a bug found in generated pom.xml 


Modified:
   branches/wsas/java/2.3/commons/codegen/pom.xml
   branches/wsas/java/2.3/commons/codegen/src/main/resources/codegen-pom.xsl

Modified: branches/wsas/java/2.3/commons/codegen/pom.xml
URL: 
http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/commons/codegen/pom.xml?rev=17607&r1=17606&r2=17607&view=diff
==============================================================================
--- branches/wsas/java/2.3/commons/codegen/pom.xml      (original)
+++ branches/wsas/java/2.3/commons/codegen/pom.xml      Thu May 29 10:03:53 2008
@@ -5,7 +5,7 @@
     <groupId>org.wso2.codegen</groupId>
     <artifactId>wso2codegen</artifactId>
     <packaging>jar</packaging>
-    <version>2.2</version>
+    <version>2.3-SNAPSHOT</version>
     <name>wso2codegen</name>
     <url>http://www.wso2.org</url>
 
@@ -42,7 +42,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.2</version>
             </plugin>
-          
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -260,8 +260,8 @@
             <version>${javamail.version}</version>
         </dependency>
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
             <version>${xbean.version}</version>
         </dependency>
 
@@ -304,7 +304,13 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
         </dependency>
-        
+
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>${backport.util.concurrent.version}</version>
+        </dependency>
+
     </dependencies>
 
     <repositories>
@@ -365,33 +371,33 @@
     </pluginRepositories>
 
     <profiles>
-         <profile>
-             <activation>
-                 <property>
-                     <name>sign</name>
-                 </property>
-             </activation>
-             <build>
-                 <plugins>
-                     <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-gpg-plugin</artifactId>
-                         <version>1.0-alpha-3</version>
-                         <executions>
-                             <execution>
-                                 <id>sign-artifacts</id>
-                                 <phase>verify</phase>
-                                 <goals>
-                                     <goal>sign</goal>
-                                 </goals>
-                             </execution>
-                         </executions>
-                     </plugin>
-                 </plugins>
-             </build>
-         </profile>
-     </profiles>
-        
+        <profile>
+            <activation>
+                <property>
+                    <name>sign</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.0-alpha-3</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 
     <distributionManagement>
         <repository>
@@ -408,18 +414,18 @@
 
     <properties>
         <!-- Properties are using in pom.xml as well as to filter 
codegen-pom.xml-->
-        <axis2.version>1.35</axis2.version>
+        <axis2.version>1.4</axis2.version>
         <wso2codegen.version>${pom.version}</wso2codegen.version>
         <wso2utils.version>2.2</wso2utils.version>
         <dynamiccodegen.version>2.2</dynamiccodegen.version>
-        <neethi.version>2.0.3</neethi.version>
-        <rampart.version>1.35</rampart.version>
-        <axiom.version>1.2.6</axiom.version>
-        <XmlSchema.version>1.3.3</XmlSchema.version>
-        <xbean.version>2.1.0</xbean.version>
+        <neethi.version>2.0.4</neethi.version>
+        <rampart.version>1.4</rampart.version>
+        <axiom.version>1.2.7</axiom.version>
+        <XmlSchema.version>1.4.2</XmlSchema.version>
+        <xbean.version>2.3.0</xbean.version>
 
-        <woden.version>0.95</woden.version>
-        <wsdl4j.version>1.6.1</wsdl4j.version>
+        <woden.version>1.0M8</woden.version>
+        <wsdl4j.version>1.6.2</wsdl4j.version>
         <annogen.version>0.1.0</annogen.version>
 
         <javamail.version>1.4</javamail.version>
@@ -435,5 +441,6 @@
         <httpcore.version>4.0-alpha5</httpcore.version>
         <ant.version>1.7.0</ant.version>
         <xalan.version>2.7.0</xalan.version>
+        
<backport.util.concurrent.version>3.1</backport.util.concurrent.version>
     </properties>
 </project>

Modified: 
branches/wsas/java/2.3/commons/codegen/src/main/resources/codegen-pom.xsl
URL: 
http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/commons/codegen/src/main/resources/codegen-pom.xsl?rev=17607&r1=17606&r2=17607&view=diff
==============================================================================
--- branches/wsas/java/2.3/commons/codegen/src/main/resources/codegen-pom.xsl   
(original)
+++ branches/wsas/java/2.3/commons/codegen/src/main/resources/codegen-pom.xsl   
Thu May 29 10:03:53 2008
@@ -17,9 +17,8 @@
                  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
             <modelVersion>4.0.0</modelVersion>
             <groupId>org.wso2.wsas.sdk</groupId>
-            <artifactId><xsl:value-of select="generate-id()"/>-
-                <xsl:value-of select="$name"/>
-            </artifactId>
+            <xsl:variable name="projectArtifactName"><xsl:value-of 
select="generate-id()"/>-<xsl:value-of select="$name"/></xsl:variable>
+            <artifactId><xsl:value-of 
select="$projectArtifactName"/></artifactId>
             <packaging>jar</packaging>
             <version>
                 <xsl:value-of select="$version"/>
@@ -45,8 +44,8 @@
                         <artifactId>maven-compiler-plugin</artifactId>
                         <version>2.0</version>
                         <configuration>
-                            <source>1.4</source>
-                            <target>1.4</target>
+                            <source>1.5</source>
+                            <target>1.5</target>
                         </configuration>
                     </plugin>
 
@@ -166,9 +165,9 @@
                 </dependency>
 
                 <dependency>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xbean</artifactId>
-                    <version>2.1.0</version>
+                    <groupId>org.apache.xmlbeans</groupId>
+                    <artifactId>xmlbeans</artifactId>
+                    <version>2.3.0</version>
                 </dependency>
 
                 <dependency>
@@ -210,7 +209,7 @@
                 <dependency>
                     <groupId>backport-util-concurrent</groupId>
                     <artifactId>backport-util-concurrent</artifactId>
-                    <version>2.1</version>
+                    <version>3.1</version>
                 </dependency>
 
                 <dependency>
@@ -364,7 +363,7 @@
                 <dependency>
                     <groupId>org.apache.rampart</groupId>
                     <artifactId>rampart-trust</artifactId>
-                    <version>1.35</version>
+                    <version>${rampart.version}</version>
                     <exclusions>
                         <exclusion>
                             <groupId>org.apache.axis2</groupId>

_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev

Reply via email to