Skip to content

Commit 3302921

Browse files
mp911demp911de
committed
Move build and compiler to Java 16.
Closes #606.
1 parent 53ee0fe commit 3302921

File tree

2 files changed

+31
-176
lines changed

2 files changed

+31
-176
lines changed

‎.travis.yml

+2-16
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,8 @@ os: linux
44

55
jobs:
66
include:
7-
- jdk: openjdk8
8-
env: JDK='OpenJDK 8'
9-
- jdk: openjdk11
10-
env: JDK='OpenJDK 11'
11-
- env: JDK='OpenJDK 12'
12-
before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 12
13-
- env: JDK='OpenJDK 13'
14-
before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 13
15-
- env: JDK='OpenJDK 14'
16-
before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 14
17-
- env: JDK='OpenJDK 15'
18-
before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 15
19-
- env: JDK='OpenJDK EA'
20-
before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh
21-
allow_failures:
22-
- env: JDK='OpenJDK EA'
7+
- env: JDK='OpenJDK 16'
8+
before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 16
239

2410
addons:
2511
apt:

‎pom.xml

+29-160
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
</modules>
3535

3636
<properties>
37+
<maven.compiler.source>16</maven.compiler.source>
38+
<maven.compiler.target>16</maven.compiler.target>
39+
<byte-buddy.version>1.11.0</byte-buddy.version>
3740
<apt.version>1.1.3</apt.version>
3841
<jvm.enable-preview></jvm.enable-preview>
3942
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -54,163 +57,6 @@
5457
</properties>
5558
</profile>
5659

57-
<profile>
58-
<id>java8</id>
59-
60-
<activation>
61-
<jdk>1.8</jdk>
62-
</activation>
63-
64-
<modules>
65-
66-
<!-- Embedded Cassandra (cassandra-all) is not compatible with Java runtime 9 and higher.
67-
See https://issues.apache.org/jira/browse/CASSANDRA-9608 -->
68-
<module>cassandra</module>
69-
</modules>
70-
</profile>
71-
72-
<profile>
73-
<id>java11</id>
74-
75-
<activation>
76-
<jdk>11</jdk>
77-
</activation>
78-
</profile>
79-
80-
<profile>
81-
<id>java-next</id>
82-
83-
<activation>
84-
<jdk>[9,)</jdk>
85-
</activation>
86-
87-
<dependencies>
88-
<dependency>
89-
<groupId>javax.xml.bind</groupId>
90-
<artifactId>jaxb-api</artifactId>
91-
</dependency>
92-
<dependency>
93-
<groupId>javax.annotation</groupId>
94-
<artifactId>javax.annotation-api</artifactId>
95-
</dependency>
96-
</dependencies>
97-
</profile>
98-
99-
<profile>
100-
<id>java-13+</id>
101-
102-
<activation>
103-
<jdk>[13,)</jdk>
104-
</activation>
105-
106-
<properties>
107-
<jvm.enable-preview>--enable-preview</jvm.enable-preview>
108-
</properties>
109-
110-
<build>
111-
<plugins>
112-
<plugin>
113-
<artifactId>maven-compiler-plugin</artifactId>
114-
<configuration>
115-
<release>13</release>
116-
<compilerArgs>
117-
${jvm.enable-preview}
118-
</compilerArgs>
119-
</configuration>
120-
</plugin>
121-
<plugin>
122-
<artifactId>maven-surefire-plugin</artifactId>
123-
<configuration>
124-
<argLine>${jvm.enable-preview}</argLine>
125-
</configuration>
126-
</plugin>
127-
<plugin>
128-
<artifactId>maven-failsafe-plugin</artifactId>
129-
<configuration>
130-
<argLine>${jvm.enable-preview}</argLine>
131-
</configuration>
132-
</plugin>
133-
134-
</plugins>
135-
</build>
136-
</profile>
137-
138-
<profile>
139-
<id>java-13</id>
140-
141-
<activation>
142-
<jdk>13</jdk>
143-
</activation>
144-
145-
<build>
146-
<plugins>
147-
<plugin>
148-
<artifactId>maven-compiler-plugin</artifactId>
149-
<configuration>
150-
<release>13</release>
151-
</configuration>
152-
</plugin>
153-
</plugins>
154-
</build>
155-
</profile>
156-
157-
<profile>
158-
<id>java-14</id>
159-
160-
<activation>
161-
<jdk>14</jdk>
162-
</activation>
163-
164-
<build>
165-
<plugins>
166-
<plugin>
167-
<artifactId>maven-compiler-plugin</artifactId>
168-
<configuration>
169-
<release>14</release>
170-
</configuration>
171-
</plugin>
172-
</plugins>
173-
</build>
174-
</profile>
175-
176-
<profile>
177-
<id>java-15</id>
178-
179-
<activation>
180-
<jdk>15</jdk>
181-
</activation>
182-
183-
<build>
184-
<plugins>
185-
<plugin>
186-
<artifactId>maven-compiler-plugin</artifactId>
187-
<configuration>
188-
<release>15</release>
189-
</configuration>
190-
</plugin>
191-
</plugins>
192-
</build>
193-
</profile>
194-
195-
<profile>
196-
<id>java-16</id>
197-
198-
<activation>
199-
<jdk>16</jdk>
200-
</activation>
201-
202-
<build>
203-
<plugins>
204-
<plugin>
205-
<artifactId>maven-compiler-plugin</artifactId>
206-
<configuration>
207-
<release>16</release>
208-
</configuration>
209-
</plugin>
210-
</plugins>
211-
</build>
212-
</profile>
213-
21460
</profiles>
21561

21662
<developers>
@@ -274,19 +120,42 @@
274120
<scope>test</scope>
275121
</dependency>
276122
<dependency>
277-
<groupId>org.junit.jupiter</groupId>
278-
<artifactId>junit-jupiter-engine</artifactId>
279-
<scope>test</scope>
123+
<groupId>org.junit.jupiter</groupId>
124+
<artifactId>junit-jupiter-engine</artifactId>
125+
<scope>test</scope>
280126
</dependency>
281127
<dependency>
282128
<groupId>org.junit.vintage</groupId>
283129
<artifactId>junit-vintage-engine</artifactId>
284130
<scope>test</scope>
285131
</dependency>
286132

133+
<!-- Java 9++ dependencies -->
134+
135+
<dependency>
136+
<groupId>javax.xml.bind</groupId>
137+
<artifactId>jaxb-api</artifactId>
138+
</dependency>
139+
<dependency>
140+
<groupId>javax.annotation</groupId>
141+
<artifactId>javax.annotation-api</artifactId>
142+
</dependency>
287143

288144
</dependencies>
289145

146+
<build>
147+
<plugins>
148+
<plugin>
149+
<groupId>org.apache.maven.plugins</groupId>
150+
<artifactId>maven-compiler-plugin</artifactId>
151+
<configuration>
152+
<release>16</release>
153+
<parameters>true</parameters>
154+
</configuration>
155+
</plugin>
156+
</plugins>
157+
</build>
158+
290159
<repositories>
291160
<repository>
292161
<id>central</id>

0 commit comments

Comments
 (0)