Skip to content

Commit bb1efcd

Browse files
committed
gradle,java and springboot version update
1 parent ea19c3c commit bb1efcd

4 files changed

Lines changed: 25 additions & 66 deletions

File tree

build.gradle

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
plugins
22
{
3-
id 'org.springframework.boot' version '2.7.0'
3+
id 'org.springframework.boot' version '3.5.13'
44
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
55
id 'java'
66
id 'eclipse'
77
id 'idea'
88
id 'war'
9-
id 'maven-publish'
109
}
1110

1211
group = 'com.ibm.cicsdev.springboot'
1312
archivesBaseName='cics-java-liberty-springboot-link'
1413
version = '0.1.0'
1514

15+
// ============================================================================
16+
// Java Configuration
17+
// ============================================================================
18+
java {
19+
sourceCompatibility = JavaVersion.toVersion(java_version)
20+
targetCompatibility = JavaVersion.toVersion(java_version)
21+
}
22+
1623
// If in Eclipse, add Javadoc to the local project classpath
17-
eclipse
24+
eclipse
1825
{
19-
classpath
26+
classpath
2027
{
2128
downloadJavadoc = true
2229
}
@@ -27,22 +34,22 @@ repositories
2734
mavenCentral()
2835
}
2936

30-
dependencies
37+
dependencies
3138
{
3239
// Spring Boot web starter dependency
3340
implementation("org.springframework.boot:spring-boot-starter-web")
3441

35-
// Validation anotation support, for validating Web input forms
36-
implementation("javax.validation:validation-api");
42+
// Validation anotation support, for validating Web input forms
43+
implementation("jakarta.validation:jakarta.validation-api");
3744

3845
// Spring Boot thymeleaf view dependency
3946
implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
4047

4148
// Don't include TomCat in the runtime build, but put it in lib-provided so it can run standalone as well as embedded
4249
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
4350

44-
// CICS TS V5.5 Maven BOM
45-
def bom = "com.ibm.cics:com.ibm.cics.ts.bom:5.5-20250812140737-PH63855"
51+
// CICS TS V6.1 Maven BOM (as of Sept 2024)
52+
def bom = "com.ibm.cics:com.ibm.cics.ts.bom:6.1-20250812133513-PH63856"
4653

4754
compileOnly enforcedPlatform(bom)
4855
annotationProcessor enforcedPlatform(bom)
@@ -56,31 +63,3 @@ dependencies
5663
//Add tiles-el dependency if using JSF, see READ for more details
5764
implementation ("org.apache.tiles:tiles-el:3.0.8")
5865
}
59-
60-
61-
publishing {
62-
publications {
63-
// Publication for JCICS
64-
maven(MavenPublication) {
65-
groupId "${group}"
66-
version "${version}"
67-
artifactId "${archivesBaseName}"
68-
artifact bootWar
69-
}
70-
}
71-
72-
// Configure the Maven repository to publish to somewhere which is configurable
73-
// with environment variables from outside gradle.
74-
//
75-
// For example:
76-
// gradle build publish \
77-
// -Ppublish_repo_releases_url="file://my-folder" \
78-
// -Ppublish_repo_releases_name="my-maven-repo"
79-
//
80-
repositories {
81-
maven {
82-
url = "${publish_repo_releases_url}/${publish_repo_releases_name}"
83-
}
84-
}
85-
86-
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
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 = 8
17+
java_version = 17
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

pom.xml

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
<parent>
88
<groupId>org.springframework.boot</groupId>
99
<artifactId>spring-boot-starter-parent</artifactId>
10-
<version>2.7.0</version>
10+
springb <version>3.5.9</version>
11+
<relativePath/>
1112
</parent>
1213

1314
<!-- Application properties -->
@@ -17,20 +18,20 @@
1718
<name>cics-java-liberty-springboot-link</name>
1819
<description>Demo project for Spring Boot</description>
1920
<properties>
20-
<java.version>1.8</java.version>
21+
<java.version>17</java.version>
2122

2223
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2324
<maven.compiler.target>${java.version}</maven.compiler.target>
2425
<maven.compiler.source>${java.version}</maven.compiler.source>
2526
</properties>
2627

27-
<!-- CICS TS V5.5 BOM (as of May 2020) -->
28+
<!-- CICS TS V6.1 BOM (as of Sept 2024) -->
2829
<dependencyManagement>
2930
<dependencies>
3031
<dependency>
3132
<groupId>com.ibm.cics</groupId>
3233
<artifactId>com.ibm.cics.ts.bom</artifactId>
33-
<version>5.5-20250812140737-PH63855</version>
34+
<version>6.1-20250812133513-PH63856</version>
3435
<type>pom</type>
3536
<scope>import</scope>
3637
</dependency>
@@ -59,8 +60,8 @@
5960

6061
<!-- Validation annotation support for validating Web input forms -->
6162
<dependency>
62-
<groupId>javax.validation</groupId>
63-
<artifactId>validation-api</artifactId>
63+
<groupId>jakarta.validation</groupId>
64+
<artifactId>jakarta.validation-api</artifactId>
6465
</dependency>
6566

6667
<!-- Thymeleaf view -->
@@ -113,25 +114,4 @@
113114
</plugins>
114115
</build>
115116

116-
117-
<!--
118-
Publishes artifacts to here if the deploy goal is used.
119-
120-
The values here can be passed on the maven command line
121-
using the -D flag syntax
122-
123-
for example:
124-
-Dpublish_repo_snapshots_name=my-repo
125-
-->
126-
<distributionManagement>
127-
<snapshotRepository>
128-
<id>${publish_repo_snapshots_name}</id>
129-
<url>${publish_repo_snapshots_url}</url>
130-
</snapshotRepository>
131-
<repository>
132-
<id>${publish_repo_releases_name}</id>
133-
<url>${publish_repo_releases_url}</url>
134-
</repository>
135-
</distributionManagement>
136-
137117
</project>

0 commit comments

Comments
 (0)