You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by ga...@apache.org on 2010/09/01 12:19:23 UTC
svn commit: r991495 - in /incubator/chemistry/opencmis/trunk:
chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml pom.xml
Author: gabriele
Date: Wed Sep 1 10:19:23 2010
New Revision: 991495
URL: http://svn.apache.org/viewvc?rev=991495&view=rev
Log:
-- additional fix for https://issues.apache.org/jira/browse/CMIS-224 - include DEPENDENCIES, NOTICE, LICENSE, DISCLAIMER in WARs META-INF folder
-- consolidated configuration for all WARs in Super POM: now all WARs archive classes (i.e. produce a JAR in WEB-INF/lib) and attach them to the build (i.e. a the produced JAR is a new artifact for Maven)
-- fixed maven assembly plugin issue when build run with -Papache-release from submodules
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
incubator/chemistry/opencmis/trunk/pom.xml
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml?rev=991495&r1=991494&r2=991495&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml Wed Sep 1 10:19:23 2010
@@ -31,14 +31,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archiveClasses>true</archiveClasses>
- <attachClasses>true</attachClasses>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
Modified: incubator/chemistry/opencmis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/pom.xml?rev=991495&r1=991494&r2=991495&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/pom.xml (original)
+++ incubator/chemistry/opencmis/trunk/pom.xml Wed Sep 1 10:19:23 2010
@@ -384,6 +384,14 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.0.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archiveClasses>true</archiveClasses>
+ <attachClasses>true</attachClasses>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
@@ -452,6 +460,7 @@
<descriptors>
<descriptor>src/main/assembly/docs-assembly.xml</descriptor>
</descriptors>
+ <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
</configuration>
</plugin>
<!--
@@ -479,6 +488,21 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>META-INF/*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>