branch develop updated (d5a5b30 -> 5f72970)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git from d5a5b30 refs #3954: Downgrade jetty to jdk 7 new 5f72970 refs #3954: Update deps and fix build 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 5f729706f9850a8ce3e909916f54a1ce6b2ae250 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Oct 19 19:43:47 2016 +0200 refs #3954: Update deps and fix build Summary of changes: nuiton-rss/src/license/THIRD-PARTY.properties | 9 ++++----- nuiton-security/src/license/THIRD-PARTY.properties | 20 ++++++++++++-------- nuiton-struts2/src/license/THIRD-PARTY.properties | 22 +++++++++++++--------- nuiton-web/pom.xml | 2 +- nuiton-web/src/license/THIRD-PARTY.properties | 16 ++++++++++++---- pom.xml | 10 +++++----- 6 files changed, 47 insertions(+), 32 deletions(-) -- 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 nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git commit 5f729706f9850a8ce3e909916f54a1ce6b2ae250 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Oct 19 19:43:47 2016 +0200 refs #3954: Update deps and fix build --- nuiton-rss/src/license/THIRD-PARTY.properties | 9 ++++----- nuiton-security/src/license/THIRD-PARTY.properties | 20 ++++++++++++-------- nuiton-struts2/src/license/THIRD-PARTY.properties | 22 +++++++++++++--------- nuiton-web/pom.xml | 2 +- nuiton-web/src/license/THIRD-PARTY.properties | 16 ++++++++++++---- pom.xml | 10 +++++----- 6 files changed, 47 insertions(+), 32 deletions(-) diff --git a/nuiton-rss/src/license/THIRD-PARTY.properties b/nuiton-rss/src/license/THIRD-PARTY.properties index fbbcde0..a72f1cf 100644 --- a/nuiton-rss/src/license/THIRD-PARTY.properties +++ b/nuiton-rss/src/license/THIRD-PARTY.properties @@ -2,22 +2,21 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License -# - BSD style +# - CDDL + GPLv2 with classpath exception # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 +# - Eclipse Public License 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 +# - New BSD License # - Similar to Apache License but with the acknowledgment clause removed -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Oct 24 14:20:44 CEST 2012 +#Wed Oct 19 19:42:12 CEST 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -javax.servlet--servlet-api--2.5=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 rome--rome--1.0=The Apache Software License, Version 2.0 diff --git a/nuiton-security/src/license/THIRD-PARTY.properties b/nuiton-security/src/license/THIRD-PARTY.properties index ae06cfa..60fa009 100644 --- a/nuiton-security/src/license/THIRD-PARTY.properties +++ b/nuiton-security/src/license/THIRD-PARTY.properties @@ -1,26 +1,30 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License -# - BSD-style license +# - CDDL + GPLv2 with classpath exception # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - GNU Library or Lesser General Public License +# - Common Development and Distribution License +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, Version 2.1 # - 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 # - MPL 1.1 +# - Public Domain # - The Apache Software License, Version 2.0 -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Oct 24 14:21:56 CEST 2012 -antlr--antlr--2.7.6=BSD License +#Wed Oct 19 19:42:37 CEST 2016 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=MPL 1.1 -javax.servlet--servlet-api--2.5=License Agreement for Java(TM) Servlet API Specification Interface Classes -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 diff --git a/nuiton-struts2/src/license/THIRD-PARTY.properties b/nuiton-struts2/src/license/THIRD-PARTY.properties index 3b628b1..5b86fa1 100644 --- a/nuiton-struts2/src/license/THIRD-PARTY.properties +++ b/nuiton-struts2/src/license/THIRD-PARTY.properties @@ -1,28 +1,32 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License -# - BSD style -# - BSD-style license # - CDDL + GPLv2 with classpath exception # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 +# - Common Development and Distribution License +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License 1.0 +# - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, Version 2.1 # - 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 # - MPL 1.1 +# - New BSD License +# - Public Domain # - The Apache Software License, Version 2.0 -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Jan 04 23:41:33 CET 2012 -antlr--antlr--2.7.6=BSD License +#Wed Oct 19 19:42:02 CEST 2016 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=MPL 1.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 diff --git a/nuiton-web/pom.xml b/nuiton-web/pom.xml index d966730..d0545e7 100644 --- a/nuiton-web/pom.xml +++ b/nuiton-web/pom.xml @@ -65,7 +65,7 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> + <artifactId>hibernate-jpa-2.1-api</artifactId> </dependency> <dependency> diff --git a/nuiton-web/src/license/THIRD-PARTY.properties b/nuiton-web/src/license/THIRD-PARTY.properties index c26d768..5c3c1cf 100644 --- a/nuiton-web/src/license/THIRD-PARTY.properties +++ b/nuiton-web/src/license/THIRD-PARTY.properties @@ -1,25 +1,33 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 # - Apache Software License - Version 2.0 # - BSD License +# - CDDL + GPLv2 with classpath exception # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - Version 1.0 -# - GNU Lesser General Public License version 2.1 +# - Eclipse Public License, Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, Version 2.1 # - 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 # - MPL 1.1 +# - Public Domain # - The Apache Software License, Version 2.0 # - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Nov 13 16:49:07 CET 2011 -antlr--antlr--2.7.6=BSD License +#Wed Oct 19 19:32:40 CEST 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 diff --git a/pom.xml b/pom.xml index 1aeece1..d0bd196 100644 --- a/pom.xml +++ b/pom.xml @@ -118,14 +118,14 @@ License along with this program. If not, see <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <eugeneVersion>3.0-alpha-8</eugeneVersion> + <eugeneVersion>3.0-alpha-9</eugeneVersion> <nuitonConfigVersion>3.1</nuitonConfigVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonUtilsVersion>3.0-rc-15</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.1.3.1</topiaVersion> + <topiaVersion>3.1.3.2</topiaVersion> <!-- Tapestry --> <tapestryVersion>5.2.4</tapestryVersion> @@ -160,7 +160,7 @@ License along with this program. If not, see <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.4</version> + <version>3.5</version> </dependency> <dependency> @@ -316,8 +316,8 @@ License along with this program. If not, see <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <version>1.0.1.Final</version> + <artifactId>hibernate-jpa-2.1-api</artifactId> + <version>1.0.0.Final</version> <scope>provided</scope> </dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm