Author: echatellier Date: 2011-07-01 17:13:56 +0200 (Fri, 01 Jul 2011) New Revision: 1035 Url: http://nuiton.org/repositories/revision/wikitty/1035 Log: Fix dependencies. jbossjta contains a lot a useless dependencies Modified: trunk/pom.xml trunk/wikitty-api/src/license/THIRD-PARTY.properties trunk/wikitty-jdbc/pom.xml trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java trunk/wikitty-solr/pom.xml trunk/wikitty-solr/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/pom.xml 2011-07-01 15:13:56 UTC (rev 1035) @@ -120,7 +120,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>1.6.1</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> <dependency> @@ -214,6 +214,88 @@ <artifactId>jcl-over-slf4j</artifactId> <groupId>org.slf4j</groupId> </exclusion> + <exclusion> + <artifactId>jboss-server-manager</artifactId> + <groupId>org.jboss.jbossas</groupId> + </exclusion> + <exclusion> + <artifactId>commons-httpclient</artifactId> + <groupId>commons-httpclient</groupId> + </exclusion> + <exclusion> + <artifactId>emma</artifactId> + <groupId>emma</groupId> + </exclusion> + <exclusion> + <artifactId>emma_ant</artifactId> + <groupId>emma</groupId> + </exclusion> + <exclusion> + <artifactId>jbossws-common</artifactId> + <groupId>org.jboss.ws</groupId> + </exclusion> + <exclusion> + <artifactId>jacorb</artifactId> + <groupId>jacorb</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <groupId>org.jboss.spec.javax.ejb</groupId> + </exclusion> + <exclusion> + <artifactId>idl</artifactId> + <groupId>jacorb</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-corba-ots-spi</artifactId> + <groupId>org.jboss.integration</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-remoting</artifactId> + <groupId>org.jboss.remoting</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <groupId>org.jboss.spec.javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>ironjacamar-spec-api</artifactId> + <groupId>org.jboss.ironjacamar</groupId> + </exclusion> + <exclusion> + <artifactId>netty</artifactId> + <groupId>org.jboss.netty</groupId> + </exclusion> + <exclusion> + <artifactId>dom4j</artifactId> + <groupId>dom4j</groupId> + </exclusion> + <exclusion> + <artifactId>hornetq-core</artifactId> + <groupId>org.hornetq</groupId> + </exclusion> + <exclusion> + <artifactId>wrapper</artifactId> + <groupId>tanukisoft</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-generator</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <groupId>org.hibernate.javax.persistence</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-processor</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId> + jboss-transaction-api_1.1_spec + </artifactId> + <groupId>org.jboss.spec.javax.transaction</groupId> + </exclusion> </exclusions> </dependency> Modified: trunk/wikitty-api/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-api/src/license/THIRD-PARTY.properties 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/wikitty-api/src/license/THIRD-PARTY.properties 2011-07-01 15:13:56 UTC (rev 1035) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 @@ -8,18 +8,23 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 2.0 +# - lgpl +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Jan 27 11:01:32 CET 2011 +#Fri Jul 01 16:43:22 CEST 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +dom4j--dom4j--1.6.1--jar=BSD License javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/wikitty-jdbc/pom.xml 2011-07-01 15:13:56 UTC (rev 1035) @@ -28,6 +28,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>wikitty-api</artifactId> <version>${project.version}</version> Modified: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2011-07-01 15:13:56 UTC (rev 1035) @@ -24,7 +24,6 @@ */ package org.nuiton.wikitty.services; - import java.io.File; import java.util.UUID; import org.apache.commons.logging.Log; Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/wikitty-solr/pom.xml 2011-07-01 15:13:56 UTC (rev 1035) @@ -72,11 +72,6 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-07-01 15:13:56 UTC (rev 1035) @@ -3,28 +3,33 @@ # Already used licenses in project : # - Apache 2 # - Apache License +# - Apache Software License, Version 1.1 # - Apache Software License, version 1.1 # - BSD License +# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 2.0 +# - lgpl #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Apr 26 16:24:04 CEST 2011 +#Fri Jul 01 16:52:09 CEST 2011 antlr--antlr--2.7.2--jar=BSD License commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. dom4j--dom4j--1.1--jar=BSD License +dom4j--dom4j--1.6.1--jar=BSD License jakarta-regexp--jakarta-regexp--1.4--jar=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5--jar=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0