Skip to content

Commit f2798cc

Browse files
committed
Apply gold standard compliance updates
- Rename workflow from java.yaml to build.yaml - Update README badge to reference build.yaml - Update build.gradle to use toolchain instead of sourceCompatibility/targetCompatibility - Update pom.xml files to use maven.compiler.release instead of source/target - Add Gradle daemon and parallel build settings to gradle.properties - Update .classpath from JavaSE-1.8 to JavaSE-17 - All builds tested and passing (Gradle and Maven)
1 parent f2f2958 commit f2798cc

7 files changed

Lines changed: 17 additions & 12 deletions

File tree

.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<attribute name="gradle_used_by_scope" value="main,test"/>
1414
</attributes>
1515
</classpathentry>
16-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
16+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
1717
<classpathentry kind="src" path=".apt_generated">
1818
<attributes>
1919
<attribute name="optional" value="true"/>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# cics-java-liberty-springboot-link
2-
[![Build](https://github.com/cicsdev/cics-java-liberty-springboot-link/actions/workflows/java.yaml/badge.svg)](https://github.com/cicsdev/cics-java-liberty-springboot-link/actions/workflows/java.yaml)
2+
[![Build](https://github.com/cicsdev/cics-java-liberty-springboot-link/actions/workflows/build.yaml/badge.svg)](https://github.com/cicsdev/cics-java-liberty-springboot-link/actions/workflows/build.yaml)
33

44
This sample demonstrates how you can link to a Spring Boot application in a Liberty JVM server from a CICS program. The application is based on a Spring Boot sample application that demonstrates Spring MVC, so has both a web front-end and a CICS entry point using the link to Liberty `@CICSProgram` annotation. The sample shows how both entry points can access the same data.
55

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ version = '1.0.0'
1515
// Java Configuration
1616
// ============================================================================
1717
java {
18-
sourceCompatibility = JavaVersion.toVersion(java_version)
19-
targetCompatibility = JavaVersion.toVersion(java_version)
18+
toolchain {
19+
languageVersion = JavaLanguageVersion.of(java_version)
20+
}
2021
}
2122

2223
// ============================================================================

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
<properties>
2020
<java.version>17</java.version>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22-
<maven.compiler.target>${java.version}</maven.compiler.target>
23-
<maven.compiler.source>${java.version}</maven.compiler.source>
22+
<maven.compiler.release>${java.version}</maven.compiler.release>
2423
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
2524
</properties>
2625

gradle.properties

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
#
2-
# Values in this file provide defaults to variables used in the
2+
# Values in this file provide defaults to variables used in the
33
# gradle files.
44
#
55

66
# Normally we don't publish any built artifacts to a repository.
77
# But if we do, these are the default values we use to indicate
88
# where the files should be placed.
99
#
10-
# These can be over-ridden from the command line
10+
# These can be over-ridden from the command line
1111
# with -Ppublish_repo_releases_url="file://my-folder" for example.
12-
#
12+
#
1313
# These values only have any effect if the publish goal is used.
1414
# For example: gradle build publish.
1515
publish_repo_releases_url = 'default-value-for-publish_repo_releases_url'
1616
publish_repo_releases_name = 'default-value-for-publish_repo_releases_name'
17-
java_version = 17
17+
java_version = 17
18+
19+
# Gradle daemon improves build performance
20+
org.gradle.daemon=true
21+
22+
# Enable parallel builds for faster compilation
23+
org.gradle.parallel=true

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
<properties>
2424
<java.version>17</java.version>
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
<maven.compiler.target>${java.version}</maven.compiler.target>
27-
<maven.compiler.source>${java.version}</maven.compiler.source>
26+
<maven.compiler.release>${java.version}</maven.compiler.release>
2827
<cics.jvmserver>DFHWLP</cics.jvmserver>
2928
</properties>
3029

0 commit comments

Comments
 (0)