From: <bob...@us...> - 2012-05-08 19:53:08
|
Revision: 15236 http://andromda.svn.sourceforge.net/andromda/?rev=15236&view=rev Author: bobfields Date: 2012-05-08 19:52:59 +0000 (Tue, 08 May 2012) Log Message: ----------- Version updates: tomahawk12 1.1.12, commons-io 2.3, javassist 3.16, h2 1.3.166, testng 6.5.2, cxf 2.6.0, hibernate 4.2.3, spring 3.1.1, jetty 8.1.3, ear-plugin 2.7, failsafe 2.12. Modified Paths: -------------- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/CXF/pom.xml.vsl 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/build.properties.vsl trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/build.xml.vsl trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/andromda.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 trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/webservice/pom.xml.vsl trunk/andromda-documentation/samples/demo-ejb3/pom.xml trunk/andromda-documentation/samples/timetracker/web/pom.xml trunk/andromda-etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution Wizard Files/pom.xml trunk/cartridges/andromda-ejb3/pom.xml trunk/cartridges/andromda-java/pom.xml trunk/cartridges/andromda-webservice/pom.xml trunk/cartridges/support/webservice-client/pom.xml trunk/maven/maven-parent/pom.xml trunk/maven/pom.xml trunk/pom.xml trunk/samples/animal-quiz/mda/src/main/config/andromda.xml trunk/samples/car-rental-system/mda/src/main/config/andromda.xml trunk/samples/crud/mda/src/main/config/andromda.xml Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/CXF/pom.xml.vsl =================================================================== --- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/CXF/pom.xml.vsl 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/CXF/pom.xml.vsl 2012-05-08 19:52:59 UTC (rev 15236) @@ -36,7 +36,7 @@ --> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> + <artifactId>spring-web</artifactId> <version>${spring.version}</version> </dependency> <dependency> @@ -81,7 +81,7 @@ </plugin> <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.1.1</version> + <version>2.2</version> <configuration> <warSourceDirectory>src/main/webapp</warSourceDirectory> <excludes>**/*.java</excludes> @@ -129,7 +129,7 @@ <configuration> <connectors> <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> - <port>9090</port> + <port>${service.port}</port> <maxIdleTime>60000</maxIdleTime> </connector> </connectors> @@ -173,7 +173,7 @@ #end <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.11</version> + <version>2.12</version> <configuration> <parallel>methods</parallel> <threadCount>5</threadCount> 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 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/app/pom.xml.vsl 2012-05-08 19:52:59 UTC (rev 15236) @@ -112,7 +112,7 @@ <plugins> <plugin> <artifactId>maven-ear-plugin</artifactId> - <version>2.6</version> + <version>2.7</version> <configuration> <generateApplicationXml>true</generateApplicationXml> <includeJar>false</includeJar> 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 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/core/pom.xml.vsl 2012-05-08 19:52:59 UTC (rev 15236) @@ -145,6 +145,17 @@ <artifactId>hibernate-commons-annotations</artifactId> <version>3.3.0.ga</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + </exclusion> + <!-- Use persistence api 2.0 instead of 1.0 --> + <exclusion> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>net.sf.ehcache</groupId> @@ -215,6 +226,10 @@ <artifactId>commons-beanutils</artifactId> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -236,6 +251,10 @@ <artifactId>hibernate-entitymanager</artifactId> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </dependency> + <dependency> <groupId>jboss</groupId> <artifactId>jboss-j2ee</artifactId> </dependency> @@ -372,6 +391,13 @@ <version>1.0.0.Alpha9</version> <scope>test</scope> </dependency--> + <!-- for javax.annotation.Resource, see http://jaitechwriteups.blogspot.com/2011/02/resource-and-new-lookup-attribute-how.html --> + <dependency> + <groupId>org.jboss.spec.javax.annotation</groupId> + <artifactId>jboss-annotations-api_1.1_spec</artifactId> + <version>1.0.0.Final</version> + <scope>provided</scope> + </dependency> #else <dependency> <groupId>jboss</groupId> @@ -516,6 +542,14 @@ #end #if ($ejb3) <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> </dependency> @@ -536,10 +570,10 @@ <artifactId>derby</artifactId> </dependency> #elseif ($h2) - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> #elseif ($hypersonic) <dependency> <groupId>org.hsqldb</groupId> Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/build.properties.vsl =================================================================== --- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/build.properties.vsl 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/build.properties.vsl 2012-05-08 19:52:59 UTC (rev 15236) @@ -80,7 +80,7 @@ # The remoting mechanism to use remote.type=httpinvoker remote.server=127.0.0.1 -remote.port=9090 +remote.port=${service.port} #I think these dir variables are outdated, but I'm reluctant to remove source.client.base.dir=client/src Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/build.xml.vsl =================================================================== --- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/build.xml.vsl 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/build.xml.vsl 2012-05-08 19:52:59 UTC (rev 15236) @@ -36,7 +36,7 @@ <pathelement location="${m2repo}/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"/> <pathelement location="${m2repo}/commons-beanutils/commons-beanutils-core/1.8.3/commons-beanutils-1.8.3.jar"/> #if ($spring || $hibernate) - <pathelement location="${m2repo}/org/hibernate/hibernate/3.6.8.Final/hibernate-3.6.8.Final.jar"/> + <pathelement location="${m2repo}/org/hibernate/hibernate/${hibernate.version}/hibernate-${hibernate.version}.jar"/> <pathelement location="${m2repo}/org/springframework/spring/${spring.version}/spring-${spring.version}.jar"/> #elseif ($cxf) <pathelement location="${m2repo}/org/springframework/spring/${spring.version}/spring-${spring.version}.jar"/> Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/andromda.xml.vsl =================================================================== --- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/andromda.xml.vsl 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/andromda.xml.vsl 2012-05-08 19:52:59 UTC (rev 15236) @@ -122,7 +122,7 @@ <property name="xmlEncoding">ISO-8859-1</property> <property name="enumerationLiteralNameMask">upperunderscore</property> #if ($spring || $hibernate) - <property name="hibernateVersion">3</property> + <property name="hibernateVersion">${hibernate.version}</property> <property name="hibernateEntityAnnotations">false</property> #end <property name="persistenceContainerName">jboss</property> @@ -399,7 +399,7 @@ #end <property name="defaultProvider">RPC</property> <property name="applicationName">${application.id}</property> - <property name="wsdlSoapAddress">http://${webservice.host}:${webservice.port}/${application.id}-ws/services</property> + <property name="wsdlSoapAddress">http://${webservice.host}:${service.port}/${application.id}-ws/services</property> <property name="webserviceTypesPackage">${application.package}</property> #if ($spring || $hibernate) <property name="ejbInterfacePattern">{0}.ejb.{1}</property> @@ -429,7 +429,7 @@ <property name="xjcArguments">-Xts,-Xts:style:simple,-Xdv</property> <!-- webserviceHost:webservicePort/webContext/servicesPath used in wsdl and spring configuration --> <property name="webserviceHost">${webservice.host}</property> - <property name="webservicePort">${webservice.port}</property> + <property name="webservicePort">${service.port}</property> <property name="webContext">${application.id}-webservice</property> <property name="servicesPath">services</property> <!-- Creates default/dummy implementation for service, iterating down through parameter hierarchy --> 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 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl 2012-05-08 19:52:59 UTC (rev 15236) @@ -138,6 +138,7 @@ <dependency> <groupId>org.apache.myfaces.tomahawk</groupId> <artifactId>tomahawk12</artifactId> + <!--version>1.1.12</version--> <version>1.1.10</version> #if($ear) <exclusions> @@ -359,7 +360,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.1</version> + <version>2.3</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -483,7 +484,7 @@ <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> - <version>2.5.0</version> + <version>2.5.2</version> <type>pom</type> <scope>provided</scope> </dependency> @@ -492,7 +493,7 @@ <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.15.0-GA</version> + <version>3.16.1-GA</version> </dependency> #end #else @@ -536,7 +537,7 @@ <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.15.0-GA</version> + <version>3.16.1-GA</version> #if ($ear) <scope>test</scope> #end @@ -970,14 +971,47 @@ #end </dependency> #end -#if (!$spring && $cxf) +#if ($cxf) + <!-- Explicit Spring dependencies to avoid compile/run version mismatch, shown by: Error creating bean Caused by: java.lang.NoSuchFieldError: NULL --> +#if (!$spring) <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> <version>${spring.version}</version> </dependency> +#if (!$embeddedJetty) + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> + </dependency> #end -#if ($cxf) + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> + </dependency> +#end <!-- Uncomment out four below if using JMS> <dependency> <groupId>org.springframework</groupId> @@ -1078,7 +1112,7 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> - <version>2.2.4-1</version> + <version>2.2.5-b10</version> <scope>provided</scope> </dependency> <dependency> @@ -1134,7 +1168,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.163</version> + <version>1.3.166</version> #if (!$embeddedJetty) <scope>test</scope> #end @@ -1145,7 +1179,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.3.1</version> + <version>6.5.2</version> <scope>test</scope> #if ($ejb3) <exclusions> @@ -1619,14 +1653,20 @@ --> #end #if ($cxf) - <cxf.version>2.5.3</cxf.version> - <cxf.xjc.version>2.4.0</cxf.xjc.version> + <cxf.version>2.6.0</cxf.version> + <cxf.xjc.version>2.6.0</cxf.xjc.version> #end -#if ($spring || $hibernate || $ejb3) +#if ($spring) + <!-- Set andromda.xml hibernateVersion=4, sessionFactory and localTransactionManager to hibernate4 + <hibernate.version>4.1.3.Final</hibernate.version--> <hibernate.version>3.6.9.Final</hibernate.version> +#elseif ($hibernate || $ejb3) + <!-- Set andromda.xml hibernateVersion=3, sessionFactory and localTransactionManager to hibernate3 + <hibernate.version>3.6.9.Final</hibernate.version--> + <hibernate.version>4.1.3.Final</hibernate.version> #end #if ($cxf || $embeddedJetty) - <jetty.version>8.0.4.v20111024</jetty.version> + <jetty.version>8.1.3.v20120416</jetty.version> #end #if ($cxf || $spring) <spring.version>3.1.1.RELEASE</spring.version> @@ -1858,11 +1898,13 @@ #end </jdbc.exception.sorter> #if ($webservice) - <!-- Change this to the host on which your webservice will be deployed --> - <webservice.host>localhost</webservice.host> - <!-- Change this the port on which your webservice will be deploy --> - <webservice.port>9090</webservice.port> + <!-- Change this to the host on which your webapp/service will be deployed --> + <service.host>localhost</service.host> #end +#if ($cxf || $embeddedJetty) + <!-- Change this the port on which your webapp/service will be deployed --> + <service.port>9090</service.port> +#end </properties> <build> <pluginManagement> @@ -1902,7 +1944,7 @@ </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> + <version>2.4</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> @@ -1913,11 +1955,11 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>2.11</version> + <version>2.12</version> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> - <version>2.2</version> + <version>2.4</version> <!--dependencies> <dependency> <groupId>org.apache.maven.doxia</groupId> 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 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/pom.xml.vsl 2012-05-08 19:52:59 UTC (rev 15236) @@ -391,7 +391,7 @@ </plugin> <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.1.1</version> + <version>2.2</version> <configuration> <warSourceDirectory>target/src/main/webapp</warSourceDirectory> <!-- Needed for mvn 2.1 with war-plugin 2.1. See http://jira.codehaus.org/browse/MWAR-187 --> @@ -440,7 +440,7 @@ <configuration> <connectors> <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> - <port>9090</port> + <port>${service.port}</port> <maxIdleTime>60000</maxIdleTime> </connector> </connectors> Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/webservice/pom.xml.vsl =================================================================== --- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/webservice/pom.xml.vsl 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/webservice/pom.xml.vsl 2012-05-08 19:52:59 UTC (rev 15236) @@ -173,7 +173,7 @@ </plugin> <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.1.1</version> + <version>2.2</version> <configuration> <!-- Default for maven is src/main/webapp. WebContent is Eclipse convention. --> <warSourceDirectory>src/main/webapp</warSourceDirectory> @@ -209,7 +209,7 @@ <configuration> <connectors> <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> - <port>9090</port> + <port>${service.port}</port> <maxIdleTime>60000</maxIdleTime> </connector> </connectors> Modified: trunk/andromda-documentation/samples/demo-ejb3/pom.xml =================================================================== --- trunk/andromda-documentation/samples/demo-ejb3/pom.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-documentation/samples/demo-ejb3/pom.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -196,7 +196,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>4.0.1.Final</version> + <version>4.1.3.Final</version> <scope>provided</scope> </dependency> <dependency> @@ -350,7 +350,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <!--version>6.3.1</version> + <!--version>6.5.2</version> <scope>test</scope--> </dependency> <!--dependency> Modified: trunk/andromda-documentation/samples/timetracker/web/pom.xml =================================================================== --- trunk/andromda-documentation/samples/timetracker/web/pom.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-documentation/samples/timetracker/web/pom.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -43,7 +43,8 @@ <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-web</artifactId> - <version>${spring.version}</version> + <!-- 3.1.1.RELEASE spring-security not available yet 5/1/2012, can't use ${spring.version} --> + <version>3.1.0.RELEASE</version> </dependency> <dependency> <groupId>commons-codec</groupId> Modified: trunk/andromda-etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution Wizard Files/pom.xml =================================================================== --- trunk/andromda-etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution Wizard Files/pom.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/andromda-etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution Wizard Files/pom.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -91,7 +91,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>2.1</version> + <version>2.4.1</version> </plugin> </plugins> </pluginManagement> @@ -111,6 +111,6 @@ </pluginRepository> </pluginRepositories> <prerequisites> - <maven>2.0.1</maven> + <maven>2.0.10</maven> </prerequisites> </project> \ No newline at end of file Modified: trunk/cartridges/andromda-ejb3/pom.xml =================================================================== --- trunk/cartridges/andromda-ejb3/pom.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/cartridges/andromda-ejb3/pom.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -43,13 +43,13 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>4.0.1.Final</version> + <version>4.1.3.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.spec</groupId> <artifactId>jboss-javaee-web-6.0</artifactId> - <version>2.0.0.Final</version> + <version>3.0.1.Final</version> <type>pom</type> <scope>test</scope> <exclusions> @@ -69,7 +69,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.3.1</version> + <version>6.5.2</version> <scope>test</scope> <exclusions> <exclusion> Modified: trunk/cartridges/andromda-java/pom.xml =================================================================== --- trunk/cartridges/andromda-java/pom.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/cartridges/andromda-java/pom.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -24,7 +24,7 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>2.5.1</version> + <version>2.6.0</version> <scope>test</scope> <exclusions> <exclusion> Modified: trunk/cartridges/andromda-webservice/pom.xml =================================================================== --- trunk/cartridges/andromda-webservice/pom.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/cartridges/andromda-webservice/pom.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -136,7 +136,7 @@ <dependency> <groupId>org.apache.neethi</groupId> <artifactId>neethi</artifactId> - <version>3.0.1</version> + <version>3.0.2</version> <scope>test</scope> </dependency> <!-- Conflicts with parser from JDK 6 --> @@ -156,7 +156,7 @@ <dependency> <groupId>org.apache.ws.xmlschema</groupId> <artifactId>xmlschema-core</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> <scope>test</scope> </dependency> <dependency> @@ -222,7 +222,7 @@ </build> <properties> <andromda.version>3.4-SNAPSHOT</andromda.version> - <axiom.version>1.2.12</axiom.version> + <axiom.version>1.2.13</axiom.version> <uml2.output.dir>${project.basedir}/target/cartridge-test/actualUML2</uml2.output.dir> <uml2.model.uri>file:${src.dir}/uml2/WebServiceMetafacadeModel.uml</uml2.model.uri> <uml2.test.model.uri>file:${test.src.dir}/uml2/WebServiceCartridgeTestModel.uml</uml2.test.model.uri> Modified: trunk/cartridges/support/webservice-client/pom.xml =================================================================== --- trunk/cartridges/support/webservice-client/pom.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/cartridges/support/webservice-client/pom.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.12</version> + <version>1.2.13</version> <optional>true</optional> <exclusions> <exclusion> @@ -56,7 +56,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.12</version> + <version>1.2.13</version> <optional>true</optional> <exclusions> <exclusion> @@ -98,7 +98,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.5</version> + <version>1.6</version> <optional>true</optional> </dependency> <dependency> @@ -131,7 +131,7 @@ </dependency> </dependencies> <properties> - <spring.version>3.0.6.RELEASE</spring.version> + <spring.version>3.1.1.RELEASE</spring.version> </properties> <build> <plugins> Modified: trunk/maven/maven-parent/pom.xml =================================================================== --- trunk/maven/maven-parent/pom.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/maven/maven-parent/pom.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -456,30 +456,30 @@ <maven-archetype-plugin.version>2.2</maven-archetype-plugin.version> <maven-assembly-plugin.version>2.2.2</maven-assembly-plugin.version> <maven-changelog-plugin.version>2.2</maven-changelog-plugin.version> - <maven-changes-plugin.version>2.5</maven-changes-plugin.version> + <maven-changes-plugin.version>2.7</maven-changes-plugin.version> <maven-checkstyle-plugin.version>2.6</maven-checkstyle-plugin.version> <maven-clean-plugin.version>2.4.1</maven-clean-plugin.version> - <maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version> + <maven-compiler-plugin.version>2.4</maven-compiler-plugin.version> <maven-dependency-plugin.version>2.4</maven-dependency-plugin.version> - <maven-deploy-plugin.version>2.6</maven-deploy-plugin.version> - <maven-eclipse-plugin.version>2.8</maven-eclipse-plugin.version> - <maven-enforcer-plugin.version>1.0</maven-enforcer-plugin.version> - <maven-gpg-plugin.version>1.3</maven-gpg-plugin.version> + <maven-deploy-plugin.version>2.7</maven-deploy-plugin.version> + <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version> + <maven-enforcer-plugin.version>1.0.1</maven-enforcer-plugin.version> + <maven-gpg-plugin.version>1.4</maven-gpg-plugin.version> <maven-install-plugin.version>2.3.1</maven-install-plugin.version> <maven-invoker-plugin.version>1.5</maven-invoker-plugin.version> - <maven-jar-plugin.version>2.3.1</maven-jar-plugin.version> - <maven-javadoc-plugin.version>2.8</maven-javadoc-plugin.version> - <maven-jxr-plugin.version>2.2</maven-jxr-plugin.version> + <maven-jar-plugin.version>2.4</maven-jar-plugin.version> + <maven-javadoc-plugin.version>2.8.1</maven-javadoc-plugin.version> + <maven-jxr-plugin.version>2.3</maven-jxr-plugin.version> <maven-pmd-plugin.version>2.6</maven-pmd-plugin.version> <maven-project-info-reports-plugin.version>2.4</maven-project-info-reports-plugin.version> <maven-resources-plugin.version>2.5</maven-resources-plugin.version> <maven-site-plugin.version>2.2</maven-site-plugin.version> <maven-source-plugin.version>2.1.2</maven-source-plugin.version> - <maven-surefire-plugin.version>2.11</maven-surefire-plugin.version> - <maven-surefire-report-plugin.version>2.11</maven-surefire-report-plugin.version> - <clirr-maven-plugin.version>2.3</clirr-maven-plugin.version> + <maven-surefire-plugin.version>2.12</maven-surefire-plugin.version> + <maven-surefire-report-plugin.version>2.12</maven-surefire-report-plugin.version> + <clirr-maven-plugin.version>2.4</clirr-maven-plugin.version> <cobertura-maven-plugin.version>2.5.1</cobertura-maven-plugin.version> - <findbugs-maven-plugin.version>2.3.3</findbugs-maven-plugin.version> + <findbugs-maven-plugin.version>2.4.0</findbugs-maven-plugin.version> <javancss-maven-plugin.version>2.0</javancss-maven-plugin.version> <jdepend-maven-plugin.version>2.0-beta-2</jdepend-maven-plugin.version> <sablecc-maven-plugin.version>2.2</sablecc-maven-plugin.version> Modified: trunk/maven/pom.xml =================================================================== --- trunk/maven/pom.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/maven/pom.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -59,7 +59,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-archiver</artifactId> - <version>2.4.2</version> + <version>2.5</version> </dependency> <dependency> <groupId>org.apache.maven.plugins</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/pom.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -216,7 +216,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.1</version> + <version>2.3</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -583,6 +583,7 @@ <linksource>true</linksource> <detectLinks>true</detectLinks> <detectOfflineLinks>true</detectOfflineLinks> + <extdirs>${project.basedir}/target/src/min/java</extdirs> <links> <link>http://download.oracle.com/javase/6/docs/api/</link> <link>http://download.oracle.com/javaee/1.4/api/</link> @@ -1095,11 +1096,11 @@ <maven-archetype-plugin.version>2.2</maven-archetype-plugin.version> <maven-assembly-plugin.version>2.3</maven-assembly-plugin.version> <maven-changelog-plugin.version>2.2</maven-changelog-plugin.version> - <maven-changes-plugin.version>2.6</maven-changes-plugin.version> + <maven-changes-plugin.version>2.7</maven-changes-plugin.version> <!-- v2.9 gives IllegalCharsetException UTF-8,ISO-8859-1 --> <maven-checkstyle-plugin.version>2.8</maven-checkstyle-plugin.version> <maven-clean-plugin.version>2.4.1</maven-clean-plugin.version> - <maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version> + <maven-compiler-plugin.version>2.4</maven-compiler-plugin.version> <maven-dependency-plugin.version>2.4</maven-dependency-plugin.version> <maven-deploy-plugin.version>2.7</maven-deploy-plugin.version> <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version> @@ -1116,7 +1117,7 @@ <maven-project-info-reports-plugin.version>2.4</maven-project-info-reports-plugin.version> <maven-release-plugin.version>2.2.2</maven-release-plugin.version> <maven-resources-plugin.version>2.5</maven-resources-plugin.version> - <maven-site-plugin.version>2.3</maven-site-plugin.version> + <maven-site-plugin.version>2.4</maven-site-plugin.version> <maven-source-plugin.version>2.1.2</maven-source-plugin.version> <maven-surefire-plugin.version>2.12</maven-surefire-plugin.version> <maven-surefire-report-plugin.version>2.12</maven-surefire-report-plugin.version> @@ -1127,7 +1128,7 @@ <jdepend-maven-plugin.version>2.0-beta-2</jdepend-maven-plugin.version> <sablecc-maven-plugin.version>2.2</sablecc-maven-plugin.version> <taglist-maven-plugin.version>2.4</taglist-maven-plugin.version> - <versions-maven-plugin.version>1.2</versions-maven-plugin.version> + <versions-maven-plugin.version>1.3.1</versions-maven-plugin.version> <xml-maven-plugin.version>1.0</xml-maven-plugin.version> <uniqueVersion>false</uniqueVersion> </properties> @@ -1900,7 +1901,7 @@ </file> </activation> <properties> - <maven-site-plugin.version>3.0</maven-site-plugin.version> + <maven-site-plugin.version>3.1</maven-site-plugin.version> </properties> <build> <pluginManagement> @@ -1908,7 +1909,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.0</version> + <version>${maven-site-plugin.version}</version> <configuration> <locales>en</locales> </configuration> Modified: trunk/samples/animal-quiz/mda/src/main/config/andromda.xml =================================================================== --- trunk/samples/animal-quiz/mda/src/main/config/andromda.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/samples/animal-quiz/mda/src/main/config/andromda.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -45,7 +45,8 @@ <property name="entityNameMask">none</property> <property name="entityPropertyNameMask">none</property> <property name="parameterNameMask">none</property> - <property name="hibernateVersion">3</property> + <property name="hibernateVersion">${hibernate.version}</property> + <property name="hibernateEntityAnnotations">false</property> <property name="xmlAttributes">false</property> </properties> </namespace> Modified: trunk/samples/car-rental-system/mda/src/main/config/andromda.xml =================================================================== --- trunk/samples/car-rental-system/mda/src/main/config/andromda.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/samples/car-rental-system/mda/src/main/config/andromda.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -37,7 +37,8 @@ <property name="maxSqlNameLength">30</property> <property name="foreignKeySuffix">_FK</property> <property name="ejbJndiNamePrefix">${application.id}</property> - <property name="hibernateVersion">3</property> + <property name="hibernateVersion">${hibernate.version}</property> + <property name="hibernateEntityAnnotations">false</property> <property name="xmlAttributes">false</property> </properties> </namespace> Modified: trunk/samples/crud/mda/src/main/config/andromda.xml =================================================================== --- trunk/samples/crud/mda/src/main/config/andromda.xml 2012-05-01 22:34:25 UTC (rev 15235) +++ trunk/samples/crud/mda/src/main/config/andromda.xml 2012-05-08 19:52:59 UTC (rev 15236) @@ -32,7 +32,8 @@ <property name="foreignKeySuffix">_FK</property> <property name="ejbJndiNamePrefix">${application.id}</property> <!-- used in both hibernate and spring cartridges --> - <property name="hibernateVersion">3</property> + <property name="hibernateVersion">${hibernate.version}</property> + <property name="hibernateEntityAnnotations">false</property> </properties> </namespace> <!-- See http://docs.andromda.org/andromda-cartridges/andromda-spring-cartridge/namespace.html --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |