From: <jo...@us...> - 2005-08-23 13:24:43
|
joehni 05/08/23 06:24:05 Modified: javaapp plugin.jelly project.xml Log: Make M1.1 compatible (by Eric Hartmann). Upgrade dependency versions. Revision Changes Path 1.14 +1 -1 maven-plugins/javaapp/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/plugin.jelly,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- plugin.jelly 15 Feb 2005 09:31:15 -0000 1.13 +++ plugin.jelly 23 Aug 2005 13:24:04 -0000 1.14 @@ -182,7 +182,7 @@ <ant:attribute name="Built-By" value="${user.name}"/> <!-- getStatic tag does not work in Maven 1.0 & 1.0.1 --> - <j:getStatic var="mavenVersion" className="org.apache.maven.MavenSession" field="APP_VERSION"/> + <j:set var="mavenVersion" value="${maven.application.version}"/> <j:if test="${mavenVersion == null}"> <j:set var="mavenVersion" value="1.0"/> </j:if> 1.16 +3 -3 maven-plugins/javaapp/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/project.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- project.xml 22 Nov 2004 08:05:36 -0000 1.15 +++ project.xml 23 Aug 2005 13:24:05 -0000 1.16 @@ -6,7 +6,7 @@ <id>maven-javaapp-plugin</id> <name>Java Application Plugin</name> <!-- groupId is in parent --> - <currentVersion>1.3</currentVersion> + <currentVersion>1.3.1</currentVersion> <!-- organization is in parent --> <inceptionYear>2002</inceptionYear> <!-- remove package, if parent is fixed --> @@ -57,12 +57,12 @@ <dependency> <groupId>maven</groupId> <artifactId>maven</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.0</version> + <version>2.1</version> </dependency> <!-- test --> <dependency> |