Menu
▾
▴
maven-plugins-cvs
|
From: Siegfried G. <wd...@us...> - 2003-04-05 14:07:15
|
wdsgoe 03/04/05 06:07:14
Modified: javaapp plugin.jelly
Log:
Deleting artifacts from signed JARs since the plugin can't handle them properly
Revision Changes Path
1.2 +7 -3 maven-plugins/javaapp/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 11 Dec 2002 14:46:26 -0000 1.1
+++ plugin.jelly 5 Apr 2003 14:07:14 -0000 1.2
@@ -35,9 +35,13 @@
<unzip src="${jarFile.toString()}" dest="target/classes"/>
</j:forEach>
- <!-- delete an existing META-INF directory from unzipped JARs -->
-
- <delete dir="target/classes/META-INF"/>
+ <!-- delete artifacts of signed JARS in the META-INF directory -->
+
+ <delete>
+ <fileset dir="target/classes/META-INF" includes="*.DSA"/>
+ <fileset dir="target/classes/META-INF" includes="*.SF"/>
+ <fileset dir="target/classes/META-INF" includes="*.RSA"/>
+ </delete>
<jar
jarfile="${maven.build.dir}/${maven.javaapp.jar.name}.jar"
|
|
From: <jo...@us...> - 2004-11-18 09:29:33
|
joehni 04/11/18 01:29:27
Modified: javaapp plugin.jelly
Log:
Eliminated deprecated code.
Revision Changes Path
1.8 +30 -30 maven-plugins/javaapp/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 16 Nov 2004 18:22:17 -0000 1.7
+++ plugin.jelly 18 Nov 2004 09:29:27 -0000 1.8
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<project xmlns:j="jelly:core"
- xmlns:resources="resources"
xmlns:artifact="artifact"
xmlns:u="jelly:util"
+ xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant">
<!-- ================================================================== -->
@@ -29,7 +29,7 @@
<goal name="javaapp:prepare-filesystem"
description="Create the needed directory structure">
- <mkdir dir="${maven.javaapp.app.dir}/lib"/>
+ <ant:mkdir dir="${maven.javaapp.app.dir}/lib"/>
</goal>
@@ -88,36 +88,36 @@
<!-- unzip all JARS -->
- <fileScanner var="jarFileList">
- <fileset dir="${maven.javaapp.app.dir}/lib">
- <patternset>
- <include name="*.jar"/>
- </patternset>
- </fileset>
- </fileScanner>
+ <ant:fileScanner var="jarFileList">
+ <ant:fileset dir="${maven.javaapp.app.dir}/lib">
+ <ant:patternset>
+ <ant:include name="*.jar"/>
+ </ant:patternset>
+ </ant:fileset>
+ </ant:fileScanner>
<j:forEach var="jarFile" items="${jarFileList.iterator()}">
- <unzip src="${jarFile.toString()}" dest="${maven.javaapp.app.dir}"/>
+ <ant:unzip src="${jarFile.toString()}" dest="${maven.javaapp.app.dir}"/>
</j:forEach>
<!-- delete artifacts of signed JARS in the META-INF directory -->
- <delete>
- <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.DSA"/>
- <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.SF"/>
- <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.RSA"/>
- <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.dsa"/>
- <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.sf"/>
- <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.rsa"/>
- </delete>
+ <ant:delete>
+ <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.DSA"/>
+ <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.SF"/>
+ <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.RSA"/>
+ <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.dsa"/>
+ <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.sf"/>
+ <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.rsa"/>
+ </ant:delete>
<!-- delete other artifacts in our way -->
- <delete>
- <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="LICENSE.txt"/>
- <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="INDEX.LIST"/>
- <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="MANIFEST.MF"/>
- </delete>
+ <ant:delete>
+ <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="LICENSE.txt"/>
+ <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="INDEX.LIST"/>
+ <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="MANIFEST.MF"/>
+ </ant:delete>
<!-- Copy class files from java:compile into working directory -->
@@ -129,7 +129,7 @@
<!-- delete the copied JARS -->
- <delete dir="${maven.javaapp.app.dir}/lib"/>
+ <ant:delete dir="${maven.javaapp.app.dir}/lib"/>
<!-- Build the JAR file -->
@@ -203,18 +203,18 @@
description="Runs the executable JAR with the given command line">
<echo>Running ${maven.javaapp.final.name} with "${maven.javaapp.cmdline}"</echo>
- <java jar="${maven.javaapp.final.name}" fork="yes">
+ <ant:java jar="${maven.javaapp.final.name}" fork="yes">
<u:tokenize var="listOfProperties" delim=" ">${maven.javaapp.sysproperties}</u:tokenize>
<!-- Don't know how to split the thing to use <sysproperty> instead -->
<u:tokenize var="listOfJvmArgs" delim=" ">${maven.javaapp.jvmargs}</u:tokenize>
<j:forEach var="somejvmarg" items="${listOfJvmArgs}">
- <jvmarg value="${somejvmarg}"/>
+ <j:jvmarg value="${somejvmarg}"/>
</j:forEach>
<j:forEach var="someProperty" items="${listOfProperties}">
- <jvmarg value="${someProperty}"/>
+ <j:jvmarg value="${someProperty}"/>
</j:forEach>
- <arg line="${maven.javaapp.cmdline}"/>
- </java>
+ <j:arg line="${maven.javaapp.cmdline}"/>
+ </ant:java>
</goal>
@@ -226,7 +226,7 @@
description="Copy any resources that must be present in the deployed JAR file">
<j:if test="${!pom.build.resources.isEmpty()}">
- <resources:copy
+ <maven:copyResources
resources="${pom.build.resources}"
todir="${maven.javaapp.app.dir}"
/>
|
|
From: Siegfried G. <wd...@us...> - 2005-02-15 09:31:22
|
wdsgoe 05/02/15 01:31:16
Modified: javaapp plugin.jelly
Log:
Applied patch 1121795 from Frank Cornelis fixing broken javaapp:run
Revision Changes Path
1.13 +3 -3 maven-plugins/javaapp/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 19 Nov 2004 16:44:42 -0000 1.12
+++ plugin.jelly 15 Feb 2005 09:31:15 -0000 1.13
@@ -277,12 +277,12 @@
<!-- Don't know how to split the thing to use <sysproperty> instead -->
<u:tokenize var="listOfJvmArgs" delim=" ">${maven.javaapp.jvmargs}</u:tokenize>
<j:forEach var="somejvmarg" items="${listOfJvmArgs}">
- <j:jvmarg value="${somejvmarg}"/>
+ <ant:jvmarg value="${somejvmarg}"/>
</j:forEach>
<j:forEach var="someProperty" items="${listOfProperties}">
- <j:jvmarg value="${someProperty}"/>
+ <ant:jvmarg value="${someProperty}"/>
</j:forEach>
- <j:arg line="${maven.javaapp.cmdline}"/>
+ <ant:arg line="${maven.javaapp.cmdline}"/>
</ant:java>
</goal>
|
|
From: Jeff J. <jef...@us...> - 2006-07-30 03:44:13
|
jeffjensen 06/07/29 20:44:12
Modified: javaapp plugin.jelly
Log:
Apply fix for bug 1436490 "EJB jars are not bundled" by Daniel Schulz (Thanks Daniel!).
Revision Changes Path
1.15 +1 -1 maven-plugins/javaapp/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/plugin.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.jelly 23 Aug 2005 13:24:04 -0000 1.14
+++ plugin.jelly 30 Jul 2006 03:44:11 -0000 1.15
@@ -59,7 +59,7 @@
<j:set var="excludes" value="${maven.javaapp.jar.exclude}"/>
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
- <j:if test="${dep.getProperty('uberjar.bundle')=='false' || dep.type !='jar'}">
+ <j:if test="${dep.getProperty('uberjar.bundle')=='false' || !(dep.type =='jar' || dep.type=='ejb')}">
<j:if test="${!empty(excludes)}">
<j:set var="excludes" value="${excludes},${dep.artifactId}"/>
</j:if>
|
|
From: Lukas T. <luk...@us...> - 2007-05-13 18:49:08
|
lukas_theussl 07/05/13 11:49:02
Modified: javaapp/xdocs changes.xml
javaapp plugin.jelly
Log:
Apply fix to work around MPTEST-66, it should now be compatible with Maven 1.1 and test-plugin-1.8.
Revision Changes Path
1.11 +3 -0 maven-plugins/javaapp/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/xdocs/changes.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- changes.xml 30 Jul 2006 03:45:05 -0000 1.10
+++ changes.xml 13 May 2007 18:49:01 -0000 1.11
@@ -16,6 +16,9 @@
<action dev="jeffjensen" type="fix" issue="1436490" due-to="Daniel Schulz">
EJB jars are not bundled
</action>
+ <action dev="lukas_theussl" type="update">
+ Make it compatible with Maven 1.1 and test-plugin-1.8.
+ </action>
</release>
<release version="1.3.1" date="2005-08-25">
<action dev="joehni" type="fix" due-to="Eric Hartmann">
1.16 +7 -1 maven-plugins/javaapp/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/plugin.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 30 Jul 2006 03:44:11 -0000 1.15
+++ plugin.jelly 13 May 2007 18:49:02 -0000 1.16
@@ -119,7 +119,13 @@
<goal name="javaapp:jar"
description="Packs all dependent JARs into an executable JAR"
prereqs="javaapp:prereq,test:test,javaapp:copy-deps,javaapp:jar-resources">
-
+
+ <!-- required for maven 1.1 and test-plugin-1.8, see http://jira.codehaus.org/browse/MPTEST-66 -->
+ <j:if test="${unitTestSourcesPresent != 'true' or context.getVariable('maven.test.skip') == 'true'}">
+ <attainGoal name="java:compile"/>
+ <attainGoal name="java:jar-resources"/>
+ </j:if>
+
<!-- unzip all JARS -->
<ant:fileScanner var="jarFileList">
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X