Skip to content

Commit 4790f85

Browse files
committed
Updated files
1 parent 61c2b29 commit 4790f85

5 files changed

Lines changed: 43 additions & 8 deletions

File tree

.github/workflows/build.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
java-version: ${{ matrix.jdk }}
6161
distribution: "semeru"
6262
- name: Build with Maven Wrapper
63-
run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} verify
64-
63+
run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} package
64+
6565
build-gradle:
6666
name: Build Gradle
6767

@@ -84,8 +84,8 @@ jobs:
8484
run: gradle build -Pjava_version=${{ matrix.jdk }}
8585

8686
build-gradlew:
87-
name: Build Gradle Wrapper
88-
87+
name: Build Gradle wrapper
88+
8989
runs-on: ubuntu-latest
9090
strategy:
9191
matrix:
@@ -98,4 +98,4 @@ jobs:
9898
java-version: ${{ matrix.jdk }}
9999
distribution: 'semeru'
100100
- name: Build with Gradle Wrapper
101-
run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }}
101+
run: ./gradlew build -Pjava_version=${{ matrix.jdk }}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ version = '1.0.0'
1212

1313
java
1414
{
15-
sourceCompatibility = JavaVersion.VERSION_1_8
16-
targetCompatibility = JavaVersion.VERSION_1_8
15+
toolchain
16+
{
17+
languageVersion = JavaLanguageVersion.of(java_version)
18+
}
1719
}
1820

1921
// If in Eclipse, add Javadoc to the local project classpath

gradle.properties

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
java_version = 17
2+
3+
# Gradle daemon improves build performance
4+
org.gradle.daemon=true
5+
6+
# Enable parallel builds for faster compilation
7+
org.gradle.parallel=true
8+
9+
# Configuration cache disabled - CICS Bundle Plugin 1.0.8 not compatible
10+
# org.gradle.configuration-cache=true

pom.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
com.ibm.cics.server.invocation.CICSProgram annotation for Link to Liberty.</description>
1616

1717
<properties>
18-
<java.version>1.8</java.version>
18+
<java.version>17</java.version>
1919
<cics.jvmserver>DFHWLP</cics.jvmserver>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -38,4 +38,20 @@
3838
<module>cics-java-liberty-link-app</module>
3939
<module>cics-java-liberty-link-bundle</module>
4040
</modules>
41+
42+
<!-- ================================================================ -->
43+
<!-- Build Configuration -->
44+
<!-- ================================================================ -->
45+
<build>
46+
<plugins>
47+
<!-- Maven Compiler Plugin with release parameter -->
48+
<plugin>
49+
<groupId>org.apache.maven.plugins</groupId>
50+
<artifactId>maven-compiler-plugin</artifactId>
51+
<configuration>
52+
<release>${java.version}</release>
53+
</configuration>
54+
</plugin>
55+
</plugins>
56+
</build>
4157
</project>

settings.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
// ============================================================================
2+
// Root Project Configuration
3+
// ============================================================================
14
rootProject.name = 'cics-java-liberty-link'
5+
6+
// ============================================================================
7+
// Subprojects
8+
// ============================================================================
29
include(':cics-java-liberty-link-app')
310
include(':cics-java-liberty-link-bundle')

0 commit comments

Comments
 (0)