Skip to content

Commit

Permalink
Merge pull request #1 from wassong-iphc/upgradeToJava8Gasw3
Browse files Browse the repository at this point in the history
Upgrade to java8 gasw3
  • Loading branch information
axlbonnet authored Sep 24, 2018
2 parents 1c942ab + 603b8d6 commit 895e864
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 30 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target
58 changes: 28 additions & 30 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,39 +1,35 @@

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>fr.insalyon.creatis</groupId>
<artifactId>gasw-h2-plugin</artifactId>
<version>1.0</version>
<version>3.0</version>
<packaging>jar</packaging>

<name>GASW-H2-Plugin</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<licenses>
<license>
<name>CeCILL-B, Version 1.0</name>
<url>http://www.cecill.info/</url>
<distribution>repo</distribution>
</license>
</licenses>

<organization>
<name>CREATIS</name>
<url>http://www.creatis.insa-lyon.fr/</url>
</organization>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down Expand Up @@ -63,45 +59,47 @@
</plugin>
</plugins>
</build>

<dependencies>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>


<dependency>
<groupId>fr.insalyon.creatis</groupId>
<artifactId>gasw</artifactId>
<version>1.0</version>
<version>3.0</version>
<scope>provided</scope>
</dependency>


<!--
Version 1.4.197 does not work. It is built with
multi-release, meaning there exists a class compiled for
java 9 that the JRE does not load by default in Java 8.
BUT a custom class loader seems to be used, in library
jspf.core, which does not support this feature.
So we stick to version 1.4.196.
-->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.166</version>
<version>1.4.196</version>
</dependency>

</dependencies>

<distributionManagement>

<repository>
<id>creatis-releases</id>
<name>Creatis Insa Lyon repository [creatis]</name>
<url>http://vip.creatis.insa-lyon.fr:9007/nexus/content/repositories/releases</url>
</repository>

<snapshotRepository>
<id>creatis-snapshots</id>
<name>Creatis Insa Lyon repository [snapshots]</name>
<url>http://vip.creatis.insa-lyon.fr:9007/nexus/content/repositories/snapshots</url>
</snapshotRepository>

</distributionManagement>

</project>

0 comments on commit 895e864

Please sign in to comment.