From 7edb644831788a2066519fc0a8188ac4c57bccd8 Mon Sep 17 00:00:00 2001
From: Manvi-55 <Manvisingh.555@ibm.com>
Date: Fri, 5 Jun 2026 17:49:51 +0530
Subject: [PATCH] Revert "yaml,gitignore and web.xml changes"

---
 .github/workflows/java.yaml                   | 92 ++++++++++---------
 .gitignore                                    | 10 +-
 .../src => src}/main/webapp/WEB-INF/web.xml   |  7 +-
 3 files changed, 58 insertions(+), 51 deletions(-)
 rename {cics-java-liberty-springboot-link-app/src => src}/main/webapp/WEB-INF/web.xml (78%)

diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml
index 608bff1..95c2fb1 100644
--- a/.github/workflows/java.yaml
+++ b/.github/workflows/java.yaml
@@ -8,54 +8,51 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
-permissions:
-  contents: read
-
 jobs:
-  check-copyright:
-    runs-on: ubuntu-latest
-    name: Check Copyright
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - id: copyright-action
-        uses: cicsdev/.github/.github/actions/samples-copyright-checker@4134522d8109169bb8c460db841f94167ec2802f
-        with:
-          directory: './cics-java-liberty-springboot-link/'
-          file-extensions: '*.java'
-          base-copyright: 'Copyright IBM Corp. 2025'
-          token: ${{ secrets.GITHUB_TOKEN }}
-
   build-maven:
     name: Build Maven
 
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        jdk: [17, 21, 25]
+        jdk: [8, 11]
+        experimental: [false]
+        include:
+          - jdk: 17
+            experimental: true
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.jdk }}
           distribution: "semeru"
           cache: maven
       - name: Build with Maven
         run: mvn --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} package
+      - run: mkdir staging && cp target/*.war staging
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cics-java-liberty-sprintboot-link (Maven, Java ${{ matrix.jdk }})
+          path: staging
 
   build-mvnw:
     name: Build Maven Wrapper
 
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        jdk: [17, 21, 25]
+        jdk: [8, 11]
+        experimental: [false]
+        include:
+          - jdk: 17
+            experimental: true
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.jdk }}
           distribution: "semeru"
@@ -67,38 +64,47 @@ jobs:
     name: Build Gradle
     
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        jdk: [17, 21, 25]
+        jdk: [8, 11]
+        experimental: [false]
+        include:
+          - jdk: 17
+            experimental: true
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up JDK ${{ matrix.jdk }}
       uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.jdk }}
         distribution: 'semeru'
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4
     - name: Build with Gradle
-      run: ./gradlew build -Pjava_version=${{ matrix.jdk }}
-      
+      uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
+      with:
+        arguments: bootWar -Pjava_version=${{ matrix.jdk }}
+
   build-gradlew:
-    name: Build Gradle wrapper
-    
+    name: Build Gradle Wrapper
+
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        jdk: [17, 21, 25]
+        jdk: [8, 11]
+        experimental: [false]
+        include:
+          - jdk: 17
+            experimental: true
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK ${{ matrix.jdk }}
-      uses: actions/setup-java@v4
-      with:
-        java-version: ${{ matrix.jdk }}
-        distribution: 'semeru'
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4
-    - name: Build with Gradle
-      run: ./gradlew build -Pjava_version=${{ matrix.jdk }}
+      - uses: actions/checkout@v3
+      - name: Set up JDK ${{ matrix.jdk }}
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.jdk }}
+          distribution: "semeru"
+          cache: maven
+      - name: Build with Maven
+        run: ./gradlew bootWar -Pjava_version=${{ matrix.jdk }}
 
 
diff --git a/.gitignore b/.gitignore
index 034c685..c395b9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-.gradle/
-target/
-build/
-bin/
+/.apt_generated/
+/.apt_generated_tests/
+/.gradle/
+/target/
+/build/
+/bin/
diff --git a/cics-java-liberty-springboot-link-app/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
similarity index 78%
rename from cics-java-liberty-springboot-link-app/src/main/webapp/WEB-INF/web.xml
rename to src/main/webapp/WEB-INF/web.xml
index 58e3b9d..4357173 100644
--- a/cics-java-liberty-springboot-link-app/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
-         version="6.0">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd"
+	version="3.1">
     <display-name>com.ibm.cicsdev.springboot.link</display-name>   
     <login-config>
         <auth-method>BASIC</auth-method>