Skip to content

gradle version update #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Manvi-55 wants to merge 3 commits into from
Closed

gradle version update #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84c0a1c
gradle version update
Manvi-55 Jun 5, 2026
1b22f5c
Restructure to multi-module format following CICS standards
Manvi-55 Jun 5, 2026
0edf223
Merge remote-tracking branch 'origin/main' into manvi/samples
Manvi-55 Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions build.gradle → ...-liberty-springboot-link-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ plugins
}

group = 'com.ibm.cicsdev.springboot'
archivesBaseName='cics-java-liberty-springboot-link'
version = '0.1.0'
version = '1.0.0'

// ============================================================================
// Java Configuration
Expand All @@ -20,6 +19,19 @@ java {
targetCompatibility = JavaVersion.toVersion(java_version)
}

// ============================================================================
// WAR Configuration
// ============================================================================
war
{
archiveFileName = "cics-java-liberty-springboot-link-app-${version}.war"
}

// Two versions of the WAR would be built, one for embedding into servers like Liberty (plain)
// and a bootWAR which can run standalone and contains all the Tomcat and Spring Boot stuff
// we don't need bootWAR, so disable it.
bootWar { enabled = false }

// If in Eclipse, add Javadoc to the local project classpath
eclipse
{
Expand Down
115 changes: 115 additions & 0 deletions cics-java-liberty-springboot-link-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<!-- Inherit from parent POM -->
<parent>
<groupId>com.ibm.cicsdev</groupId>
<artifactId>cics-java-liberty-springboot-link</artifactId>
<version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<!-- Application module properties -->
<artifactId>cics-java-liberty-springboot-link-app</artifactId>
<name>com.ibm.cicsdev.springboot.link.app</name>
<description>Demo project for Spring Boot with CICS Link - Application</description>

<properties>
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
</properties>

<!-- CICS TS V6.1 BOM (as of Sept 2024) -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ibm.cics</groupId>
<artifactId>com.ibm.cics.ts.bom</artifactId>
<version>6.1-20250812133513-PH63856</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Compile against, but don't include JCICS in the final build (version and scope are from BOM) -->
<dependency>
<groupId>com.ibm.cics</groupId>
<artifactId>com.ibm.cics.server</artifactId>
</dependency>

<!-- CICS Annotations -->
<dependency>
<groupId>com.ibm.cics</groupId>
<artifactId>com.ibm.cics.server.invocation.annotations</artifactId>
</dependency>

<!-- Spring web support -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<!-- Validation annotation support for validating Web input forms -->
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>

<!-- Thymeleaf view -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>

<!-- Don't include TomCat in the runtime build, but put it in lib-provided so it can run standalone as well as embedded -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>

<!-- Add tiles-el dependency if using JSF, see README for more details -->
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-el</artifactId>
<version>3.0.8</version>
</dependency>

</dependencies>

<!-- Package as an executable war (default jar) -->
<packaging>war</packaging>

<!-- Build with Maven and CICS annotation processor -->
<build>
<plugins>
<!-- Spring Boot plugin for Maven -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>

<!-- Enable the Link to Liberty annotation processor -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>com.ibm.cics</groupId>
<artifactId>com.ibm.cics.server.invocation</artifactId>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>

</project>
0 ...v/springboot/link/app/ui/Application.java → ...v/springboot/link/app/ui/Application.java
View file
Open in desktop
File renamed without changes.
0 ...ink/app/ui/InMemoryMessageRepository.java → ...ink/app/ui/InMemoryMessageRepository.java
View file
Open in desktop
File renamed without changes.
0 ...csdev/springboot/link/app/ui/Message.java → ...csdev/springboot/link/app/ui/Message.java
View file
Open in desktop
File renamed without changes.
0 ...ngboot/link/app/ui/MessageRepository.java → ...ngboot/link/app/ui/MessageRepository.java
View file
Open in desktop
File renamed without changes.
0 ...gboot/link/app/ui/ServletInitializer.java → ...gboot/link/app/ui/ServletInitializer.java
View file
Open in desktop
File renamed without changes.
0 ...ngboot/link/app/ui/cics/CICSCallable.java → ...ngboot/link/app/ui/cics/CICSCallable.java
View file
Open in desktop
File renamed without changes.
0 ...ot/link/app/ui/mvc/MessageController.java → ...ot/link/app/ui/mvc/MessageController.java
View file
Open in desktop
File renamed without changes.
0 src/main/resources/application.properties → ...src/main/resources/application.properties
View file
Open in desktop
File renamed without changes.
0 src/main/resources/logback.xml → ...t-link-app/src/main/resources/logback.xml
View file
Open in desktop
File renamed without changes.
0 src/main/resources/messages.properties → ...pp/src/main/resources/messages.properties
View file
Open in desktop
File renamed without changes.
0 ...in/resources/static/css/bootstrap.min.css → ...in/resources/static/css/bootstrap.min.css
View file
Open in desktop
File renamed without changes.
0 src/main/resources/static/favicon.ico → ...app/src/main/resources/static/favicon.ico
View file
Open in desktop
File renamed without changes.
0 src/main/resources/templates/fragments.html → ...c/main/resources/templates/fragments.html
View file
Open in desktop
File renamed without changes.
0 ...in/resources/templates/messages/form.html → ...in/resources/templates/messages/form.html
View file
Open in desktop
File renamed without changes.
0 ...in/resources/templates/messages/list.html → ...in/resources/templates/messages/list.html
View file
Open in desktop
File renamed without changes.
0 ...in/resources/templates/messages/view.html → ...in/resources/templates/messages/view.html
View file
Open in desktop
File renamed without changes.
33 changes: 33 additions & 0 deletions cics-java-liberty-springboot-link-cicsbundle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// ============================================================================
// Plugins
// ============================================================================
plugins
{
id 'com.ibm.cics.bundle' version '1.0.8'
}

// ============================================================================
// Project Information
// ============================================================================
description = 'CICS Spring Boot Link Application - CICS Bundle'
version = '1.0.0'

// ============================================================================
// Dependencies
// ============================================================================
dependencies
{
// Application WAR from sibling project
cicsBundlePart project(path: ':cics-java-liberty-springboot-link-app', configuration: 'archives')
}

// ============================================================================
// CICS Bundle Configuration
// ============================================================================
cicsBundle
{
build
{
defaultJVMServer = project.findProperty('cics.jvmserver') ?: 'DFHWLP'
}
}
57 changes: 57 additions & 0 deletions cics-java-liberty-springboot-link-cicsbundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<!-- ================================================================ -->
<!-- Parent Project -->
<!-- ================================================================ -->
<parent>
<groupId>com.ibm.cicsdev</groupId>
<artifactId>cics-java-liberty-springboot-link</artifactId>
<version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<!-- ================================================================ -->
<!-- Project Coordinates -->
<!-- ================================================================ -->
<artifactId>cics-java-liberty-springboot-link-cicsbundle</artifactId>
<packaging>cics-bundle</packaging>
<name>CICS Spring Boot Link - CICS Bundle</name>

<!-- ================================================================ -->
<!-- Dependencies -->
<!-- ================================================================ -->
<dependencies>
<!-- Application WAR -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cics-java-liberty-springboot-link-app</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
</dependencies>

<!-- ================================================================ -->
<!-- Build Configuration -->
<!-- ================================================================ -->
<build>
<plugins>
<!-- CICS Bundle Maven Plugin -->
<plugin>
<groupId>com.ibm.cics</groupId>
<artifactId>cics-bundle-maven-plugin</artifactId>
<version>1.0.8</version>
<extensions>true</extensions>
<configuration>
<defaultjvmserver>${cics.jvmserver}</defaultjvmserver>
</configuration>
</plugin>
</plugins>
</build>

</project>


4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
114 changes: 25 additions & 89 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,37 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<!-- Inherit defaults from Spring Boot Parent-->
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.9</version>
<relativePath/>
</parent>

<!-- Application properties -->
<groupId>com.ibm.cicsdev.springboot</groupId>

<!-- ================================================================ -->
<!-- Project Coordinates -->
<!-- ================================================================ -->
<groupId>com.ibm.cicsdev</groupId>
<artifactId>cics-java-liberty-springboot-link</artifactId>
<version>0.1.0</version>
<name>cics-java-liberty-springboot-link</name>
<description>Demo project for Spring Boot</description>
<version>1.0.0</version>
<description>Demo project for Spring Boot with CICS Link</description>
<packaging>pom</packaging>

<properties>
<java.version>17</java.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
<cics.jvmserver>DFHWLP</cics.jvmserver>
</properties>

<!-- CICS TS V6.1 BOM (as of Sept 2024) -->
<!-- Dependency Management -->
<dependencyManagement>
<dependencies>
<!-- CICS TS V6.1 BOM (as of Sept 2024) -->
<dependency>
<groupId>com.ibm.cics</groupId>
<artifactId>com.ibm.cics.ts.bom</artifactId>
Expand All @@ -37,81 +41,13 @@
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Compile against, but don't include JCICS in the final build (version and scope are from
BOM) -->
<dependency>
<groupId>com.ibm.cics</groupId>
<artifactId>com.ibm.cics.server</artifactId>
</dependency>

<!-- CICS Annotations -->
<dependency>
<groupId>com.ibm.cics</groupId>
<artifactId>com.ibm.cics.server.invocation.annotations</artifactId>
</dependency>

<!-- Spring web support -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<!-- Validation annotation support for validating Web input forms -->
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>

<!-- Thymeleaf view -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>

<!-- Don't include TomCat in the runtime build, but put it in lib-provided so it can run standalone as well as embedded -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>

<!-- Add tiles-el dependency if using JSF, see README for more details -->
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-el</artifactId>
<version>3.0.8</version>
</dependency>

</dependencies>

<!-- Package as an executable war (default jar) -->
<packaging>war</packaging>

<!-- Build with Maven and CICS annotation processor -->
<build>
<plugins>
<!-- Spring Boot plugin for Maven -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>

<!-- Enable the Link to Liberty annotation processor -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>com.ibm.cics</groupId>
<artifactId>com.ibm.cics.server.invocation</artifactId>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>

<!-- ================================================================ -->
<!-- Modules -->
<!-- ================================================================ -->
<modules>
<module>cics-java-liberty-springboot-link-app</module>
<module>cics-java-liberty-springboot-link-cicsbundle</module>
</modules>

</project>
Loading
Loading