Author: fchrist
Date: Tue Feb 21 15:15:24 2012
New Revision: 1291851
URL: http://svn.apache.org/viewvc?rev=1291851&view=rev
Log:
STANBOL-493 Fixed last licenses and exluded slf4j-jdk14 dependency from
solr-core (version conflict)
Modified:
incubator/stanbol/trunk/demos/webvie/src/license/THIRD-PARTY.properties
incubator/stanbol/trunk/entityhub/indexing/geonames/pom.xml
incubator/stanbol/trunk/parent/pom.xml
incubator/stanbol/trunk/pom.xml
Modified:
incubator/stanbol/trunk/demos/webvie/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/demos/webvie/src/license/THIRD-PARTY.properties?rev=1291851&r1=1291850&r2=1291851&view=diff
==============================================================================
--- incubator/stanbol/trunk/demos/webvie/src/license/THIRD-PARTY.properties
(original)
+++ incubator/stanbol/trunk/demos/webvie/src/license/THIRD-PARTY.properties Tue
Feb 21 15:15:24 2012
@@ -1,14 +1,12 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache 2
# - Apache License
# - BSD
+# - BSD License
# - BSD-style license
# - CDDL 1.1
-# - CDDL License
# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
# - GPL2 w/ CPE
# - ICU License
# - MIT License
@@ -17,10 +15,9 @@
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:05:44 CET 2012
+#Tue Feb 21 15:51:07 CET 2012
asm--asm--3.1=BSD License
javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
-org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
Modified: incubator/stanbol/trunk/entityhub/indexing/geonames/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/indexing/geonames/pom.xml?rev=1291851&r1=1291850&r2=1291851&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/indexing/geonames/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/indexing/geonames/pom.xml Tue Feb 21
15:15:24 2012
@@ -52,12 +52,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
+ <version>1.6.1</version>
<scope>runtime</scope>
</dependency>
<!-- Entityhub dependencies -->
Modified: incubator/stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1291851&r1=1291850&r2=1291851&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Tue Feb 21 15:15:24 2012
@@ -1327,6 +1327,12 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<version>3.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
Modified: incubator/stanbol/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/pom.xml?rev=1291851&r1=1291850&r2=1291851&view=diff
==============================================================================
--- incubator/stanbol/trunk/pom.xml (original)
+++ incubator/stanbol/trunk/pom.xml Tue Feb 21 15:15:24 2012
@@ -155,6 +155,7 @@
<exclude>**/test/**/*.nt</exclude>
<!-- approved licenses, see modules' POMs for details -->
+ <exclude>**/src/license/THIRD-PARTY.properties</exclude>
<exclude>contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/static/scripts/jit.js</exclude>
<exclude>enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/static/openlayers-2.9/**</exclude>
<exclude>commons/owl/**</exclude>
@@ -192,6 +193,10 @@
<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>
@@ -202,7 +207,7 @@
<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)|LGPL</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>
