diff --git a/.travis/before_script.sh b/.travis/before_script.sh index faacde2fa8c7124df62a59d0be8ec9ffe158e6e3..e37fdc3b0d5b041f2f012c12ca077c0e5ac72891 100644 --- a/.travis/before_script.sh +++ b/.travis/before_script.sh @@ -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 diff --git a/pom.xml b/pom.xml index 55c9c87a36526cfe9304076cff62ebf7e95df113..e7a670cd69f117726580fcbce8014f282b118da0 100644 --- a/pom.xml +++ b/pom.xml @@ -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>