Menu
▾
▴
[Andromda-cvs] SF.net SVN: andromda:[15122] trunk/andromda-andromdapp/projects/j2ee/maven2 /src/main/resources/templates/j2ee/maven2
|
From: <bob...@us...> - 2011-06-25 19:08:58
|
Revision: 15122
http://andromda.svn.sourceforge.net/andromda/?rev=15122&view=rev
Author: bobfields
Date: 2011-06-25 19:08:52 +0000 (Sat, 25 Jun 2011)
Log Message:
-----------
DB dependency version updates in andromdapp, EJB3/Seam dependency fixes, testng config only under core.
Modified Paths:
--------------
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/app/pom.xml.vsl
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/core/pom.xml.vsl
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/pom.xml.vsl
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/pom.xml.vsl
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/app/pom.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/app/pom.xml.vsl 2011-06-25 19:08:11 UTC (rev 15121)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/app/pom.xml.vsl 2011-06-25 19:08:52 UTC (rev 15122)
@@ -62,21 +62,21 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
- <version>unknown</version>
+ <version>2.2.0.GA</version>
<scope>system</scope>
<systemPath>${project.basedir}/target/src/resources/lib/jboss-seam.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.el</groupId>
<artifactId>el-ri</artifactId>
- <version>unknown</version>
+ <version>1.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/target/src/resources/lib/el-ri.jar</systemPath>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>unknown</version>
+ <version>2.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/target/src/resources/lib/el-api.jar</systemPath>
</dependency>
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/core/pom.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/core/pom.xml.vsl 2011-06-25 19:08:11 UTC (rev 15121)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/core/pom.xml.vsl 2011-06-25 19:08:52 UTC (rev 15122)
@@ -212,6 +212,10 @@
</dependency>
#if ($ejb3)
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
</dependency>
@@ -223,10 +227,6 @@
<groupId>jboss</groupId>
<artifactId>jboss-ejb3x</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </dependency>
<!--dependency>
<groupId>hibernate-entitymanager</groupId>
<artifactId>ejb3-persistence</artifactId>
@@ -238,19 +238,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.6.4.Final</version>
- <scope>test</scope>
- </dependency-->
- <!--dependency>
<groupId>jboss</groupId>
<artifactId>ejb3-persistence</artifactId>
- </dependency-->
+ </dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-annotations-ejb3</artifactId>
- </dependency>
+ </dependency-->
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-remoting</artifactId>
@@ -526,7 +520,7 @@
</dependency>
#elseif ($hypersonic)
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
#else
@@ -596,12 +590,29 @@
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.6.ga</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.6.4.Final</version>
</dependency>
</dependencies>
</plugin>
#end
+#if ($ejb3)
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <!-- This trick allows the JBoss EJB3StandaloneBootstrap to find and deploy our compiled EJBs!! -->
+ <systemProperties>
+ <property>
+ <name>java.class.path</name>
+ <value>target/classes</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+#end
#if ($ejb || $ejb3)
<plugin>
<artifactId>maven-ejb-plugin</artifactId>
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/pom.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/pom.xml.vsl 2011-06-25 19:08:11 UTC (rev 15121)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/pom.xml.vsl 2011-06-25 19:08:52 UTC (rev 15122)
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.andromda.profiles.uml14</groupId>
<artifactId>andromda-profile-seam</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<type>xml.zip</type>
<scope>runtime</scope>
</dependency>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.andromda.profiles.uml2</groupId>
<artifactId>andromda-profile-seam</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<type>xml.zip</type>
<scope>runtime</scope>
</dependency>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.andromda.profiles.emf.uml22</groupId>
<artifactId>andromda-seam</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<type>profile.uml</type>
<scope>runtime</scope>
</dependency>
@@ -156,17 +156,17 @@
#end
#if ($cxf)
<!-- CXF 2.3.x wsdl2java on JDK6 gives NoSuchMethodException: javax.xml.bind.annotation.XmlElementRef.required()
- unless we roll back XJC version -->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
+ unless we roll back XJC version -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
<scope>runtime</scope>
- </dependency>
+ </dependency>
<!-- Need to reference the classpath for ant in wsdl2java java2ws -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
- <scope>runtime</scope>
+ <scope>runtime</scope>
</dependency>
<!-- Contains xjc plugins to customize cxf/jaxb2 generated code, see https://jaxb2-commons.dev.java.net/ -->
<!-- If put in compile classpath, the xjc plugins are not added to ant maven.compile.classpath -->
@@ -356,7 +356,7 @@
<goals>
<goal>run</goal>
</goals>
- </execution>
+ </execution>
<!-- Generated ant script runs wsdl2java and java2ws for each service -->
<execution>
<id>buildWS</id>
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl 2011-06-25 19:08:11 UTC (rev 15121)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl 2011-06-25 19:08:52 UTC (rev 15122)
@@ -373,6 +373,11 @@
#end
</dependency>
#if ($ejb3)
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.6.4.Final</version>
+ </dependency>
<!-- JBoss Dependencies -->
<dependency>
<groupId>jboss</groupId>
@@ -392,7 +397,7 @@
<version>4.2.3.GA</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>hibernate-entitymanager</groupId>
<artifactId>ejb3-persistence</artifactId>
<version>3.3.2.GA</version>
@@ -403,7 +408,7 @@
<artifactId>jboss-annotations-ejb3</artifactId>
<version>4.2.3.GA</version>
<scope>provided</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
@@ -1080,7 +1085,7 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>8.4-702.jdbc4</version>
+ <version>9.0-801.jdbc4</version>
#if (!$embeddedJetty)
<scope>test</scope>
#end
@@ -1089,16 +1094,16 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.2.1</version>
+ <version>10.8.1.2</version>
#if (!$embeddedJetty)
<scope>test</scope>
#end
</dependency>
#elseif ($hypersonic)
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <version>2.2.4</version>
#if (!$embeddedJetty)
<scope>test</scope>
#end
@@ -1177,20 +1182,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.8.1</version>
-#if ($ejb3)
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- <!-- This trick allows the JBoss EJB3StandaloneBootstrap to find and deploy our compiled EJBs!! -->
- <systemProperties>
- <property>
- <name>java.class.path</name>
- <value>target/classes</value>
- </property>
- </systemProperties>
- </configuration>
-#end
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/pom.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/pom.xml.vsl 2011-06-25 19:08:11 UTC (rev 15121)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/pom.xml.vsl 2011-06-25 19:08:52 UTC (rev 15122)
@@ -102,25 +102,25 @@
<systemPath>${project.basedir}/target/src/WEB-INF/lib/jboss-seam-ui.jar</systemPath>
</dependency>
<dependency>
- <groupId>org.apache.myfaces</groupId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
- <!--version>unknown</version>
+ <version>1.1.10</version>
<scope>system</scope>
- <systemPath>${project.basedir}/target/src/WEB-INF/lib/tomahawk.jar</systemPath-->
+ <systemPath>${project.basedir}/target/src/WEB-INF/lib/tomahawk.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-api</artifactId>
- <!--version>unknown</version>
+ <version>1.2.9</version>
<scope>system</scope>
- <systemPath>${project.basedir}/target/src/WEB-INF/lib/trinidad-api-1.0.1-incubating-SNAPSHOT.jar</systemPath-->
+ <systemPath>${project.basedir}/target/src/WEB-INF/lib/trinidad-api-1.2.9.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-impl</artifactId>
- <!--version>unknown</version>
+ <version>1.2.9</version>
<scope>system</scope>
- <systemPath>${project.basedir}/target/src/WEB-INF/lib/trinidad-impl-1.0.1-incubating-SNAPSHOT.jar</systemPath-->
+ <systemPath>${project.basedir}/target/src/WEB-INF/lib/trinidad-impl-1.2.9.jar</systemPath>
</dependency>
<dependency>
<groupId>org.cyberneko</groupId>
@@ -265,17 +265,13 @@
<groupId>jboss</groupId>
<artifactId>jboss-ejb3x</artifactId>
</dependency>
+##if($hibernate)
<dependency>
- <groupId>hibernate-entitymanager</groupId>
- <artifactId>ejb3-persistence</artifactId>
- </dependency>
-#if($hibernate)
- <dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
+ <artifactId>hibernate-entitymanager</artifactId>
</dependency>
+##end
#end
-#end
#if ($spring)
<dependency>
<groupId>org.springframework</groupId>
@@ -308,7 +304,7 @@
</dependency>
#elseif ($hypersonic)
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
#else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|