Skip to content

Commit a66b876

Browse files
mp911demp911de
committed
#555 - Upgrade Java versions.
Add build profile for Java 14. Allow failures for Java 15 as we carry dependencies that do not support newer class files. Enable preview features for Java 13-15. Add javax.annotation to Java 9+ profile. Disable geode examples on Java 13+ as test utilities do not propagate feature preview flag until spring-projects/spring-test-data-geode#18 is resolved.
1 parent 54f7146 commit a66b876

File tree

2 files changed

+124
-8
lines changed

2 files changed

+124
-8
lines changed

‎.travis.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
language: java
22

3-
matrix:
3+
os: linux
4+
5+
jobs:
46
include:
57
- jdk: openjdk8
68
env: JDK='OpenJDK 8'
7-
- env: JDK='OpenJDK 11'
8-
before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 11
9+
- jdk: openjdk11
10+
env: JDK='OpenJDK 11'
911
- env: JDK='OpenJDK 12'
1012
before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 12
1113
- env: JDK='OpenJDK 13'
1214
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
1317
- env: JDK='OpenJDK EA'
1418
before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh
19+
allow_failures:
20+
- env: JDK='OpenJDK EA'
1521

1622
addons:
1723
apt:
@@ -22,8 +28,7 @@ addons:
2228
- couchbase-server-community
2329

2430
services:
25-
- couchbase-server
26-
- redis-server
31+
- redis
2732
- docker
2833

2934
cache:

‎pom.xml

Lines changed: 114 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<groupId>org.springframework.data.examples</groupId>
@@ -19,7 +20,6 @@
1920
<module>bom</module>
2021
<module>couchbase</module>
2122
<module>elasticsearch</module>
22-
<module>geode</module>
2323
<module>jdbc</module>
2424
<module>jpa</module>
2525
<module>ldap</module>
@@ -69,6 +69,22 @@
6969
<!-- Embedded Cassandra (cassandra-all) is not compatible with Java runtime 9 and higher.
7070
See https://issues.apache.org/jira/browse/CASSANDRA-9608 -->
7171
<module>cassandra</module>
72+
<module>geode</module>
73+
</modules>
74+
</profile>
75+
76+
<profile>
77+
<id>java11</id>
78+
79+
<activation>
80+
<jdk>11</jdk>
81+
</activation>
82+
83+
<modules>
84+
85+
<!-- Embedded Cassandra (cassandra-all) is not compatible with Java runtime 9 and higher.
86+
See https://issues.apache.org/jira/browse/CASSANDRA-9608 -->
87+
<module>geode</module>
7288
</modules>
7389
</profile>
7490

@@ -84,9 +100,104 @@
84100
<groupId>javax.xml.bind</groupId>
85101
<artifactId>jaxb-api</artifactId>
86102
</dependency>
103+
<dependency>
104+
<groupId>javax.annotation</groupId>
105+
<artifactId>javax.annotation-api</artifactId>
106+
</dependency>
87107
</dependencies>
88108
</profile>
89109

110+
<profile>
111+
<id>java-13+</id>
112+
113+
<activation>
114+
<jdk>[13,)</jdk>
115+
</activation>
116+
117+
<build>
118+
<plugins>
119+
<plugin>
120+
<artifactId>maven-surefire-plugin</artifactId>
121+
<configuration>
122+
<argLine>--enable-preview</argLine>
123+
</configuration>
124+
</plugin>
125+
<plugin>
126+
<artifactId>maven-failsafe-plugin</artifactId>
127+
<configuration>
128+
<argLine>--enable-preview</argLine>
129+
</configuration>
130+
</plugin>
131+
</plugins>
132+
</build>
133+
</profile>
134+
135+
<profile>
136+
<id>java-13</id>
137+
138+
<activation>
139+
<jdk>13</jdk>
140+
</activation>
141+
142+
<build>
143+
<plugins>
144+
<plugin>
145+
<artifactId>maven-compiler-plugin</artifactId>
146+
<configuration>
147+
<release>13</release>
148+
<compilerArgs>
149+
--enable-preview
150+
</compilerArgs>
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+
<compilerArgs>
171+
--enable-preview
172+
</compilerArgs>
173+
</configuration>
174+
</plugin>
175+
</plugins>
176+
</build>
177+
</profile>
178+
179+
<profile>
180+
<id>java-15</id>
181+
182+
<activation>
183+
<jdk>15</jdk>
184+
</activation>
185+
186+
<build>
187+
<plugins>
188+
<plugin>
189+
<artifactId>maven-compiler-plugin</artifactId>
190+
<configuration>
191+
<release>15</release>
192+
<compilerArgs>
193+
--enable-preview
194+
</compilerArgs>
195+
</configuration>
196+
</plugin>
197+
</plugins>
198+
</build>
199+
</profile>
200+
90201
</profiles>
91202

92203
<developers>

0 commit comments

Comments
 (0)