Skip to content

Commit 8b1524a

Browse files
authored
Merge pull request #36 from cicsdev/aj-bom-issue
Use new 5.5 BOM which fixes jaxb issues
2 parents 52de4a4 + 1343df1 commit 8b1524a

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

bin

Lines changed: 0 additions & 1 deletion
This file was deleted.

cics-java-liberty-link-app/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@ repositories
3131
}
3232

3333
dependencies
34-
{
35-
compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:5.5-20200519131930-PH25409") // CICS TS V5.5 Maven BOM
36-
37-
// Don't include JCICS in the final build (no need for version because we have BOM)
34+
{
35+
36+
def bom = "com.ibm.cics:com.ibm.cics.ts.bom:5.5-20250812140737-PH63855"
37+
38+
compileOnly enforcedPlatform(bom)
39+
annotationProcessor enforcedPlatform(bom)
40+
3841
compileOnly("com.ibm.cics:com.ibm.cics.server")
42+
annotationProcessor("com.ibm.cics:com.ibm.cics.server.invocation")
3943
compileOnly("com.ibm.cics:com.ibm.cics.server.invocation.annotations")
40-
41-
// Use the V6 annotation processor as this supports Java 11
42-
annotationProcessor("com.ibm.cics:com.ibm.cics.server.invocation:6.1")
4344
}

cics-java-liberty-link-app/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@
3434
<artifactId>maven-compiler-plugin</artifactId>
3535
<version>3.12.1</version>
3636
<configuration>
37-
<!-- Enable the CICS Annotation Processor at V6.1 to support Java 11 builds-->
3837
<annotationProcessorPaths>
3938
<annotationProcessorPath>
4039
<groupId>com.ibm.cics</groupId>
41-
<artifactId>com.ibm.cics.server.invocation</artifactId>
42-
<version>6.1</version>
40+
<artifactId>com.ibm.cics.server.invocation</artifactId>
4341
</annotationProcessorPath>
4442
</annotationProcessorPaths>
4543
</configuration>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>com.ibm.cics</groupId>
2929
<artifactId>com.ibm.cics.ts.bom</artifactId>
30-
<version>5.5-20200519131930-PH25409</version>
30+
<version>5.5-20250812140737-PH63855</version>
3131
<type>pom</type>
3232
<scope>import</scope>
3333
</dependency>

0 commit comments

Comments
 (0)