You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/12/12 11:28:15 UTC

svn commit: r356242 - in /geronimo/branches/1.0: etc/project.properties plugins/geronimo-assembly-plugin/plugin.jelly plugins/geronimo-assembly-plugin/project.xml

Author: djencks
Date: Mon Dec 12 02:28:08 2005
New Revision: 356242

URL: http://svn.apache.org/viewcvs?rev=356242&view=rev
Log:
GERONIMO-1340 don't copy cars into server repo, bump plugin version

Modified:
    geronimo/branches/1.0/etc/project.properties
    geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly
    geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml

Modified: geronimo/branches/1.0/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/etc/project.properties?rev=356242&r1=356241&r2=356242&view=diff
==============================================================================
--- geronimo/branches/1.0/etc/project.properties (original)
+++ geronimo/branches/1.0/etc/project.properties Mon Dec 12 02:28:08 2005
@@ -87,7 +87,7 @@
 tranql_vendors_version=1.1
 
 geronimo_packaging_plugin_version=1.0.0
-geronimo_assembly_plugin_version=1.0.1
+geronimo_assembly_plugin_version=1.0.2
 geronimo_deployment_plugin_version=1.0.0
 geronimo_dependency_plugin_version=1.0.0
 

Modified: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly?rev=356242&r1=356241&r2=356242&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly Mon Dec 12 02:28:08 2005
@@ -102,7 +102,8 @@
                 <j:set var="hasRepo" value="false"/>
                 <j:forEach var="artifact" items="${pom.artifacts}">
                     <j:set var="dependency" value="${artifact.dependency}"/>
-                    <j:if test="${dependency.getProperty('geronimo.assemble') == 'repository' || dependency.getProperty('geronimo.assemble') == 'install' || dependency.getProperty('geronimo.assemble') == 'library' || dependency.getProperty('geronimo.assemble') == 'endorsed' || dependency.getProperty('geronimo.assemble') == 'extension'}">
+                    <j:if test="${dependency.getProperty('geronimo.assemble') == 'repository' || dependency.getProperty('geronimo.assemble') == 'library' || dependency.getProperty('geronimo.assem
+ble') == 'endorsed' || dependency.getProperty('geronimo.assemble') == 'extension'}">
                         <ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
                         <j:set var="hasRepo" value="true"/>
                     </j:if>

Modified: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml?rev=356242&r1=356241&r2=356242&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml Mon Dec 12 02:28:08 2005
@@ -23,7 +23,7 @@
     <id>geronimo-assembly-plugin</id>
     <name>Geronimo :: Maven Assembly Plugin</name>
     <description>A plugin used to assemble a distribution of Geronimo</description>
-    <currentVersion>1.0.1</currentVersion>
+    <currentVersion>1.0.2</currentVersion>
 
     <dependencies>
         <dependency>