branch develop updated (b752303 -> 8267320)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from b752303 Fix release configuration new 61435ae Optimize dependencies new 8267320 Optimize third parties The 2 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 8267320b5ff0c48c79f9704073154dd18fd7a05c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 23 14:55:15 2015 +0200 Optimize third parties commit 61435ae2f53aa5fcbd4403db2b065954dd26e5ee Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 23 14:53:54 2015 +0200 Optimize dependencies Summary of changes: pom.xml | 19 +++++++++++ swe-git/pom.xml | 7 +++- swe-git/src/license/THIRD-PARTY.properties | 41 ---------------------- swe-scm-api/pom.xml | 7 +--- swe-scm-api/src/license/THIRD-PARTY.properties | 41 ---------------------- swe-svn/pom.xml | 10 ++++++ swe-svn/src/license/THIRD-PARTY.properties | 21 ++---------- swe-ui-web/pom.xml | 47 +++++++++++++++++++++++--- swe-ui-web/src/license/THIRD-PARTY.properties | 14 ++++++-- 9 files changed, 92 insertions(+), 115 deletions(-) delete mode 100644 swe-git/src/license/THIRD-PARTY.properties delete mode 100644 swe-scm-api/src/license/THIRD-PARTY.properties -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 61435ae2f53aa5fcbd4403db2b065954dd26e5ee Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 23 14:53:54 2015 +0200 Optimize dependencies --- pom.xml | 19 +++++++++++++++++++ swe-git/pom.xml | 7 ++++++- swe-scm-api/pom.xml | 7 +------ swe-svn/pom.xml | 10 ++++++++++ swe-ui-web/pom.xml | 47 +++++++++++++++++++++++++++++++++++++++++++---- 5 files changed, 79 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 245925d..207d4c1 100644 --- a/pom.xml +++ b/pom.xml @@ -184,6 +184,12 @@ </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>18.0</version> + </dependency> + + <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> <version>3.7.0.201502260915-r</version> @@ -273,6 +279,19 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>2.0.2</version> + </dependency> + <!-- Struts --> <dependency> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index 68c452d..b47a531 100644 --- a/swe-git/pom.xml +++ b/swe-git/pom.xml @@ -57,7 +57,12 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> </dependency> - + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + </dependencies> </project> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index 9c1b7ce..25b6ea5 100644 --- a/swe-scm-api/pom.xml +++ b/swe-scm-api/pom.xml @@ -47,12 +47,7 @@ </build> <dependencies> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - + </dependencies> </project> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 5d76cd4..3e991e6 100644 --- a/swe-svn/pom.xml +++ b/swe-svn/pom.xml @@ -63,6 +63,16 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> </dependencies> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index 60ffa85..0ce8d1a 100644 --- a/swe-ui-web/pom.xml +++ b/swe-ui-web/pom.xml @@ -30,7 +30,7 @@ <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> - + </properties> <build> @@ -84,16 +84,29 @@ <dependency> <groupId>${project.groupId}</groupId> + <artifactId>scmwebeditor-scm-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>scmwebeditor-svn</artifactId> <version>${project.version}</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>scmwebeditor-git</artifactId> <version>${project.version}</version> + <scope>runtime</scope> </dependency> - + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> @@ -105,13 +118,29 @@ </dependency> <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> + </dependency> + + <dependency> <groupId>org.webjars</groupId> <artifactId>codemirror</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>jrst</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> @@ -139,6 +168,16 @@ <artifactId>cpdetector</artifactId> </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </dependency> + + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <!-- Struts --> <dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 8267320b5ff0c48c79f9704073154dd18fd7a05c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 23 14:55:15 2015 +0200 Optimize third parties --- swe-git/src/license/THIRD-PARTY.properties | 41 -------------------------- swe-scm-api/src/license/THIRD-PARTY.properties | 41 -------------------------- swe-svn/src/license/THIRD-PARTY.properties | 21 ++----------- swe-ui-web/src/license/THIRD-PARTY.properties | 14 +++++++-- 4 files changed, 13 insertions(+), 104 deletions(-) diff --git a/swe-git/src/license/THIRD-PARTY.properties b/swe-git/src/license/THIRD-PARTY.properties deleted file mode 100644 index 9acc30b..0000000 --- a/swe-git/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,41 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - BSD License -# - BSD-style license -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 -# - GPL -# - GPL (with dual licensing option) -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - JDom license (Apache-like) -# - LGPL, version 2.1 -# - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 -# - Lesser General Public License v2.1 -# - MIT License -# - Mozilla Public License 1.1 (MPL 1.1) -# - Mozilla Public License version 1.1 -# - New BSD License -# - Sequence Library License -# - TMate Open Source License (with dual licensing option) -# - The Apache Software License, Version 1.1 -# - The Apache Software License, Version 2.0 -# - Trilead Library License -# - http://source.icu-project.org/repos/icu/icu/trunk/license.html -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Sun Jan 26 14:43:09 CET 2014 -com.ibm.icu--icu4j--2.6.1=http\://source.icu-project.org/repos/icu/icu/trunk/license.html -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.11.0.GA=Lesser General Public License v2.1 -javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jaxen--jaxen--1.1.1=The Apache Software License, Version 2.0 -jdom--jdom--1.0=JDom license (Apache-like) -org.antlr--antlr-runtime--3.4=BSD License -oro--oro--2.0.8=The Apache Software License, Version 2.0 -xerces--xercesImpl--2.6.2=The Apache Software License, Version 2.0 diff --git a/swe-scm-api/src/license/THIRD-PARTY.properties b/swe-scm-api/src/license/THIRD-PARTY.properties deleted file mode 100644 index 9acc30b..0000000 --- a/swe-scm-api/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,41 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - BSD License -# - BSD-style license -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 -# - GPL -# - GPL (with dual licensing option) -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - JDom license (Apache-like) -# - LGPL, version 2.1 -# - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 -# - Lesser General Public License v2.1 -# - MIT License -# - Mozilla Public License 1.1 (MPL 1.1) -# - Mozilla Public License version 1.1 -# - New BSD License -# - Sequence Library License -# - TMate Open Source License (with dual licensing option) -# - The Apache Software License, Version 1.1 -# - The Apache Software License, Version 2.0 -# - Trilead Library License -# - http://source.icu-project.org/repos/icu/icu/trunk/license.html -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Sun Jan 26 14:43:09 CET 2014 -com.ibm.icu--icu4j--2.6.1=http\://source.icu-project.org/repos/icu/icu/trunk/license.html -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.11.0.GA=Lesser General Public License v2.1 -javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jaxen--jaxen--1.1.1=The Apache Software License, Version 2.0 -jdom--jdom--1.0=JDom license (Apache-like) -org.antlr--antlr-runtime--3.4=BSD License -oro--oro--2.0.8=The Apache Software License, Version 2.0 -xerces--xercesImpl--2.6.2=The Apache Software License, Version 2.0 diff --git a/swe-svn/src/license/THIRD-PARTY.properties b/swe-svn/src/license/THIRD-PARTY.properties index 9acc30b..af62156 100644 --- a/swe-svn/src/license/THIRD-PARTY.properties +++ b/swe-svn/src/license/THIRD-PARTY.properties @@ -2,40 +2,23 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License -# - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 -# - GPL # - GPL (with dual licensing option) # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - JDom license (Apache-like) # - LGPL, version 2.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 -# - Lesser General Public License v2.1 # - MIT License -# - Mozilla Public License 1.1 (MPL 1.1) -# - Mozilla Public License version 1.1 -# - New BSD License +# - Revised BSD # - Sequence Library License # - TMate Open Source License (with dual licensing option) -# - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - Trilead Library License -# - http://source.icu-project.org/repos/icu/icu/trunk/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jan 26 14:43:09 CET 2014 -com.ibm.icu--icu4j--2.6.1=http\://source.icu-project.org/repos/icu/icu/trunk/license.html +#Fri Oct 23 14:54:30 CEST 2015 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.11.0.GA=Lesser General Public License v2.1 -javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jaxen--jaxen--1.1.1=The Apache Software License, Version 2.0 -jdom--jdom--1.0=JDom license (Apache-like) org.antlr--antlr-runtime--3.4=BSD License -oro--oro--2.0.8=The Apache Software License, Version 2.0 -xerces--xercesImpl--2.6.2=The Apache Software License, Version 2.0 diff --git a/swe-ui-web/src/license/THIRD-PARTY.properties b/swe-ui-web/src/license/THIRD-PARTY.properties index 9acc30b..49b4f4f 100644 --- a/swe-ui-web/src/license/THIRD-PARTY.properties +++ b/swe-ui-web/src/license/THIRD-PARTY.properties @@ -1,40 +1,48 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2 +# - Apache License # - BSD License # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - Eclipse Distribution License (New BSD License) +# - 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 # - GPL # - GPL (with dual licensing option) # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - JDom license (Apache-like) +# - Jython Software License # - LGPL, version 2.1 +# - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - Lesser General Public License v2.1 # - MIT License # - Mozilla Public License 1.1 (MPL 1.1) -# - Mozilla Public License version 1.1 # - New BSD License +# - Revised BSD # - Sequence Library License # - TMate Open Source License (with dual licensing option) # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 +# - The Werken Company License # - Trilead Library License # - http://source.icu-project.org/repos/icu/icu/trunk/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jan 26 14:43:09 CET 2014 +#Fri Oct 23 14:54:31 CEST 2015 com.ibm.icu--icu4j--2.6.1=http\://source.icu-project.org/repos/icu/icu/trunk/license.html commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javassist--javassist--3.11.0.GA=Lesser General Public License v2.1 javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jaxen--jaxen--1.1.1=The Apache Software License, Version 2.0 jdom--jdom--1.0=JDom license (Apache-like) org.antlr--antlr-runtime--3.4=BSD License oro--oro--2.0.8=The Apache Software License, Version 2.0 -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm