Skip to content

Commit 64de149

Browse files
mpkorstanjempkorstanje
committed
[Build] Build with OpenJdk 11
1 parent 0983955 commit 64de149

File tree

4 files changed

+163
-148
lines changed

4 files changed

+163
-148
lines changed

‎.m2/travis-ci-toolchains.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF8"?>
2+
<toolchains>
3+
<toolchain>
4+
<type>jdk</type>
5+
<provides>
6+
<version>11</version>
7+
<vendor>openjdk</vendor>
8+
</provides>
9+
<configuration>
10+
<jdkHome>/usr/local/lib/jvm/openjdk11</jdkHome>
11+
</configuration>
12+
</toolchain>
13+
</toolchains>

‎.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ jobs:
99
include:
1010
- stage: test
1111
scala: 2.11
12-
script: mvn test -pl scala/scala_2.11 -B
13-
jdk: openjdk8
12+
script: mvn test -pl scala/scala_2.11 -B --toolchains .m2/travis-ci-toolchains.xml
13+
jdk: openjdk11
1414
- stage: test
1515
scala: 2.12
16-
script: mvn test -pl scala/scala_2.12,examples -B
17-
jdk: openjdk8
16+
script: mvn test -pl scala/scala_2.12,examples -B --toolchains .m2/travis-ci-toolchains.xml
17+
jdk: openjdk11
1818
- stage: test
1919
scala: 2.13
20-
script: mvn test -pl scala/scala_2.13,examples -B
21-
jdk: openjdk8
20+
script: mvn test -pl scala/scala_2.13,examples -B --toolchains .m2/travis-ci-toolchains.xml
21+
jdk: openjdk11
2222
branches:
2323
only:
2424
- master

‎pom.xml

Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
3-
<groupId>io.cucumber</groupId>
44
<artifactId>cucumber-jvm-scala</artifactId>
55
<version>5.6.0-SNAPSHOT</version>
66
<packaging>pom</packaging>
@@ -11,34 +11,27 @@
1111
<parent>
1212
<groupId>io.cucumber</groupId>
1313
<artifactId>cucumber-parent</artifactId>
14-
<version>1.0.2</version>
14+
<version>2.1.0</version>
1515
</parent>
1616

17-
<developers>
18-
<developer>
19-
<id>glib-briia</id>
20-
<name>Glib Briia</name>
21-
<email>[email protected]</email>
22-
<organization>AssertThat</organization>
23-
<organizationUrl>https://www.assertthat.com</organizationUrl>
24-
</developer>
25-
</developers>
26-
2717
<properties>
2818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2919
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20+
<project.Automatic-Module-Name>io.cucumber.scala</project.Automatic-Module-Name>
3021
<minimum.maven.version>3.3</minimum.maven.version>
3122
<outputDirectory>${project.build.directory}</outputDirectory>
3223
<scala-maven-plugin.version>3.4.6</scala-maven-plugin.version>
3324
<cucumber.version>5.6.0</cucumber.version>
3425
<gherkin.version>9.2.0</gherkin.version>
3526
<groovy.version>2.4.19</groovy.version>
3627
<jackson-databind.version>2.10.3</jackson-databind.version>
37-
<junit.version>4.12</junit.version>
28+
<junit.version>4.13</junit.version>
3829
<scala.2.11.version>2.11.12</scala.2.11.version>
3930
<scala.2.12.version>2.12.11</scala.2.12.version>
40-
<scala.2.13.version>2.13.1</scala.2.13.version>
31+
<scala.2.13.version>2.13.1</scala.2.13.version>
4132
<mockito-scala.version>1.13.9</mockito-scala.version>
33+
<toolchain.vendor>openjdk</toolchain.vendor>
34+
<toolchain.java.version>8</toolchain.java.version>
4235
</properties>
4336

4437
<scm>
@@ -91,12 +84,6 @@
9184
<version>${junit.version}</version>
9285
<scope>test</scope>
9386
</dependency>
94-
<dependency>
95-
<groupId>com.fasterxml.jackson.core</groupId>
96-
<artifactId>jackson-databind</artifactId>
97-
<version>${jackson-databind.version}</version>
98-
<scope>test</scope>
99-
</dependency>
10087
</dependencies>
10188
</dependencyManagement>
10289

