commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1293692 - in /commons/proper/digester/trunk: ./ annotations-processor/ core/ dist/ dist/src/ dist/src/main/ dist/src/main/assembly/ examples/ src/main/assembly/
Date Sat, 25 Feb 2012 21:09:57 GMT
Author: simonetripodi
Date: Sat Feb 25 21:09:56 2012
New Revision: 1293692

URL: http://svn.apache.org/viewvc?rev=1293692&view=rev
Log:
added a dedicated module for assembly packages - since digester became a multi-module project,
assemblies have to be created once core and ap modules have been built

Added:
    commons/proper/digester/trunk/dist/
    commons/proper/digester/trunk/dist/pom.xml   (with props)
    commons/proper/digester/trunk/dist/src/
    commons/proper/digester/trunk/dist/src/main/
    commons/proper/digester/trunk/dist/src/main/assembly/
      - copied from r1243142, commons/proper/digester/trunk/src/main/assembly/
    commons/proper/digester/trunk/dist/src/main/assembly/bin.xml
      - copied, changed from r1243287, commons/proper/digester/trunk/src/main/assembly/bin.xml
Removed:
    commons/proper/digester/trunk/src/main/assembly/
Modified:
    commons/proper/digester/trunk/annotations-processor/pom.xml
    commons/proper/digester/trunk/core/pom.xml
    commons/proper/digester/trunk/dist/src/main/assembly/src.xml
    commons/proper/digester/trunk/examples/pom.xml
    commons/proper/digester/trunk/pom.xml

Modified: commons/proper/digester/trunk/annotations-processor/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/annotations-processor/pom.xml?rev=1293692&r1=1293691&r2=1293692&view=diff
==============================================================================
--- commons/proper/digester/trunk/annotations-processor/pom.xml (original)
+++ commons/proper/digester/trunk/annotations-processor/pom.xml Sat Feb 25 21:09:56 2012
@@ -56,30 +56,14 @@
   <build>
     <resources>
       <resource>
-        <directory>../</directory>
+        <directory>${basedir}/../</directory>
         <targetPath>META-INF</targetPath>
         <includes>
           <include>NOTICE.txt</include>
           <include>LICENSE.txt</include>
         </includes>
       </resource>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <filtering>false</filtering>
