0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1286 Java 9 support

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-09-21 18:05:49 +09:00
parent 6f4558886e
commit 6b7f689c7e
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis/before_script.sh
View file

@ -7,7 +7,7 @@ tail $TMP_FILE
./fess-*/bin/fess 2>&1 > $TMP_FILE &
sleep 3
tail $TMP_FILE
tail ./fess-*/logs/*.log &
tail -f ./fess-*/logs/*.log &
counter=0
ret=1

37
pom.xml
View file

@ -54,9 +54,9 @@
<!-- Testing -->
<junit.version>4.12</junit.version>
<junit.jupiter.version>5.0.0-RC2</junit.jupiter.version>
<junit.vintage.version>${junit.version}.0-RC2</junit.vintage.version>
<junit.platform.version>1.0.0-RC2</junit.platform.version>
<junit.jupiter.version>5.0.0</junit.jupiter.version>
<junit.vintage.version>${junit.version}.0</junit.vintage.version>
<junit.platform.version>1.0.0</junit.platform.version>
<utflute.version>0.8.1</utflute.version>
<!-- Crawler -->
@ -103,6 +103,16 @@
<test.include.path>**/*Test.java</test.include.path>
</properties>
</profile>
<profile>
<id>build-jdk9</id>
<activation>
<jdk>9</jdk>
</activation>
<properties>
<test.include.path>**/*Test.java</test.include.path>
<test.command.args>--add-modules java.xml.bind</test.command.args>
</properties>
</profile>
<profile>
<id>integrationTests</id>
<properties>
@ -127,7 +137,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.7.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@ -149,7 +159,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<configuration>
<webResources>
<resource>
@ -159,9 +169,8 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<version>3.0.2</version>
<executions>
<execution>
<id>unpack-provided</id>
@ -186,6 +195,9 @@
<includes>
<include>${test.include.path}</include>
</includes>
<configuration>
<argLine>${test.command.args}</argLine>
</configuration>
</configuration>
<dependencies>
<dependency>
@ -207,7 +219,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>3.0.0-M1</version>
<configuration>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
@ -322,10 +334,9 @@
<goal>run</goal>
</goals>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
<executions>
<execution>
<id>copy-resources-deb</id>
@ -421,12 +432,10 @@
</execution>
</executions>
</plugin>
<!-- zip, tarball -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<version>3.1.0</version>
<configuration>
<finalName>${project.artifactId}-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
@ -446,7 +455,6 @@
</execution>
</executions>
</plugin>
<!-- deb -->
<plugin>
<groupId>org.vafer</groupId>
@ -691,7 +699,6 @@
</dataSet>
</configuration>
</plugin>
<!-- rpm -->
<plugin>
<groupId>org.codehaus.mojo</groupId>