@@ -133,7 +120,7 @@
133120
<instrumentation>
134121
<ignoreTrivial>true</ignoreTrivial>
135122
</instrumentation>
136-
<check />
123+
<check/>
137124
</configuration>
138125
</plugin>
139126
<plugin>
@@ -142,9 +129,12 @@
142129
<version>4.3.0</version>
143130
<configuration>
144131
<sourceDirectories>
145-
<sourceDirectory>${basedir}/scala/scala_2.11/target/generated-sources/i18n</sourceDirectory>
146-
<sourceDirectory>${basedir}/scala/scala_2.12/target/generated-sources/i18n</sourceDirectory>
147-
<sourceDirectory>${basedir}/scala/scala_2.13/target/generated-sources/i18n</sourceDirectory>
132+
<sourceDirectory>${basedir}/scala/scala_2.11/target/generated-sources/i18n
133+
</sourceDirectory>
134+
<sourceDirectory>${basedir}/scala/scala_2.12/target/generated-sources/i18n
135+
</sourceDirectory>
136+
<sourceDirectory>${basedir}/scala/scala_2.13/target/generated-sources/i18n
137+
</sourceDirectory>
148138
</sourceDirectories>
149139
</configuration>
150140
</plugin>
@@ -155,6 +145,29 @@
155145
</profiles>
156146

157147
<build>
148+
<plugins>
149+
<plugin>
150+
<groupId>org.apache.maven.plugins</groupId>
151+
<artifactId>maven-toolchains-plugin</artifactId>
152+
<version>3.0.0</version>
153+
<executions>
154+
<execution>
155+
<goals>
156+
<goal>toolchain</goal>
157+
</goals>
158+
</execution>
159+
</executions>
160+
<configuration>
161+
<toolchains>
162+
<jdk>
163+
<version>${toolchain.java.version}</version>
164+
<vendor>${toolchain.vendor}</vendor>
165+
</jdk>
166+
</toolchains>
167+
</configuration>
168+
</plugin>
169+
</plugins>
170+
158171
<pluginManagement>
159172
<plugins>
160173
<plugin>

‎scala/pom.xml

