commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r887128 - in /commons/proper/jelly/branches/MAVEN-2-BRANCH: jelly-tags/ jelly-tags/ant/ jelly-tags/junit/ jelly-tags/util/ jelly/ jelly/src/assembly/ jelly/src/main/
Date Fri, 04 Dec 2009 09:33:07 GMT
Author: niallp
Date: Fri Dec  4 09:33:06 2009
New Revision: 887128

URL: http://svn.apache.org/viewvc?rev=887128&view=rev
Log:
m2 build: sort out assembly descriptors

Added:
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jelly-tags-assembly.xml   (with
props)
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/src/assembly/
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/src/assembly/dist.xml   (with props)
Removed:
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/src/main/
Modified:
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ant/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/junit/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/util/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/pom.xml

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ant/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ant/pom.xml?rev=887128&r1=887127&r2=887128&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ant/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ant/pom.xml Fri Dec  4 09:33:06
2009
@@ -104,16 +104,9 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>commons-jelly</groupId>
-            <artifactId>commons-jelly</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
         <configuration>
           <descriptors>
-            <descriptor>jelly-assembly.xml</descriptor>
+            <descriptor>../jelly-tags-assembly.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>

Added: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jelly-tags-assembly.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jelly-tags-assembly.xml?rev=887128&view=auto
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jelly-tags-assembly.xml (added)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jelly-tags-assembly.xml Fri Dec
 4 09:33:06 2009
@@ -0,0 +1,59 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<assembly>
+    <id></id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>../..</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <includes>
+                <include>build.xml</include>
+                <include>maven.xml</include>
+                <include>pom.xml</include>
+                <include>project.properties</include>
+                <include>project.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src</directory>
+        </fileSet>
+        <fileSet>
+            <directory>xdocs</directory>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>apidocs</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jelly-tags-assembly.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jelly-tags-assembly.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/junit/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/junit/pom.xml?rev=887128&r1=887127&r2=887128&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/junit/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/junit/pom.xml Fri Dec  4 09:33:06
2009
@@ -77,16 +77,9 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>commons-jelly</groupId>
-            <artifactId>commons-jelly</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
         <configuration>
           <descriptors>
-            <descriptor>jelly-assembly.xml</descriptor>
+            <descriptor>../jelly-tags-assembly.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/util/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/util/pom.xml?rev=887128&r1=887127&r2=887128&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/util/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/util/pom.xml Fri Dec  4 09:33:06
2009
@@ -77,16 +77,9 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>commons-jelly</groupId>
-            <artifactId>commons-jelly</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
         <configuration>
           <descriptors>
-            <descriptor>jelly-assembly.xml</descriptor>
+            <descriptor>../jelly-tags-assembly.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/pom.xml?rev=887128&r1=887127&r2=887128&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/pom.xml Fri Dec  4 09:33:06 2009
@@ -140,7 +140,7 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptors>
-            <descriptor>src/main/resources/assemblies/jelly-assembly.xml</descriptor>
+            <descriptor>src/assembly/dist.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>

Added: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/src/assembly/dist.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/src/assembly/dist.xml?rev=887128&view=auto
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/src/assembly/dist.xml (added)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/src/assembly/dist.xml Fri Dec  4 09:33:06
2009
@@ -0,0 +1,52 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<assembly>
+    <id></id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>..</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <includes>
+                <include>pom.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src</directory>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>apidocs</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/src/assembly/dist.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/src/assembly/dist.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



Mime
View raw message