branch develop updated (3458fbf -> 189b50d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 3458fbf refs #6453 [CAPTURE] compléter l'écran résumé avec un poids new 189b50d fix dependencies The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 189b50d45cedca586aafd85b11cdcda33a6b784e Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 20 10:48:53 2015 +0100 fix dependencies Summary of changes: pom.xml | 35 +++++++++++++++++++++++- tutti-service/src/license/THIRD-PARTY.properties | 19 +++---------- tutti-ui-swing/pom.xml | 25 +++++++++++++++++ 3 files changed, 63 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 189b50d45cedca586aafd85b11cdcda33a6b784e Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 20 10:48:53 2015 +0100 fix dependencies --- pom.xml | 35 +++++++++++++++++++++++- tutti-service/src/license/THIRD-PARTY.properties | 19 +++---------- tutti-ui-swing/pom.xml | 25 +++++++++++++++++ 3 files changed, 63 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 709a72f..2b72235 100644 --- a/pom.xml +++ b/pom.xml @@ -140,6 +140,7 @@ <hibernateVersion>4.3.7.Final</hibernateVersion> <springVersion>4.1.4.RELEASE</springVersion> <hsqldbVersion>1.8.1.3</hsqldbVersion> + <batikVersion>1.7</batikVersion> <!-- I18n configuration --> <i18n.bundles>fr_FR,en_GB</i18n.bundles> @@ -155,6 +156,7 @@ <!-- Last JRE version to use --> <jreVersion>1.7.72</jreVersion> + <xmlApisVersion>1.3.04</xmlApisVersion> </properties> <repositories> @@ -560,7 +562,38 @@ <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-swing</artifactId> - <version>1.7</version> + <version>${batikVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-bridge</artifactId> + <version>${batikVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-ext</artifactId> + <version>${batikVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svg-dom</artifactId> + <version>${batikVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-util</artifactId> + <version>${batikVersion}</version> + </dependency> + + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>${xmlApisVersion}</version> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis-ext</artifactId> + <version>${xmlApisVersion}</version> </dependency> <!--<dependency>--> diff --git a/tutti-service/src/license/THIRD-PARTY.properties b/tutti-service/src/license/THIRD-PARTY.properties index 1ff5077..bdb5a75 100644 --- a/tutti-service/src/license/THIRD-PARTY.properties +++ b/tutti-service/src/license/THIRD-PARTY.properties @@ -10,13 +10,14 @@ # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Common Public License Version 1.0 # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - v 1.0 +# - Eclipse Public License 1.0 # - GNU Affero General Public License v3 # - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License (LGPL), version 2.1 +# - GNU Lesser Public License # - GNU Library or Lesser General Public License # - General Public License (GPL) # - ICU License @@ -33,25 +34,13 @@ # - Public Domain # - The Apache Software License, Version 2.0 # - The MIT License +# - The New BSD License # - WTFPL #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Nov 25 11:36:15 UTC 2014 -batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 -batik--batik-bridge--1.6=The Apache Software License, Version 2.0 -batik--batik-css--1.6=The Apache Software License, Version 2.0 -batik--batik-dom--1.6=The Apache Software License, Version 2.0 -batik--batik-ext--1.6=The Apache Software License, Version 2.0 -batik--batik-gvt--1.6=The Apache Software License, Version 2.0 -batik--batik-parser--1.6=The Apache Software License, Version 2.0 -batik--batik-script--1.6=The Apache Software License, Version 2.0 -batik--batik-svg-dom--1.6=The Apache Software License, Version 2.0 -batik--batik-svggen--1.6=The Apache Software License, Version 2.0 -batik--batik-transcoder--1.6=The Apache Software License, Version 2.0 -batik--batik-util--1.6=The Apache Software License, Version 2.0 -batik--batik-xml--1.6=The Apache Software License, Version 2.0 +#Tue Jan 20 10:11:19 CET 2015 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License hsqldb--hsqldb--1.8.1.3=BSD License diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index ef13a2b..17980a0 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -277,6 +277,31 @@ <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-swing</artifactId> </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-bridge</artifactId> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-ext</artifactId> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svg-dom</artifactId> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-util</artifactId> + </dependency> + + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis-ext</artifactId> + </dependency> <!-- Tests --> <dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm