[Tutti-commits] r1423 - in trunk: . tutti-persistence tutti-persistence/src/license tutti-service tutti-ui-swing tutti-ui-swing/src/license

Author: tchemit Date: 2013-12-03 22:39:52 +0100 (Tue, 03 Dec 2013) New Revision: 1423 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1423 Log: fixes #3893: Int?\195?\169grer adagio 3.4.1 + clean poms Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-persistence/src/license/THIRD-PARTY.properties trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-03 17:50:40 UTC (rev 1422) +++ trunk/pom.xml 2013-12-03 21:39:52 UTC (rev 1423) @@ -138,7 +138,7 @@ <slf4jVersion>1.7.5</slf4jVersion> - <adagioVersion>3.4.1-SNAPSHOT</adagioVersion> + <adagioVersion>3.4.1</adagioVersion> <birtVersion>4.2.1a</birtVersion> <bluecoveVersion>2.1.0</bluecoveVersion> @@ -171,7 +171,7 @@ <dbVersion>2013.08.22</dbVersion> <!-- Last tutti report version --> - <reportVersion>2013.11.10</reportVersion> + <reportVersion>2013.12.03</reportVersion> </properties> @@ -207,254 +207,206 @@ <dependencyManagement> <dependencies> - <!-- librairies utils --> - + <!-- Ifremer shared --> <dependency> - <groupId>org.milyn</groupId> - <artifactId>flute</artifactId> - <version>1.3</version> - </dependency> - - <dependency> <groupId>fr.ifremer.shared</groupId> <artifactId>application</artifactId> <version>${ifremerApplicationVersion}</version> </dependency> - <dependency> <groupId>fr.ifremer.shared</groupId> <artifactId>application-swing</artifactId> <version>${ifremerApplicationVersion}</version> </dependency> + <!-- Adagio --> <dependency> + <groupId>fr.ifremer.adagio</groupId> + <artifactId>adagio-core-shared</artifactId> + <version>${adagioVersion}</version> + </dependency> + <dependency> + <groupId>fr.ifremer.adagio</groupId> + <artifactId>adagio-core-allegro</artifactId> + <version>${adagioVersion}</version> + </dependency> + + <!-- Nuiton --> + <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> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> <version>${nuitonDecoratorVersion}</version> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> <version>${nuitonConfigVersion}</version> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-updater</artifactId> <version>${nuitonUpdaterVersion}</version> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> <version>${nuitonCsvVersion}</version> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guavaVersion}</version> - </dependency> - - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonValidatorVersion}</version> </dependency> + <!-- Commons --> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <version>${nuitonValidatorVersion}</version> - <scope>test</scope> - <classifier>tests</classifier> + <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> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commonsIoVersion}</version> + </dependency> + <!-- Guava --> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guavaVersion}</version> + </dependency> + + <!-- XWorks (validation) --> + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${xworkVersion}</version> </dependency> - <!-- librairie Jaxx --> + <!-- JAXX --> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> <version>${jaxxVersion}</version> </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-config</artifactId> <version>${jaxxVersion}</version> </dependency> + <!-- SwingX --> <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> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> <version>${swingXVersion}</version> </dependency> - <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> <version>${swingXVersion}</version> </dependency> - <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-autocomplete</artifactId> <version>${swingXVersion}</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> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + <version>3.0.4</version> + <scope>compile</scope> </dependency> + <!-- Hibernate --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> </dependency> - <dependency> - <groupId>fr.ifremer.adagio</groupId> - <artifactId>adagio-core-allegro</artifactId> - <version>${adagioVersion}</version> - <exclusions> - <exclusion> - <groupId>org.andromda.profiles.emf.uml2</groupId> - <artifactId>andromda-profile-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.andromda.cartridges</groupId> - <artifactId>andromda-spring-cartridge</artifactId> - </exclusion> - <exclusion> - <groupId>org.andromda.cartridges</groupId> - <artifactId>andromda-hibernate-cartridge</artifactId> - </exclusion> - <exclusion> - <groupId>org.andromda.cartridges</groupId> - <artifactId>andromda-java-cartridge</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4jVersion}</version> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jcl</artifactId> <version>${slf4jVersion}</version> </dependency> - <!-- Pour SPRING : --> + <!-- Spring --> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> + <!-- Birt --> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commonsIoVersion}</version> - </dependency> - - <dependency> <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.birt.runtime</artifactId> <version>${birtVersion}</version> @@ -469,65 +421,78 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.milyn</groupId> + <artifactId>flute</artifactId> + <version>1.3</version> + </dependency> + <!-- Jdbc drivers --> <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>${jdbc.hsqldb.version}</version> </dependency> - <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>${hsqldb.version}</version> </dependency> + <!-- Yaml --> <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> <version>1.06</version> </dependency> + <!-- flying-saucer --> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>itextpdf</artifactId> - <version>5.4.1</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>flying-saucer-pdf-itext5</artifactId> <version>9.0.2</version> - <scope>compile</scope> </dependency> + <!-- FreeMarker --> <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> <version>2.3.19</version> - <scope>compile</scope> </dependency> + <!-- Bluecove --> <dependency> <groupId>net.sf.bluecove</groupId> <artifactId>bluecove</artifactId> <version>${bluecoveVersion}</version> </dependency> - <dependency> <groupId>net.sf.bluecove</groupId> <artifactId>bluecove-gpl</artifactId> <version>${bluecoveVersion}</version> </dependency> + <!-- Test --> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.9.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <version>${nuitonValidatorVersion}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + </dependencies> </dependencyManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-12-03 17:50:40 UTC (rev 1422) +++ trunk/tutti-persistence/pom.xml 2013-12-03 21:39:52 UTC (rev 1423) @@ -37,136 +37,115 @@ <dependencies> + <!-- Ifremer shared --> <dependency> <groupId>fr.ifremer.shared</groupId> <artifactId>application</artifactId> </dependency> + <!-- Adagio --> <dependency> <groupId>fr.ifremer.adagio</groupId> + <artifactId>adagio-core-shared</artifactId> + </dependency> + <dependency> + <groupId>fr.ifremer.adagio</groupId> <artifactId>adagio-core-allegro</artifactId> </dependency> - <!-- commons --> + <!-- Spring --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-updater</artifactId> </dependency> - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> + <!-- Commons --> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs2</artifactId> - </dependency> - - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> - <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <!-- Guava --> <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-common</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <!-- Yaml --> - <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> </dependency> <!-- jdbc drivers --> - <!--dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> </dependency--> - <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> </dependency> - <!-- SPRING --> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <scope>provided</scope> - </dependency> - <!-- Logging --> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jcl</artifactId> @@ -174,18 +153,15 @@ </dependency> <!-- Test --> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> Modified: trunk/tutti-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-persistence/src/license/THIRD-PARTY.properties 2013-12-03 17:50:40 UTC (rev 1422) +++ trunk/tutti-persistence/src/license/THIRD-PARTY.properties 2013-12-03 21:39:52 UTC (rev 1423) @@ -5,7 +5,7 @@ # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - Eclipse Public License - v 1.0 +# - General Public License (GPL) # - HSQLDB License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) @@ -22,9 +22,8 @@ # Please fill the missing licenses for dependencies : # # -#Thu Nov 21 17:08:16 CET 2013 +#Tue Dec 03 15:42:52 CET 2013 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 -javax.persistence--persistence-api--1.0.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-12-03 17:50:40 UTC (rev 1422) +++ trunk/tutti-service/pom.xml 2013-12-03 21:39:52 UTC (rev 1423) @@ -41,127 +41,98 @@ <dependencies> + <!-- Sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> <artifactId>tutti-persistence</artifactId> <version>${project.version}</version> </dependency> + <!-- Ifremer shared --> <dependency> <groupId>fr.ifremer.shared</groupId> <artifactId>application</artifactId> </dependency> + <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> </dependency> + <!-- Guava --> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <!-- Commons --> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> - <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-vfs2</artifactId> </dependency> + <!-- SwingX --> <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> </dependency> + <!-- XWorks (validation) --> <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> </dependency> - <!-- Logging --> - + <!-- flying-saucer --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - - <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>flying-saucer-pdf-itext5</artifactId> </dependency> + <!-- FreeMarker --> <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> </dependency> + <!-- Birt --> <!--dependency> <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.birt.runtime</artifactId> @@ -173,6 +144,29 @@ <scope>runtime</scope> </dependency--> + <!-- Logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Tests --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + </dependencies> <build> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-12-03 17:50:40 UTC (rev 1422) +++ trunk/tutti-ui-swing/pom.xml 2013-12-03 21:39:52 UTC (rev 1423) @@ -94,88 +94,77 @@ <dependencies> + <!-- Sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> <artifactId>tutti-persistence</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>tutti-service</artifactId> <version>${project.version}</version> </dependency> + <!-- Ifremer shared --> <dependency> <groupId>fr.ifremer.shared</groupId> <artifactId>application</artifactId> </dependency> - <dependency> <groupId>fr.ifremer.shared</groupId> <artifactId>application-swing</artifactId> </dependency> + <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> <artifactId>nuiton-updater</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> </dependency> - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency> + <!-- Guava --> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <!-- Commons --> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <!-- used forApplicationUpdater --> <dependency> <groupId>commons-httpclient</groupId> @@ -183,74 +172,61 @@ <scope>runtime</scope> </dependency> + <!-- JAXX --> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <!-- librairie Jaxx --> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-config</artifactId> </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> </dependency> - <!-- swing widgets --> - + <!-- SwingX --> <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </dependency> - <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> </dependency> - <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-autocomplete</artifactId> </dependency> <!-- Logging --> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jcl</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>runtime</scope> </dependency> + <!-- Tests --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> </dependencies> Modified: trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-12-03 17:50:40 UTC (rev 1422) +++ trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-12-03 21:39:52 UTC (rev 1423) @@ -1,14 +1,12 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - ASF 2.0 # - Affero General Public License (AGPL) # - Apache License # - BSD License # - BSD-style license # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 -# - Eclipse Public License - v 1.0 # - GNU Affero General Public License v3 # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public License (LGPL), version 2.1 @@ -28,9 +26,8 @@ # Please fill the missing licenses for dependencies : # # -#Thu Oct 31 17:05:37 CET 2013 +#Tue Dec 03 12:02:44 CET 2013 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 -javax.persistence--persistence-api--1.0.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=Common Development and Distribution License (CDDL) v1.0