Author: echatellier Date: 2017-09-12 16:39:41 +0200 (Tue, 12 Sep 2017) New Revision: 4423 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4423 Log: Update libs Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java trunk/src/main/javascript/templates/web/region-web.html Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-09-12 10:33:07 UTC (rev 4422) +++ trunk/pom.xml 2017-09-12 14:39:41 UTC (rev 4423) @@ -20,7 +20,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-18</version> + <version>3.0</version> <scope>compile</scope> </dependency> @@ -27,7 +27,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.2</version> + <version>3.3</version> <scope>compile</scope> </dependency> @@ -65,9 +65,16 @@ <version>${hibernateVersion}</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.hibernate</groupId> + <artifactId>hibernate-hikaricp</artifactId> + <version>${hibernateVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> <version>${hibernateVersion}</version> <scope>runtime</scope> @@ -135,7 +142,7 @@ <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> - <version>1.5.6</version> + <version>1.6.0</version> <scope>compile</scope> </dependency> @@ -192,7 +199,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.5</version> + <version>3.6</version> </dependency> <dependency> @@ -223,7 +230,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.4</version> + <version>1.5</version> </dependency> <dependency> @@ -312,7 +319,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.194</version> + <version>1.4.196</version> <scope>compile</scope> </dependency> @@ -332,7 +339,7 @@ <dependency> <groupId>ca.umontreal.iro.simul</groupId> <artifactId>ssj</artifactId> - <version>3.2.0</version> + <version>3.2.1</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -351,7 +358,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.8.12</version> + <version>1.9.0</version> <scope>compile</scope> <exclusions> <exclusion> @@ -373,7 +380,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.25-incubating</version> + <version>2.3.26-incubating</version> <scope>compile</scope> </dependency> @@ -386,25 +393,25 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>20.0</version> + <version>23.0</version> </dependency> <dependency> <groupId>com.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>3.9</version> + <version>4.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.7</version> + <version>2.9.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.7</version> + <version>2.9.1</version> </dependency> <!-- Tests --> @@ -562,7 +569,7 @@ <!-- Dependencies version --> <jaxxVersion>2.41</jaxxVersion> <topiaVersion>2.12</topiaVersion> - <hibernateVersion>5.1.5.Final</hibernateVersion> + <hibernateVersion>5.1.10.Final</hibernateVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles> @@ -612,7 +619,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> + <version>3.0.0-M1</version> <executions> <execution> <id>enforce-bytecode-version</id> @@ -622,7 +629,7 @@ <configuration> <rules> <enforceBytecodeVersion> - <maxJdkVersion>1.7</maxJdkVersion> + <maxJdkVersion>1.8</maxJdkVersion> </enforceBytecodeVersion> </rules> <fail>true</fail> @@ -633,7 +640,7 @@ <dependency> <groupId>org.codehaus.mojo</groupId> <artifactId>extra-enforcer-rules</artifactId> - <version>1.0-beta-4</version> + <version>1.0-beta-6</version> </dependency> </dependencies> </plugin> @@ -764,9 +771,9 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>1.3</version> + <version>1.5</version> <configuration> - <nodeVersion>v7.7.4</nodeVersion> + <nodeVersion>v8.4.0</nodeVersion> </configuration> <executions> <execution> Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2017-09-12 10:33:07 UTC (rev 4422) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2017-09-12 14:39:41 UTC (rev 4423) @@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; +import org.hibernate.hikaricp.internal.HikariCPConnectionProvider; import org.nuiton.topia.migration.TopiaMigrationEngine; import org.nuiton.topia.migration.TopiaMigrationService; @@ -129,7 +130,8 @@ config.setProperty(Environment.DIALECT, H2Dialect.class.getName()); config.setProperty(Environment.DRIVER, org.h2.Driver.class.getName()); // correct error : org.hibernate.HibernateException: No CurrentSessionContext configured! - config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); + //config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); + config.setProperty(Environment.CONNECTION_PROVIDER, HikariCPConnectionProvider.class.getName()); //config.setProperty(Environment.SHOW_SQL, "true"); Modified: trunk/src/main/javascript/templates/web/region-web.html =================================================================== --- trunk/src/main/javascript/templates/web/region-web.html 2017-09-12 10:33:07 UTC (rev 4422) +++ trunk/src/main/javascript/templates/web/region-web.html 2017-09-12 14:39:41 UTC (rev 4423) @@ -1,3 +1,24 @@ +<!-- + #%L + ISIS-Fish + %% + Copyright (C) 1999 - 2017 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <!doctype html> <html> <head>