From: <bob...@us...> - 2010-10-31 04:06:59
|
Revision: 14663 http://andromda.svn.sourceforge.net/andromda/?rev=14663&view=rev Author: bobfields Date: 2010-10-31 04:06:52 +0000 (Sun, 31 Oct 2010) Log Message: ----------- Update jetty version: mortbay -> eclipse Modified Paths: -------------- 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/pom.xml.vsl trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/webservice/pom.xml.vsl 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 2010-10-31 04:06:05 UTC (rev 14662) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/build.properties.vsl 2010-10-31 04:06:52 UTC (rev 14663) @@ -9,7 +9,7 @@ project=${applicationParentDirectory.replace('\', '/')}/${applicationId} #if ($cxf) -cxf.version=2.2.9 +cxf.version=2.2.11 #end # Fail on error for ant commands 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 2010-10-31 04:06:05 UTC (rev 14662) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/build.xml.vsl 2010-10-31 04:06:52 UTC (rev 14663) @@ -259,7 +259,7 @@ <pathelement location="${andromda.project}/common/target/classes"/> <path refid="project.classpath"/> <pathelement location="${andromda.project}/webservice/WebContent/WEB-INF/classes"/> - <pathelement location="${m2repo}/org/mortbay/jetty/jetty/6.1.24/jetty-6.1.24.jar"/> + <pathelement location="${m2repo}/org/eclipse/jetty/jetty-server/7.1.1.v20100517/jetty-server-7.1.1.v20100517.jar"/> </classpath> </javac--> #end 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 2010-10-31 04:06:05 UTC (rev 14662) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl 2010-10-31 04:06:52 UTC (rev 14663) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> @@ -273,11 +274,6 @@ <version>1.8.3</version> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - </dependency> - <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.4</version> @@ -294,6 +290,11 @@ <scope>runtime</scope> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + </dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>2.5</version> 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 2010-10-31 04:06:05 UTC (rev 14662) +++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/webservice/pom.xml.vsl 2010-10-31 04:06:52 UTC (rev 14663) @@ -84,8 +84,8 @@ </dependency> <!-- Jetty is needed for building/testing the CXFServlet (creates geronimo dependencies) --> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> <scope>test</scope> </dependency> <dependency> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |