geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r356236 - in /geronimo/trunk: etc/project.properties plugins/geronimo-assembly-plugin/plugin.jelly plugins/geronimo-assembly-plugin/project.xml
Date Mon, 12 Dec 2005 10:12:37 GMT
Author: djencks
Date: Mon Dec 12 02:12:33 2005
New Revision: 356236

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

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

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=356236&r1=356235&r2=356236&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Mon Dec 12 02:12:33 2005
@@ -18,7 +18,7 @@
 ##
 
 ##
-## $Rev$ $Date$
+## $Rev: 356017 $ $Date$
 ##
 
 #####################################################
@@ -87,7 +87,7 @@
 tranql_vendors_version=1.1
 
 geronimo_packaging_plugin_version=1.1.0
-geronimo_assembly_plugin_version=1.1.1
+geronimo_assembly_plugin_version=1.1.2
 geronimo_deployment_plugin_version=1.1.0
 geronimo_dependency_plugin_version=1.1.0
 

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly?rev=356236&r1=356235&r2=356236&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Mon Dec 12 02:12:33 2005
@@ -102,7 +102,7 @@
                 <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.assemble')
== 'endorsed' || dependency.getProperty('geronimo.assemble') == 'extension'}">
                         <ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
                         <j:set var="hasRepo" value="true"/>
                     </j:if>
@@ -235,13 +235,13 @@
     </goal>
 
     <goal name="assemble:package-assembly" prereqs="assemble:assemble" description="Build
the binary distribution.">
-        <!-- Create a tar.gz file 
+        <!-- Create a tar.gz file
              Explicitly set execute permission on script files so builds on windows are consistent
with unix -->
 
         <!-- Establish patternset used by later fixcrlf processing -->
         <ant:fileset dir="${geronimo.assembly.dest}" >
-            <!-- Patterns for text based files.  We don't touch *.bat as svn 
-                 should have eol-style set property to CRLF and *.sh we 
+            <!-- Patterns for text based files.  We don't touch *.bat as svn
+                 should have eol-style set property to CRLF and *.sh we
                  force to have LF line endings (handle building on windows).  -->
             <ant:patternset id="geronimo.fixcrlf.patternset">
                 <ant:include name="**/*.dtd" />
@@ -264,24 +264,24 @@
 
         <!-- ensure shell scripts have LF end of lines for both the
              tar.gz and zip file -->
-        <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf"> 
+        <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf">
             <ant:include name="**/*.sh" />
         </ant:fixcrlf>
 
-        <!-- Create a zip file --> 
-        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}"> 
-            <ant:echo>Preparing CRLF line endings in text based files for zip 
-            distribution</ant:echo> 
-            <!-- The zip distribution shall have CRLF line 
-            endings and is targeted at Windows platforms.  Non-Windows platforms 
-            should use the tar distribution, as it contains extra file attributes 
-            such as permissions. Since we cannot assume we are running on a Windows 
-            platform, we fix line endings in the zip distribution to be CRLF's. --> 
+        <!-- Create a zip file -->
+        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
+            <ant:echo>Preparing CRLF line endings in text based files for zip
+            distribution</ant:echo>
+            <!-- The zip distribution shall have CRLF line
+            endings and is targeted at Windows platforms.  Non-Windows platforms
+            should use the tar distribution, as it contains extra file attributes
+            such as permissions. Since we cannot assume we are running on a Windows
+            platform, we fix line endings in the zip distribution to be CRLF's. -->
             <ant:fixcrlf  srcdir="${geronimo.assembly.dest}" eol="crlf">
-                <patternset refid="geronimo.fixcrlf.patternset"/> 
+                <patternset refid="geronimo.fixcrlf.patternset"/>
             </ant:fixcrlf>
 
-            <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf"> 
+            <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf">
                 <patternset refid="geronimo.fixcrlf.patternset"/>
             </ant:fixcrlf>
 
@@ -299,7 +299,7 @@
         <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">
             <ant:echo>Preparing LF line endings in text based files for tar.gz distribution</ant:echo>
 
-            <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf"> 
+            <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf">
                 <patternset refid="geronimo.fixcrlf.patternset"/>
                 <ant:include name="**/*.sh"/>
             </ant:fixcrlf>
@@ -318,11 +318,11 @@
             <checksum file="${maven.build.dir}/${maven.final.name}.tar.gz" algorithm="SHA"
fileext=".sha"/>
         </j:if>
 
-        <!-- Ensure the files in the assembly directory are left with LF endings 
+        <!-- Ensure the files in the assembly directory are left with LF endings
              for Geronimo developers who may run Geronimo from there. -->
         <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
             <j:if test="${context.getVariable('geronimo.assembly.tar') != 'true'}">
-                <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf"> 
+                <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf">
                     <patternset refid="geronimo.fixcrlf.patternset"/>
                 </ant:fixcrlf>
             </j:if>

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml?rev=356236&r1=356235&r2=356236&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml Mon Dec 12 02:12:33 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.1.1</currentVersion>
+    <currentVersion>1.1.2</currentVersion>
 
     <dependencies>
         <dependency>



Mime
View raw message