Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-csv.git
This commit is contained in:
commit
1521cc285d
|
@ -22,6 +22,7 @@ script:
|
||||||
jdk:
|
jdk:
|
||||||
- openjdk7
|
- openjdk7
|
||||||
- oraclejdk8
|
- oraclejdk8
|
||||||
|
- oraclejdk9
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
- mvn -B -V -Ptravis-jacoco clean test jacoco:report coveralls:report
|
- mvn -B -V -Ptravis-jacoco clean test jacoco:report coveralls:report
|
||||||
|
|
16
pom.xml
16
pom.xml
|
@ -152,6 +152,9 @@ CSV files of various types.
|
||||||
<checkstyle.version>2.17</checkstyle.version>
|
<checkstyle.version>2.17</checkstyle.version>
|
||||||
<checkstyle.header.file>${basedir}/LICENSE-header.txt</checkstyle.header.file>
|
<checkstyle.header.file>${basedir}/LICENSE-header.txt</checkstyle.header.file>
|
||||||
<checkstyle.resourceExcludes>LICENSE.txt, NOTICE.txt</checkstyle.resourceExcludes>
|
<checkstyle.resourceExcludes>LICENSE.txt, NOTICE.txt</checkstyle.resourceExcludes>
|
||||||
|
|
||||||
|
<!-- Override jacoco version for java 9 compatibility -->
|
||||||
|
<commons.jacoco.version>0.7.9</commons.jacoco.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -512,6 +515,19 @@ CSV files of various types.
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>java9</id>
|
||||||
|
<activation>
|
||||||
|
<jdk>9</jdk>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<!-- versions below 3.0.0 do not work with java 9 -->
|
||||||
|
<commons.javadoc.version>3.0.0-M1</commons.javadoc.version>
|
||||||
|
<!-- coverall version 4.3.0 does not work with java 9, see https://github.com/trautonen/coveralls-maven-plugin/issues/112 -->
|
||||||
|
<coveralls.skip>true</coveralls.skip>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
Loading…
Reference in New Issue