Author: echatellier Date: 2014-07-10 14:41:05 +0200 (Thu, 10 Jul 2014) New Revision: 378 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/378 Log: Clean dependencies Modified: trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-07-10 10:01:06 UTC (rev 377) +++ trunk/faxtomail-service/pom.xml 2014-07-10 12:41:05 UTC (rev 378) @@ -53,6 +53,11 @@ </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-07-10 10:01:06 UTC (rev 377) +++ trunk/faxtomail-ui-web/pom.xml 2014-07-10 12:41:05 UTC (rev 378) @@ -302,12 +302,6 @@ <dependency> <groupId>gui.ava</groupId> <artifactId>html2image</artifactId> - <exclusions> - <exclusion> - <artifactId>core-renderer</artifactId> - <groupId>org.xhtmlrenderer</groupId> - </exclusion> - </exclusions> </dependency> <dependency> Modified: trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties 2014-07-10 10:01:06 UTC (rev 377) +++ trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties 2014-07-10 12:41:05 UTC (rev 378) @@ -9,6 +9,7 @@ # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License +# - Common Public License Version 1.0 # - Copyright 2012 Igor Vaynberg # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 @@ -29,6 +30,7 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License # - Public Domain # - SIL Open Font License (OFL) # - The Apache Software License, Version 1.1 @@ -39,7 +41,7 @@ # Please fill the missing licenses for dependencies : # # -#Thu Jul 03 09:32:32 CEST 2014 +#Thu Jul 10 12:54:07 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License gui.ava--html2image--2.0.1=GNU Lesser General Public License, Version 2.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-10 10:01:06 UTC (rev 377) +++ trunk/pom.xml 2014-07-10 12:41:05 UTC (rev 378) @@ -202,6 +202,12 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -213,12 +219,6 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-profiling</artifactId> - <version>2.7.1</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> </dependency> @@ -306,12 +306,6 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-config</artifactId> - <version>${jaxxVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-application-api</artifactId> <version>${jaxxVersion}</version> </dependency> @@ -322,21 +316,6 @@ <version>${jaxxVersion}</version> </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${jaxxVersion}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - <version>3.0.4</version> - <scope>compile</scope> - </dependency> - <!-- swing widgets --> <dependency> @@ -352,12 +331,6 @@ </dependency> <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-autocomplete</artifactId> - <version>${swingXVersion}</version> - </dependency> - - <dependency> <groupId>com.ezware.oxbow</groupId> <artifactId>swing-bits</artifactId> <version>0.5.0</version> @@ -369,22 +342,6 @@ <version>1.0.5</version> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs2</artifactId> - <version>2.0</version> - <exclusions> - <exclusion> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-provider-svnexe</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> @@ -449,12 +406,6 @@ <dependency> <groupId>org.apache.struts</groupId> - <artifactId>struts2-json-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> <artifactId>struts2-convention-plugin</artifactId> <version>${struts2Version}</version> </dependency> @@ -629,6 +580,16 @@ <groupId>gui.ava</groupId> <artifactId>html2image</artifactId> <version>2.0.1</version> + <exclusions> + <exclusion> + <artifactId>core-renderer</artifactId> + <groupId>org.xhtmlrenderer</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> <dependency>