Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- finished a fix for MAVEN-518 (artifacts are used for path, not dependencies)

Browse Source 
-  renamed property  ejb.bundle.jar to ejb.bundle 
   (old property is still supported but deprecated).  
   This is compatible with war and ear plugins


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113598 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
michal
2003-07-04 08:05:40 +00:00
parent 5ae5b7f719
commit 5774953683
4 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ejb/plugin.jelly
View File

@@ -44,13 +44,30 @@
<ant:jar jarfile="${maven.build.dir}/${maven.final.name}.jar">
<!-- include marked dependencies -->
<j:forEach var="dep" items="${pom.dependencies}">
<j:if test="${dep.getProperty('ejb.bundle.jar')=='true'}">
<!-- FIXME: This doesn't allow jar overrides to work -->
<ant:fileset dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
<ant:include name="${dep.artifact}"/>
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
<!-- Just include jars-->
<!-- Probably we should also include uberjars -->
<j:if test="${dep.getProperty('ejb.bundle')=='true' and dep.type=='jar'}">
<ant:echo>Bundling: ${dep.type} - ${dep.id}</ant:echo>
<ant:fileset dir="${lib.file.parent}">
<ant:include name="${lib.file.name}"/>
</ant:fileset>
</j:if>
</j:if>
<!-- TO BE REMOVED -->
<j:if test="${dep.getProperty('ejb.bundle.jar')=='true'}">
<ant:echo>
<ant:echo>Bundling: ${dep.type} - ${dep.id}</ant:echo>
DEPRECATION WARNING:
Use : ejb.bundle instead of ejb.bundle.jar
</ant:echo>
<ant:fileset dir="${lib.file.parent}">
<ant:include name="${lib.file.name}"/>
</ant:fileset>
</j:if>
<!-- END OF TO BE REMOVED -->
</j:forEach>

2
ejb/project.xml
View File

@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-ejb-plugin</id>
<name>Maven EJB Plugin</name>
<currentVersion>1.0</currentVersion>
<currentVersion>1.1-SNAPSHOT</currentVersion>
<description>EJB Plugin for Maven</description>
<shortDescription>EJB Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/ejb/</url>

11
ejb/xdocs/changes.xml
View File

@@ -5,6 +5,17 @@
<author email="nathan.coast@blueyonder.co.uk">Nathan Coast</author>
</properties>
<body>
<release version="1.1" date="in CVS">
<action dev="michal" type="fix">
Fixes for MAVEN-518.
Artifact processing in the plugin
was slightly changed and now it supports jar overriding mechanism
</action>
<action dev="michal" type="fix">
property ejb.bundle.jar was renamed to ejb.bundle
(old property is still supported, but deprecated)
</action>
</release>
<release version="1.0" date="2002-08-04">
<action dev="ncoast" type="add">
Initial plugin created

2
ejb/xdocs/properties.xml
View File

@@ -64,7 +64,7 @@
<id>jarid</id>
<version>jarversion</version>
<properties>
<ejb.bundle.jar>true</ejb.bundle.jar>
<ejb.bundle>true</ejb.bundle>
</properties>
</dependency>
]]></source>