Skip to content

Commit 6faec99

Browse files
lbromaniluwatar
lbroman
authored and
iluwatar
committed
Bump java language to 11 (iluwatar#980)
* Moved java XML and annotations dependencies to project level instead of as profiles * Set compiler language level to 11 * Removed jdk8 from travis build * Kept java level 8 in naked-objects/dom for datanucleus enhancer, for now.
1 parent e36bbbb commit 6faec99

9 files changed

Lines changed: 75 additions & 138 deletions

File tree

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: java
22
dist: xenial
33
jdk:
4-
- openjdk8
54
- openjdk11
65

76
env:

‎cqrs/pom.xml‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,18 @@
3838
<groupId>org.hibernate</groupId>
3939
<artifactId>hibernate-core</artifactId>
4040
</dependency>
41+
<dependency>
42+
<groupId>com.sun.xml.bind</groupId>
43+
<artifactId>jaxb-impl</artifactId>
44+
<scope>test</scope>
45+
<version>2.1.17</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>javax.xml.bind</groupId>
49+
<artifactId>jaxb-api</artifactId>
50+
<scope>test</scope>
51+
</dependency>
52+
4153
</dependencies>
42-
<profiles>
43-
<profile>
44-
<id>jdk11-deps</id>
45-
<activation>
46-
<jdk>[11,)</jdk>
47-
</activation>
48-
<dependencies>
49-
<dependency>
50-
<groupId>com.sun.xml.bind</groupId>
51-
<artifactId>jaxb-impl</artifactId>
52-
<scope>test</scope>
53-
<version>2.1.17</version>
54-
</dependency>
55-
<dependency>
56-
<groupId>javax.xml.bind</groupId>
57-
<artifactId>jaxb-api</artifactId>
58-
<scope>test</scope>
59-
</dependency>
60-
</dependencies>
61-
</profile>
62-
</profiles>
54+
6355
</project>

‎eip-aggregator/pom.xml‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@
4747
<version>${camel.version}</version>
4848
</dependency>
4949

50+
<dependency>
51+
<groupId>com.sun.xml.bind</groupId>
52+
<artifactId>jaxb-impl</artifactId>
53+
</dependency>
54+
<dependency>
55+
<groupId>javax.xml.bind</groupId>
56+
<artifactId>jaxb-api</artifactId>
57+
</dependency>
58+
5059
<!-- Testing -->
5160
<dependency>
5261
<groupId>com.github.sbrannen</groupId>
@@ -71,23 +80,4 @@
7180

7281
</dependencies>
7382

74-
<profiles>
75-
<profile>
76-
<id>jdk11-deps</id>
77-
<activation>
78-
<jdk>[11,)</jdk>
79-
</activation>
80-
<dependencies>
81-
<dependency>
82-
<groupId>com.sun.xml.bind</groupId>
83-
<artifactId>jaxb-impl</artifactId>
84-
</dependency>
85-
<dependency>
86-
<groupId>javax.xml.bind</groupId>
87-
<artifactId>jaxb-api</artifactId>
88-
</dependency>
89-
</dependencies>
90-
</profile>
91-
</profiles>
92-
9383
</project>

‎eip-splitter/pom.xml‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@
4747
<version>${camel.version}</version>
4848
</dependency>
4949

50+
<dependency>
51+
<groupId>com.sun.xml.bind</groupId>
52+
<artifactId>jaxb-impl</artifactId>
53+
</dependency>
54+
<dependency>
55+
<groupId>javax.xml.bind</groupId>
56+
<artifactId>jaxb-api</artifactId>
57+
</dependency>
58+
59+
5060
<!-- Testing -->
5161
<dependency>
5262
<groupId>com.github.sbrannen</groupId>
@@ -71,24 +81,4 @@
7181

7282
</dependencies>
7383

74-
<profiles>
75-
<profile>
76-
<id>jdk11-deps</id>
77-
<activation>
78-
<jdk>[11,)</jdk>
79-
</activation>
80-
<dependencies>
81-
<dependency>
82-
<groupId>com.sun.xml.bind</groupId>
83-
<artifactId>jaxb-impl</artifactId>
84-
</dependency>
85-
<dependency>
86-
<groupId>javax.xml.bind</groupId>
87-
<artifactId>jaxb-api</artifactId>
88-
</dependency>
89-
</dependencies>
90-
</profile>
91-
</profiles>
92-
93-
9484
</project>

‎eip-wire-tap/pom.xml‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@
4747
<version>${camel.version}</version>
4848
</dependency>
4949

50+
<dependency>
51+
<groupId>com.sun.xml.bind</groupId>
52+
<artifactId>jaxb-impl</artifactId>
53+
</dependency>
54+
<dependency>
55+
<groupId>javax.xml.bind</groupId>
56+
<artifactId>jaxb-api</artifactId>
57+
</dependency>
58+
59+
5060
<!-- Testing -->
5161
<dependency>
5262
<groupId>com.github.sbrannen</groupId>
@@ -71,22 +81,4 @@
7181

7282
</dependencies>
7383

74-
<profiles>
75-
<profile>
76-
<id>jdk11-deps</id>
77-
<activation>
78-
<jdk>[11,)</jdk>
79-
</activation>
80-
<dependencies>
81-
<dependency>
82-
<groupId>com.sun.xml.bind</groupId>
83-
<artifactId>jaxb-impl</artifactId>
84-
</dependency>
85-
<dependency>
86-
<groupId>javax.xml.bind</groupId>
87-
<artifactId>jaxb-api</artifactId>
88-
</dependency>
89-
</dependencies>
90-
</profile>
91-
</profiles>
9284
</project>

‎naked-objects/dom/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,17 @@
3636
</excludes>
3737
</resource>
3838
</resources>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.apache.maven.plugins</groupId>
42+
<artifactId>maven-compiler-plugin</artifactId>
43+
<version>${compiler.version}</version>
44+
<configuration>
45+
<source>8</source>
46+
<target>8</target>
47+
</configuration>
48+
</plugin>
49+
</plugins>
3950
</build>
4051

4152
<dependencies>

‎naked-objects/integtests/pom.xml‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@
9090
<artifactId>hsqldb</artifactId>
9191
</dependency>
9292

93+
<dependency>
94+
<groupId>javax.annotation</groupId>
95+
<artifactId>javax.annotation-api</artifactId>
96+
</dependency>
97+
9398
<!--
9499
uncomment to enable enhanced cucumber-jvm reporting
95100
http://www.masterthought.net/section/cucumber-reporting
@@ -122,20 +127,5 @@
122127
</repository>
123128
</repositories>
124129
-->
125-
<profiles>
126-
<profile>
127-
<id>jdk11-deps</id>
128-
<activation>
129-
<jdk>[11,)</jdk>
130-
</activation>
131-
<dependencies>
132-
<dependency>
133-
<groupId>javax.annotation</groupId>
134-
<artifactId>javax.annotation-api</artifactId>
135-
</dependency>
136-
</dependencies>
137-
</profile>
138-
</profiles>
139-
140130

141131
</project>

‎pom.xml‎

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<log4j.version>1.2.17</log4j.version>
5959
<jaxb-api.version>2.3.1</jaxb-api.version>
6060
<jaxb-impl.version>2.3.2</jaxb-impl.version>
61-
<annotation-api.version>1.3.1</annotation-api.version>
61+
<annotation-api.version>1.3.2</annotation-api.version>
6262
</properties>
6363
<modules>
6464
<module>abstract-factory</module>
@@ -320,6 +320,11 @@
320320
<artifactId>jaxb-impl</artifactId>
321321
<version>${jaxb-impl.version}</version>
322322
</dependency>
323+
<dependency>
324+
<groupId>org.javassist</groupId>
325+
<artifactId>javassist</artifactId>
326+
<version>3.25.0-GA</version>
327+
</dependency>
323328
</dependencies>
324329
</dependencyManagement>
325330

@@ -380,8 +385,8 @@
380385
<artifactId>maven-compiler-plugin</artifactId>
381386
<version>${compiler.version}</version>
382387
<configuration>
383-
<source>1.8</source>
384-
<target>1.8</target>
388+
<source>11</source>
389+
<target>11</target>
385390
</configuration>
386391
</plugin>
387392
<plugin>
@@ -500,27 +505,4 @@
500505
</plugins>
501506
</reporting>
502507

503-
<profiles>
504-
<profile>
505-
<id>jdk11-dep-management</id>
506-
<activation>
507-
<jdk>[11,)</jdk>
508-
</activation>
509-
<dependencyManagement>
510-
<dependencies>
511-
<dependency>
512-
<groupId>org.javassist</groupId>
513-
<artifactId>javassist</artifactId>
514-
<version>3.25.0-GA</version>
515-
</dependency>
516-
<dependency>
517-
<groupId>javax.annotation</groupId>
518-
<artifactId>javax.annotation-api</artifactId>
519-
<version>1.3.2</version>
520-
</dependency>
521-
</dependencies>
522-
</dependencyManagement>
523-
</profile>
524-
</profiles>
525-
526508
</project>

‎service-layer/pom.xml‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@
4141
<groupId>com.h2database</groupId>
4242
<artifactId>h2</artifactId>
4343
</dependency>
44+
<dependency>
45+
<groupId>com.sun.xml.bind</groupId>
46+
<artifactId>jaxb-impl</artifactId>
47+
</dependency>
48+
<dependency>
49+
<groupId>javax.xml.bind</groupId>
50+
<artifactId>jaxb-api</artifactId>
51+
</dependency>
4452
<dependency>
4553
<groupId>org.junit.jupiter</groupId>
4654
<artifactId>junit-jupiter-engine</artifactId>
@@ -52,22 +60,5 @@
5260
<scope>test</scope>
5361
</dependency>
5462
</dependencies>
55-
<profiles>
56-
<profile>
57-
<id>jdk11-deps</id>
58-
<activation>
59-
<jdk>[11,)</jdk>
60-
</activation>
61-
<dependencies>
62-
<dependency>
63-
<groupId>com.sun.xml.bind</groupId>
64-
<artifactId>jaxb-impl</artifactId>
65-
</dependency>
66-
<dependency>
67-
<groupId>javax.xml.bind</groupId>
68-
<artifactId>jaxb-api</artifactId>
69-
</dependency>
70-
</dependencies>
71-
</profile>
72-
</profiles>
63+
7364
</project>

0 commit comments

Comments
 (0)