You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/02/24 17:25:53 UTC
svn commit: r1293324 - in /incubator/syncope/trunk: ./ archetype/
build-tools/ client/ console/ core/ hibernate-enhancer/ parent/ quality/
Author: ilgrosso
Date: Fri Feb 24 16:25:52 2012
New Revision: 1293324
URL: http://svn.apache.org/viewvc?rev=1293324&view=rev
Log:
[SYNCOPE-3] For JAR artifacts worked smoothly, for WAR artifacts some hack was needed
Added:
incubator/syncope/trunk/LICENSE
- copied unchanged from r1293295, incubator/syncope/trunk/LICENSE.txt
incubator/syncope/trunk/LICENSE-header
- copied unchanged from r1293295, incubator/syncope/trunk/LICENSE-header.txt
incubator/syncope/trunk/NOTICE
- copied unchanged from r1293295, incubator/syncope/trunk/NOTICE.txt
Removed:
incubator/syncope/trunk/LICENSE-header.txt
incubator/syncope/trunk/LICENSE.txt
incubator/syncope/trunk/NOTICE.txt
Modified:
incubator/syncope/trunk/archetype/pom.xml
incubator/syncope/trunk/build-tools/pom.xml
incubator/syncope/trunk/client/pom.xml
incubator/syncope/trunk/console/pom.xml
incubator/syncope/trunk/core/pom.xml
incubator/syncope/trunk/hibernate-enhancer/pom.xml
incubator/syncope/trunk/parent/pom.xml
incubator/syncope/trunk/quality/pom.xml
Modified: incubator/syncope/trunk/archetype/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/pom.xml?rev=1293324&r1=1293323&r2=1293324&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/pom.xml (original)
+++ incubator/syncope/trunk/archetype/pom.xml Fri Feb 24 16:25:52 2012
@@ -154,6 +154,17 @@ under the License.
</dependencies>
</plugin>
</plugins>
+
+ <resources>
+ <resource>
+ <directory>..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
</build>
<reporting>
Modified: incubator/syncope/trunk/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/build-tools/pom.xml?rev=1293324&r1=1293323&r2=1293324&view=diff
==============================================================================
--- incubator/syncope/trunk/build-tools/pom.xml (original)
+++ incubator/syncope/trunk/build-tools/pom.xml Fri Feb 24 16:25:52 2012
@@ -145,6 +145,14 @@ under the License.
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
</resources>
</build>
Modified: incubator/syncope/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/pom.xml?rev=1293324&r1=1293323&r2=1293324&view=diff
==============================================================================
--- incubator/syncope/trunk/client/pom.xml (original)
+++ incubator/syncope/trunk/client/pom.xml Fri Feb 24 16:25:52 2012
@@ -79,6 +79,19 @@ under the License.
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
<reporting>
<plugins>
Modified: incubator/syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/pom.xml?rev=1293324&r1=1293323&r2=1293324&view=diff
==============================================================================
--- incubator/syncope/trunk/console/pom.xml (original)
+++ incubator/syncope/trunk/console/pom.xml Fri Feb 24 16:25:52 2012
@@ -351,6 +351,14 @@ under the License.
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
</resources>
<testResources>
Modified: incubator/syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/pom.xml?rev=1293324&r1=1293323&r2=1293324&view=diff
==============================================================================
--- incubator/syncope/trunk/core/pom.xml (original)
+++ incubator/syncope/trunk/core/pom.xml Fri Feb 24 16:25:52 2012
@@ -589,6 +589,14 @@ under the License.
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
</resources>
<testResources>
Modified: incubator/syncope/trunk/hibernate-enhancer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/hibernate-enhancer/pom.xml?rev=1293324&r1=1293323&r2=1293324&view=diff
==============================================================================
--- incubator/syncope/trunk/hibernate-enhancer/pom.xml (original)
+++ incubator/syncope/trunk/hibernate-enhancer/pom.xml Fri Feb 24 16:25:52 2012
@@ -53,6 +53,19 @@ under the License.
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<reporting>
<plugins>
<plugin>
Modified: incubator/syncope/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/parent/pom.xml?rev=1293324&r1=1293323&r2=1293324&view=diff
==============================================================================
--- incubator/syncope/trunk/parent/pom.xml (original)
+++ incubator/syncope/trunk/parent/pom.xml Fri Feb 24 16:25:52 2012
@@ -750,7 +750,22 @@ under the License.
</includes>
<filtering>true</filtering>
</resource>
+ <!--
+ HACK: Include legal files explicity,
+ otherwise they will end up in the wrong path
+ or in another jar file in the war.
+ -->
+ <resource>
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>META-INF/LICENSE*</include>
+ <include>META-INF/NOTICE*</include>
+ <include>META-INF/DISCLAIMER*</include>
+ <include>META-INF/DEPENDENCIES*</include>
+ </includes>
+ </resource>
</webResources>
+ <packagingExcludes>WEB-INF/classes/META-INF/LICENSE*,WEB-INF/classes/META-INF/NOTICE*,WEB-INF/classes/META-INF/DISCLAIMER*,WEB-INF/classes/META-INF/DEPENDENCIES*</packagingExcludes>
</configuration>
</plugin>
<plugin>
@@ -891,6 +906,22 @@ under the License.
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <!-- Fail the build if any artifacts are missing legal files -->
+ <strict>true</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9</version>
Modified: incubator/syncope/trunk/quality/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/quality/pom.xml?rev=1293324&r1=1293323&r2=1293324&view=diff
==============================================================================
--- incubator/syncope/trunk/quality/pom.xml (original)
+++ incubator/syncope/trunk/quality/pom.xml Fri Feb 24 16:25:52 2012
@@ -35,4 +35,16 @@ under the License.
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-quality</artifactId>
+ <build>
+ <resources>
+ <resource>
+ <directory>..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>