-        <includes>
-          <include>**/*.dtd</include>
-        </includes>
-      </resource>
     </resources>
-
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
 
   <reporting>

Modified: commons/proper/digester/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/pom.xml?rev=1293692&r1=1293691&r2=1293692&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/pom.xml (original)
+++ commons/proper/digester/trunk/core/pom.xml Sat Feb 25 21:09:56 2012
@@ -60,7 +60,7 @@
   <build>
     <resources>
       <resource>
-        <directory>../</directory>
+        <directory>${basedir}/../</directory>
         <targetPath>META-INF</targetPath>
         <includes>
           <include>NOTICE.txt</include>
@@ -160,7 +160,7 @@
             <configuration>
               <target>
                 <copy todir="${project.build.directory}/classes-shaded/META-INF/" overwrite="true">
-                  <fileset dir="${basedir}/../src/main/assembly/">
+                  <fileset dir="${basedir}/../dist/src/main/assembly/">
                     <include name="*.txt" />
                   </fileset>
                   <mapper type="regexp" from="^(.*)-with-deps\.txt" to="\1.txt" />
@@ -201,12 +201,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Added: commons/proper/digester/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/dist/pom.xml?rev=1293692&view=auto
==============================================================================
--- commons/proper/digester/trunk/dist/pom.xml (added)
+++ commons/proper/digester/trunk/dist/pom.xml Sat Feb 25 21:09:56 2012
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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.
+-->
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-digester3-parent</artifactId>
+    <version>3.3-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+
+  <artifactId>commons-digester3-dist</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Commons Digester :: Distribution Packages</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>commons-digester3</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>commons-digester3</artifactId>
+      <version>${project.parent.version}</version>
+      <classifier>with-deps</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>commons-digester3-ap</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
+            <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+          <attach>false</attach>
+          <finalName>commons-digester3-${project.version}</finalName>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Propchange: commons/proper/digester/trunk/dist/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/digester/trunk/dist/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: commons/proper/digester/trunk/dist/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: commons/proper/digester/trunk/dist/src/main/assembly/bin.xml (from r1243287, commons/proper/digester/trunk/src/main/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/dist/src/main/assembly/bin.xml?p2=commons/proper/digester/trunk/dist/src/main/assembly/bin.xml&p1=commons/proper/digester/trunk/src/main/assembly/bin.xml&r1=1243287&r2=1293692&rev=1293692&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/main/assembly/bin.xml (original)
+++ commons/proper/digester/trunk/dist/src/main/assembly/bin.xml Sat Feb 25 21:09:56 2012
@@ -15,12 +15,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<assembly>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
   <id>bin</id>
   <formats>
     <format>tar.gz</format>
     <format>zip</format>
   </formats>
+  <baseDirectory>commons-digester3-${project.version}-bin</baseDirectory>
   <includeSiteDirectory>false</includeSiteDirectory>
   <!-- Use the N&L files which apply to the included dependencies -->
   <files>
@@ -36,26 +39,18 @@
   <fileSets>
     <fileSet>
       <includes>
-        <include>RELEASE-NOTES.txt</include>
+        <include>${basedir}/../RELEASE-NOTES.txt</include>
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${basedir}/core/target</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${basedir}/annotations-processor/target</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target/site/apidocs</directory>
+      <directory>${basedir}/../target/site/apidocs</directory>
       <outputDirectory>apidocs</outputDirectory>
     </fileSet>
   </fileSets>
+
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>
+  </dependencySets>
 </assembly>

Modified: commons/proper/digester/trunk/dist/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/dist/src/main/assembly/src.xml?rev=1293692&r1=1243142&r2=1293692&view=diff
==============================================================================
--- commons/proper/digester/trunk/dist/src/main/assembly/src.xml (original)
+++ commons/proper/digester/trunk/dist/src/main/assembly/src.xml Sat Feb 25 21:09:56 2012
@@ -15,25 +15,24 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<assembly>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
   <id>src</id>
   <formats>
     <format>tar.gz</format>
     <format>zip</format>
   </formats>
-  <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
+  <baseDirectory>commons-digester3-${project.version}-src</baseDirectory>
   <fileSets>
     <fileSet>
-      <includes>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>pom.xml</include>
-        <include>RELEASE-NOTES*</include>
-        <include>checkstyle-suppressions.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src</directory>
+      <directory>${basedir}/../</directory>
+      <excludes>
+        <exclude>**/.classpath</exclude>
+        <exclude>**/.project</exclude>
+        <exclude>**/.settings/</exclude>
+        <exclude>**/target/</exclude>
+      </excludes>
     </fileSet>
   </fileSets>
 </assembly>

Modified: commons/proper/digester/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/pom.xml?rev=1293692&r1=1293691&r2=1293692&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/pom.xml (original)
+++ commons/proper/digester/trunk/examples/pom.xml Sat Feb 25 21:09:56 2012
@@ -57,12 +57,6 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
         <configuration>

Modified: commons/proper/digester/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/pom.xml?rev=1293692&r1=1293691&r2=1293692&view=diff
==============================================================================
--- commons/proper/digester/trunk/pom.xml (original)
+++ commons/proper/digester/trunk/pom.xml Sat Feb 25 21:09:56 2012
@@ -161,6 +161,7 @@
     <module>core</module>
     <module>annotations-processor</module>
     <module>examples</module>
+    <module>dist</module>
   </modules>
 
   <properties>
@@ -199,17 +200,6 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
-            <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
-          </descriptors>
-          <tarLongFileMode>gnu</tarLongFileMode>
-          <attach>false</attach>
-        </configuration>
-      </plugin>
     </plugins>
 
     <pluginManagement>



Mime
View raw message