Author: maven-release Date: 2012-04-13 19:49:44 +0200 (Fri, 13 Apr 2012) New Revision: 3270 Url: http://chorem.org/repositories/revision/pollen/3270 Log: optimize dependencies + update third-parties Removed: trunk/pollen-votecounting/src/license/THIRD-PARTY.properties Modified: trunk/pollen-persistence/pom.xml trunk/pollen-persistence/src/license/THIRD-PARTY.properties trunk/pollen-services/src/license/THIRD-PARTY.properties trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties trunk/pollen-votecounting/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-persistence/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) @@ -42,10 +42,10 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> - </dependency> + </dependency--> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> @@ -55,6 +55,10 @@ <artifactId>topia-service-migration</artifactId> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>test</scope> Modified: trunk/pollen-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -11,6 +11,8 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -18,10 +20,8 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 30 01:31:24 CET 2012 +#Fri Apr 13 19:35:55 CEST 2012 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 Modified: trunk/pollen-services/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-services/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-services/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -13,6 +13,8 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -20,10 +22,10 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 30 01:32:21 CET 2012 +#Fri Apr 13 19:36:08 CEST 2012 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 +jdom--jdom--1.0=The Apache Software License, Version 2.0 +rome--rome--1.0=The Apache Software License, Version 2.0 Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) @@ -19,11 +19,11 @@ <artifactId>pollen-ui-struts2</artifactId> <dependencies> - <!--dependency> + <dependency> <groupId>${project.groupId}</groupId> - <artifactId>pollen-domain</artifactId> + <artifactId>pollen-votecounting</artifactId> <version>${project.version}</version> - </dependency--> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>pollen-persistence</artifactId> @@ -116,6 +116,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-jfreechart-plugin</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -133,6 +134,32 @@ <artifactId>shiro-web</artifactId> </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jfree</groupId> + <artifactId>jcommon</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + </dependency> + <!-- Provided dependencies --> <dependency> <groupId>javax.servlet</groupId> Modified: trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -4,17 +4,21 @@ # - Apache Software License - Version 2.0 # - BSD License # - BSD-style license +# - Bouncy Castle License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Eclipse Public License - Version 1.0 # - GNU Affero General Public License version 3 +# - GNU Lesser General Public Licence # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - JDOM Apache-like license # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - Mozilla Public License +# - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -23,12 +27,12 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 30 01:33:46 CET 2012 +#Fri Apr 13 19:37:43 CEST 2012 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 +jdom--jdom--1.0=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 +rome--rome--1.0=The Apache Software License, Version 2.0 Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-votecounting/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) @@ -31,10 +31,10 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - </dependency> + </dependency--> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> Deleted: trunk/pollen-votecounting/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-votecounting/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-votecounting/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -1,19 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - BSD License -# - BSD style -# - 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 -# - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 -# - MIT License -# - The Apache Software License, Version 2.0 -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Mon Jan 30 01:22:54 CET 2012 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0