You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fc...@apache.org on 2012/02/24 11:19:52 UTC
svn commit: r1293162 - in /incubator/stanbol/trunk: parent/pom.xml pom.xml
Author: fchrist
Date: Fri Feb 24 10:19:52 2012
New Revision: 1293162
URL: http://svn.apache.org/viewvc?rev=1293162&view=rev
Log:
STANBOL-493 Moved license configs to parent POM
Modified:
incubator/stanbol/trunk/parent/pom.xml
incubator/stanbol/trunk/pom.xml
Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1293162&r1=1293161&r2=1293162&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Fri Feb 24 10:19:52 2012
@@ -381,6 +381,33 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>1.0</version>
+ <executions>
+ <execution>
+ <configuration>
+ <groupByLicense>true</groupByLicense>
+ <failIfWarning>true</failIfWarning>
+ <useMissingFile>true</useMissingFile>
+ <outputDirectory>${project.build.directory}/maven-shared-archive-resources/META-INF</outputDirectory>
+ <thirdPartyFilename>DEPENDENCIES-BY-LICENSE</thirdPartyFilename>
+
+ <licenseMerges>
+ <licenseMerge>Apache Software License|AL|Apache Software Licenses|Apache License</licenseMerge>
+ <licenseMerge>Apache Software License, Version 1.1|AL 1.1|Apache Software License, Version 1.1</licenseMerge>
+ <licenseMerge>Apache Software License, Version 2.0|AL 2.0|ALv2|The Apache Software License, Version 2.0|Apache Software License - Version 2.0|Apache License, Version 2.0|Apache License 2.0|Apache License Version 2|Apache License Version 2.0|Apache 2</licenseMerge>
+ <licenseMerge>BSD License|BSD license|BSD|The BSD License|BSD-style license|BSD-like</licenseMerge>
+ <licenseMerge>Common Development And Distribution License (CDDL), Version 1.0|CDDL 1.0|CDDL License|Common Development And Distribution License (CDDL) Version 1.0|COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0|Common Development and Distribution License (CDDL) v1.0|Dual license consisting of the CDDL v1.0 and GPL v2</licenseMerge>
+ <licenseMerge>Common Development And Distribution License (CDDL), Version 1.1|CDDL 1.1|Common Public License Version 1.1</licenseMerge>
+ <licenseMerge>Common Public License, Version 1.0|CPL 1.0|Common Public License Version 1.0</licenseMerge>
+ <licenseMerge>Eclipse Public License, Version 1.0|Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0</licenseMerge>
+ <licenseMerge>GNU General Public License (GPL), Version 2 with classpath exception|GPLv2 with classpath exception|GPL2 w/ CPE</licenseMerge>
+ <licenseMerge>GNU Lesser General Public License (LGPL)|GNU Lesser General Public License|LGPL</licenseMerge>
+ <licenseMerge>GNU Lesser General Public License (LGPL), Version 2.1|The GNU Lesser General Public License, Version 2.1|LGPL 2.1</licenseMerge>
+ <licenseMerge>MIT License|MIT|The MIT License|MIT license</licenseMerge>
+ <licenseMerge>Public Domain License|public domain|Public Domain</licenseMerge>
+ </licenseMerges>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1899,13 +1926,6 @@
<goals>
<goal>add-third-party</goal>
</goals>
- <configuration>
- <groupByLicense>true</groupByLicense>
- <failIfWarning>true</failIfWarning>
- <useMissingFile>true</useMissingFile>
- <outputDirectory>${project.build.directory}/maven-shared-archive-resources/META-INF</outputDirectory>
- <thirdPartyFilename>DEPENDENCIES-BY-LICENSE</thirdPartyFilename>
- </configuration>
</execution>
</executions>
</plugin>
@@ -1942,13 +1962,6 @@
<goals>
<goal>add-third-party</goal>
</goals>
- <configuration>
- <groupByLicense>true</groupByLicense>
- <failIfWarning>true</failIfWarning>
- <useMissingFile>true</useMissingFile>
- <outputDirectory>${project.build.directory}/maven-shared-archive-resources/META-INF</outputDirectory>
- <thirdPartyFilename>DEPENDENCIES-BY-LICENSE</thirdPartyFilename>
- </configuration>
</execution>
</executions>
</plugin>
Modified: incubator/stanbol/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/pom.xml?rev=1293162&r1=1293161&r2=1293162&view=diff
==============================================================================
--- incubator/stanbol/trunk/pom.xml (original)
+++ incubator/stanbol/trunk/pom.xml Fri Feb 24 10:19:52 2012
@@ -168,6 +168,8 @@
<exclude>enhancer/stores/**</exclude>
<exclude>enhancer/autotagging/**</exclude>
<exclude>enhancer/engines/autotagging/**</exclude>
+ <exclude>enhancer/SemiAutomaticContentEnhancer/**</exclude>
+ <exclude>enhancer/engines/taxonomylinking/**</exclude>
<exclude>demos/**</exclude>
<exclude>launchers/kres/**</exclude>
<exclude>reasoners/**</exclude>
@@ -193,28 +195,7 @@
<execution>
<goals>
<goal>aggregate-add-third-party</goal>
- </goals>
- <configuration>
- <groupByLicense>true</groupByLicense>
- <failIfWarning>true</failIfWarning>
- <useMissingFile>true</useMissingFile>
-
- <licenseMerges>
- <licenseMerge>Apache Software License|AL|Apache Software Licenses|Apache License</licenseMerge>
- <licenseMerge>Apache Software License, Version 1.1|AL 1.1|Apache Software License, Version 1.1</licenseMerge>
- <licenseMerge>Apache Software License, Version 2.0|AL 2.0|ALv2|The Apache Software License, Version 2.0|Apache Software License - Version 2.0|Apache License, Version 2.0|Apache License 2.0|Apache License Version 2|Apache License Version 2.0|Apache 2</licenseMerge>
- <licenseMerge>BSD License|BSD license|BSD|The BSD License|BSD-style license|BSD-like</licenseMerge>
- <licenseMerge>Common Development And Distribution License (CDDL), Version 1.0|CDDL 1.0|CDDL License|Common Development And Distribution License (CDDL) Version 1.0|COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0|Common Development and Distribution License (CDDL) v1.0|Dual license consisting of the CDDL v1.0 and GPL v2</licenseMerge>
- <licenseMerge>Common Development And Distribution License (CDDL), Version 1.1|CDDL 1.1|Common Public License Version 1.1</licenseMerge>
- <licenseMerge>Common Public License, Version 1.0|CPL 1.0|Common Public License Version 1.0</licenseMerge>
- <licenseMerge>Eclipse Public License, Version 1.0|Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0</licenseMerge>
- <licenseMerge>GNU General Public License (GPL), Version 2 with classpath exception|GPLv2 with classpath exception|GPL2 w/ CPE</licenseMerge>
- <licenseMerge>GNU Lesser General Public License (LGPL)|GNU Lesser General Public License|LGPL</licenseMerge>
- <licenseMerge>GNU Lesser General Public License (LGPL), Version 2.1|The GNU Lesser General Public License, Version 2.1|LGPL 2.1</licenseMerge>
- <licenseMerge>MIT License|MIT|The MIT License|MIT license</licenseMerge>
- <licenseMerge>Public Domain License|public domain|Public Domain</licenseMerge>
- </licenseMerges>
- </configuration>
+ </goals>
</execution>
</executions>
</plugin>
@@ -226,6 +207,22 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>aggregate-add-third-party</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<modules>
<module>releasing/framework/stanbol-framework-source-release-assembly-descriptor</module>
<module>releasing/stack/stanbol-stack-source-release-assembly-descriptor</module>