Lines changed: 106 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,106 @@
1-
<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">
2-
<modelVersion>4.0.0</modelVersion>
3-
4-
<parent>
5-
<groupId>io.cucumber</groupId>
6-
<artifactId>cucumber-jvm-scala</artifactId>
7-
<version>5.6.0-SNAPSHOT</version>
8-
</parent>
9-
10-
<artifactId>cucumber-scala-aggregator</artifactId>
11-
<packaging>pom</packaging>
12-
<name>Cucumber-JVM: Scala Aggregator</name>
13-
14-
<modules>
15-
<module>scala_2.11</module>
16-
<module>scala_2.12</module>
17-
</modules>
18-
19-
<profiles>
20-
<profile>
21-
<id>java8</id>
22-
<activation>
23-
<jdk>1.8</jdk>
24-
</activation>
25-
<modules>
26-
<module>scala_2.13</module>
27-
</modules>
28-
</profile>
29-
</profiles>
30-
31-
<dependencies>
32-
<dependency>
33-
<groupId>io.cucumber</groupId>
34-
<artifactId>cucumber-core</artifactId>
35-
</dependency>
36-
<dependency>
37-
<groupId>com.fasterxml.jackson.core</groupId>
38-
<artifactId>jackson-databind</artifactId>
39-
<scope>provided</scope>
40-
</dependency>
41-
<dependency>
42-
<groupId>io.cucumber</groupId>
43-
<artifactId>cucumber-junit</artifactId>
44-
<scope>test</scope>
45-
</dependency>
46-
<dependency>
47-
<groupId>junit</groupId>
48-
<artifactId>junit</artifactId>
49-
<scope>test</scope>
50-
</dependency>
51-
</dependencies>
52-
53-
<build>
54-
<pluginManagement>
55-
<plugins>
56-
<plugin>
57-
<groupId>net.alchim31.maven</groupId>
58-
<artifactId>scala-maven-plugin</artifactId>
59-
<version>${scala-maven-plugin.version}</version>
60-
<configuration>
61-
<args>
62-
<arg>-feature</arg>
63-
<arg>-deprecation</arg>
64-
</args>
65-
<excludes>
66-
<exclude>**/*.java</exclude>
67-
</excludes>
68-
</configuration>
69-
<executions>
70-
<execution>
71-
<id>regular-source-compilation</id>
72-
<goals>
73-
<goal>add-source</goal>
74-
<goal>compile</goal>
75-
<goal>testCompile</goal>
76-
</goals>
77-
</execution>
78-
<execution>
79-
<goals>
80-
<goal>add-source</goal>
81-
</goals>
82-
<configuration>
83-
<sourceDir>${basedir}/target/generated-sources/i18n</sourceDir>
84-
</configuration>
85-
</execution>
86-
<execution>
87-
<id>attach-javadocs</id>
88-
<goals>
89-
<goal>doc-jar</goal>
90-
</goals>
91-
</execution>
92-
</executions>
93-
</plugin>
94-
95-
<plugin>
96-
<groupId>org.apache.maven.plugins</groupId>
97-
<artifactId>maven-antrun-plugin</artifactId>
98-
<executions>
99-
<execution>
100-
<id>generate-i18n-sources</id>
101-
<goals>
102-
<goal>run</goal>
103-
</goals>
104-
<phase>generate-sources</phase>
105-
<configuration>
106-
<target>
107-
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="maven.plugin.classpath" />
108-
<groovy src="../sources/src/main/groovy/generate-i18n-dsl.groovy" />
109-
</target>
110-
</configuration>
111-
</execution>
112-
</executions>
113-
</plugin>
114-
</plugins>
115-
</pluginManagement>
116-
</build>
117-
</project>
1+
<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">
2+
<modelVersion>4.0.0</modelVersion>
3+
4+
<parent>
5+
<groupId>io.cucumber</groupId>
6+
<artifactId>cucumber-jvm-scala</artifactId>
7+
<version>5.6.0-SNAPSHOT</version>
8+
</parent>
9+
10+
<artifactId>cucumber-scala-aggregator</artifactId>
11+
<packaging>pom</packaging>
12+
<name>Cucumber-JVM: Scala Aggregator</name>
13+
14+
<modules>
15+
<module>scala_2.11</module>
16+
<module>scala_2.12</module>
17+
<module>scala_2.13</module>
18+
</modules>
19+
20+
<dependencies>
21+
<dependency>
22+
<groupId>io.cucumber</groupId>
23+
<artifactId>cucumber-core</artifactId>
24+
</dependency>
25+
<dependency>
26+
<groupId>com.fasterxml.jackson.core</groupId>
27+
<artifactId>jackson-databind</artifactId>
28+
<scope>provided</scope>
29+
</dependency>
30+
<dependency>
31+
<groupId>io.cucumber</groupId>
32+
<artifactId>cucumber-junit</artifactId>
33+
<scope>test</scope>
34+
</dependency>
35+
<dependency>
36+
<groupId>junit</groupId>
37+
<artifactId>junit</artifactId>
38+
<scope>test</scope>
39+
</dependency>
40+
</dependencies>
41+
42+
<build>
43+
<pluginManagement>
44+
<plugins>
45+
<plugin>
46+
<groupId>net.alchim31.maven</groupId>
47+
<artifactId>scala-maven-plugin</artifactId>
48+
<version>${scala-maven-plugin.version}</version>
49+
<configuration>
50+
<args>
51+
<arg>-feature</arg>
52+
<arg>-deprecation</arg>
53+
</args>
54+
<excludes>
55+
<exclude>**/*.java</exclude>
56+
</excludes>
57+
</configuration>
58+
<executions>
59+
<execution>
60+
<id>regular-source-compilation</id>
61+
<goals>
62+
<goal>add-source</goal>
63+
<goal>compile</goal>
64+
<goal>testCompile</goal>
65+
</goals>
66+
</execution>
67+
<execution>
68+
<goals>
69+
<goal>add-source</goal>
70+
</goals>
71+
<configuration>
72+
<sourceDir>${basedir}/target/generated-sources/i18n</sourceDir>
73+
</configuration>
74+
</execution>
75+
<execution>
76+
<id>attach-javadocs</id>
77+
<goals>
78+
<goal>doc-jar</goal>
79+
</goals>
80+
</execution>
81+
</executions>
82+
</plugin>
83+
84+
<plugin>
85+
<groupId>org.apache.maven.plugins</groupId>
86+
<artifactId>maven-antrun-plugin</artifactId>
87+
<executions>
88+
<execution>
89+
<id>generate-i18n-sources</id>
90+
<goals>
91+
<goal>run</goal>
92+
</goals>
93+
<phase>generate-sources</phase>
94+
<configuration>
95+
<target>
96+
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="maven.plugin.classpath" />
97+
<groovy src="../sources/src/main/groovy/generate-i18n-dsl.groovy" />
98+
</target>
99+
</configuration>
100+
</execution>
101+
</executions>
102+
</plugin>
103+
</plugins>
104+
</pluginManagement>
105+
</build>
106+
</project>

0 commit comments

Comments
 (0)