You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2012/02/12 19:17:23 UTC
svn commit: r1243287 - in /commons/proper/digester/trunk:
annotations-processor/ core/ examples/annotations/atom/
examples/api/addressbook/ examples/api/catalog/ examples/api/dbinsert/
examples/api/document-markup/ examples/edsl/atom/ examples/plugins/...
Author: simonetripodi
Date: Sun Feb 12 18:17:22 2012
New Revision: 1243287
URL: http://svn.apache.org/viewvc?rev=1243287&view=rev
Log:
fixed packaging stuff
Modified:
commons/proper/digester/trunk/annotations-processor/pom.xml
commons/proper/digester/trunk/core/pom.xml
commons/proper/digester/trunk/examples/annotations/atom/pom.xml
commons/proper/digester/trunk/examples/api/addressbook/pom.xml
commons/proper/digester/trunk/examples/api/catalog/pom.xml
commons/proper/digester/trunk/examples/api/dbinsert/pom.xml
commons/proper/digester/trunk/examples/api/document-markup/pom.xml
commons/proper/digester/trunk/examples/edsl/atom/pom.xml
commons/proper/digester/trunk/examples/plugins/pipeline/pom.xml
commons/proper/digester/trunk/examples/rss/pom.xml
commons/proper/digester/trunk/examples/xmlrules/addressbook/pom.xml
commons/proper/digester/trunk/src/main/assembly/bin.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=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/annotations-processor/pom.xml (original)
+++ commons/proper/digester/trunk/annotations-processor/pom.xml Sun Feb 12 18:17:22 2012
@@ -71,6 +71,15 @@
</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=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/pom.xml (original)
+++ commons/proper/digester/trunk/core/pom.xml Sun Feb 12 18:17:22 2012
@@ -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}/../src/main/assembly/">
<include name="*.txt" />
</fileset>
<mapper type="regexp" from="^(.*)-with-deps\.txt" to="\1.txt" />
@@ -201,6 +201,12 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: commons/proper/digester/trunk/examples/annotations/atom/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/annotations/atom/pom.xml?rev=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/annotations/atom/pom.xml (original)
+++ commons/proper/digester/trunk/examples/annotations/atom/pom.xml Sun Feb 12 18:17:22 2012
@@ -52,6 +52,12 @@
</arguments>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: commons/proper/digester/trunk/examples/api/addressbook/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/api/addressbook/pom.xml?rev=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/api/addressbook/pom.xml (original)
+++ commons/proper/digester/trunk/examples/api/addressbook/pom.xml Sun Feb 12 18:17:22 2012
@@ -52,6 +52,12 @@
</arguments>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: commons/proper/digester/trunk/examples/api/catalog/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/api/catalog/pom.xml?rev=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/api/catalog/pom.xml (original)
+++ commons/proper/digester/trunk/examples/api/catalog/pom.xml Sun Feb 12 18:17:22 2012
@@ -52,6 +52,12 @@
</arguments>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: commons/proper/digester/trunk/examples/api/dbinsert/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/api/dbinsert/pom.xml?rev=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/api/dbinsert/pom.xml (original)
+++ commons/proper/digester/trunk/examples/api/dbinsert/pom.xml Sun Feb 12 18:17:22 2012
@@ -52,6 +52,12 @@
</arguments>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: commons/proper/digester/trunk/examples/api/document-markup/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/api/document-markup/pom.xml?rev=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/api/document-markup/pom.xml (original)
+++ commons/proper/digester/trunk/examples/api/document-markup/pom.xml Sun Feb 12 18:17:22 2012
@@ -52,6 +52,12 @@
</arguments>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: commons/proper/digester/trunk/examples/edsl/atom/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/edsl/atom/pom.xml?rev=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/edsl/atom/pom.xml (original)
+++ commons/proper/digester/trunk/examples/edsl/atom/pom.xml Sun Feb 12 18:17:22 2012
@@ -52,6 +52,12 @@
</arguments>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: commons/proper/digester/trunk/examples/plugins/pipeline/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/plugins/pipeline/pom.xml?rev=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/plugins/pipeline/pom.xml (original)
+++ commons/proper/digester/trunk/examples/plugins/pipeline/pom.xml Sun Feb 12 18:17:22 2012
@@ -40,6 +40,17 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>run-uppercase</id>
Modified: commons/proper/digester/trunk/examples/rss/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/rss/pom.xml?rev=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/rss/pom.xml (original)
+++ commons/proper/digester/trunk/examples/rss/pom.xml Sun Feb 12 18:17:22 2012
@@ -49,6 +49,12 @@
<mainClass>org.apache.commons.digester3.rss.RSSDigester</mainClass>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: commons/proper/digester/trunk/examples/xmlrules/addressbook/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/examples/xmlrules/addressbook/pom.xml?rev=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/examples/xmlrules/addressbook/pom.xml (original)
+++ commons/proper/digester/trunk/examples/xmlrules/addressbook/pom.xml Sun Feb 12 18:17:22 2012
@@ -53,6 +53,12 @@
</arguments>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: commons/proper/digester/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/assembly/bin.xml?rev=1243287&r1=1243286&r2=1243287&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/main/assembly/bin.xml (original)
+++ commons/proper/digester/trunk/src/main/assembly/bin.xml Sun Feb 12 18:17:22 2012
@@ -40,7 +40,14 @@
</includes>
</fileSet>
<fileSet>
- <directory>target</directory>
+ <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>