Skip to content

Commit e36bbbb

Browse files
lbromaniluwatar
lbroman
authored and
iluwatar
committed
Maven profiles to support jdk 11 builds. iluwatar#948 (iluwatar#975)
* Maven profiles to support jdk 11 builds. iluwatar#948 Added maven profiles activated by jdk 11, wich will not break java 8 support. Bumped lombok and datanucleus enhancer as the old versions dont work with 11. * Fixed PMD issue when building naked-objects * Fixed the eip modules with xml dependencies. Previous dependency relaxing commit causes xml libs to go missing from some modules that actually needed them
1 parent 71f26c3 commit e36bbbb

10 files changed

Lines changed: 169 additions & 3 deletions

File tree

‎cqrs/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,25 @@
3939
<artifactId>hibernate-core</artifactId>
4040
</dependency>
4141
</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>
4263
</project>

‎eip-aggregator/pom.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,24 @@
7070
</dependency>
7171

7272
</dependencies>
73+
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+
7393
</project>

‎eip-splitter/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,25 @@
7070
</dependency>
7171

7272
</dependencies>
73+
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+
7394
</project>

‎eip-wire-tap/pom.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,23 @@
7070
</dependency>
7171

7272
</dependencies>
73+
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>
7392
</project>

‎naked-objects/dom/exclude-pmd.properties‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#
2+
# The MIT License
3+
# Copyright (c) 2014-2016 Ilkka Seppälä
4+
#
5+
# Permission is hereby granted, free of charge, to any person obtaining a copy
6+
# of this software and associated documentation files (the "Software"), to deal
7+
# in the Software without restriction, including without limitation the rights
8+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
# copies of the Software, and to permit persons to whom the Software is
10+
# furnished to do so, subject to the following conditions:
11+
#
12+
# The above copyright notice and this permission notice shall be included in
13+
# all copies or substantial portions of the Software.
14+
#
15+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
# THE SOFTWARE.
22+
#
23+
24+
domainapp.dom.modules.simple.QSimpleObject=UnusedFormalParameter

‎naked-objects/dom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<activeByDefault>true</activeByDefault>
7979
</activation>
8080
<properties>
81-
<datanucleus-maven-plugin.version>4.0.1</datanucleus-maven-plugin.version>
81+
<datanucleus-maven-plugin.version>5.2.1</datanucleus-maven-plugin.version>
8282
</properties>
8383
<build>
8484
<pluginManagement>

‎naked-objects/integtests/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,20 @@
122122
</repository>
123123
</repositories>
124124
-->
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>
125139

126140

127141
</project>

‎pom.xml‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
<jackson.version>2.8.5</jackson.version>
5757
<pmd.version>3.12.0</pmd.version>
5858
<log4j.version>1.2.17</log4j.version>
59-
<jaxb-api.version>2.3.0</jaxb-api.version>
59+
<jaxb-api.version>2.3.1</jaxb-api.version>
60+
<jaxb-impl.version>2.3.2</jaxb-impl.version>
6061
<annotation-api.version>1.3.1</annotation-api.version>
6162
</properties>
6263
<modules>
@@ -314,6 +315,11 @@
314315
<artifactId>javax.annotation-api</artifactId>
315316
<version>${annotation-api.version}</version>
316317
</dependency>
318+
<dependency>
319+
<groupId>com.sun.xml.bind</groupId>
320+
<artifactId>jaxb-impl</artifactId>
321+
<version>${jaxb-impl.version}</version>
322+
</dependency>
317323
</dependencies>
318324
</dependencyManagement>
319325

@@ -494,4 +500,27 @@
494500
</plugins>
495501
</reporting>
496502

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+
497526
</project>

‎service-layer/pom.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,22 @@
5252
<scope>test</scope>
5353
</dependency>
5454
</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>
5573
</project>

‎trampoline/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>org.projectlombok</groupId>
5353
<artifactId>lombok</artifactId>
54-
<version>1.16.18</version>
54+
<version>1.18.10</version>
5555
</dependency>
5656

5757

0 commit comments

Comments
 (0)