Fix Maven/Gradle builds.

Author: SoftlySplinter

cics-eventprocessing-java/.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

cics-eventprocessing-java/.mvn/wrapper/maven-wrapper.properties

@@ -1,38 +1,5 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
 
 allprojects {
     group = 'com.ibm.cicsdev.eventprocessing'
     version = '0.0.1-SNAPSHOT'
 }
-
-subprojects {
-    apply plugin: 'java'
-    apply plugin: 'maven-publish'
-
-    repositories {
-        mavenLocal()
-        maven {
-            url = uri('https://repo.jenkins-ci.org/public/')
-        }
-
-        maven {
-            url = uri('https://repo.maven.apache.org/maven2')
-        }
-    }
-
-    sourceCompatibility = '1.8'
-
-    publishing {
-        publications {
-            maven(MavenPublication) {
-                from(components.java)
-            }
-        }
-    }
-
-    tasks.withType(JavaCompile) {
-        options.encoding = 'UTF-8'
-    }
-}

cics-eventprocessing-java/build.gradle

@@ -2,7 +2,7 @@
  * This file was generated by the Gradle 'init' task.
  */
 plugins {
-    id 'com.ibm.cics.bundle' version '1.0.1'
+    id 'com.ibm.cics.bundle' version '1.0.3'
 }
 
 cicsBundle {

cics-eventprocessing-java/cics-eventprocessing-java-bundle/build.gradle

@@ -19,7 +19,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>cics-eventprocessing-java-code</artifactId>
+			<artifactId>cics-eventprocessing-java-webapp</artifactId>
 			<version>${project.version}</version>
 			<type>war</type>
 		</dependency>

cics-eventprocessing-java/cics-eventprocessing-java-bundle/pom.xml

@@ -6,6 +6,20 @@ plugins {
     id 'war'
 }
 
+repositories {
+    mavenCentral()
+}
+
+java
+{
+    toolchain
+    {
+        languageVersion = JavaLanguageVersion.of(java_version)
+        vendor = JvmVendorSpec.IBM
+        implementation = JvmImplementation.J9
+    }
+}
+
 dependencies {
     providedCompile 'com.ibm.cics:com.ibm.cics.server:1.700.1-5.5-PH25409'
     providedCompile 'com.ibm.cics:com.ibm.cics.server.invocation.annotations:5.5-PH25409'

cics-eventprocessing-java/cics-eventprocessing-java-webapp/build.gradle

@@ -39,17 +39,23 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<version>3.12.1</version>
 				<configuration>
 					<annotationProcessorPaths>
 						<annotationProcessorPath>
 							<groupId>com.ibm.cics</groupId>
 							<artifactId>com.ibm.cics.server.invocation</artifactId>
-							<version>5.5-PH25409</version>
+							<version>6.1</version>
 						</annotationProcessorPath>
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<version>3.4.0</version>
+			</plugin>
 		</plugins>
 	</build>
 

cics-eventprocessing-java/cics-eventprocessing-java-webapp/pom.xml

@@ -0,0 +1 @@
+java_version = 8

cics-eventprocessing-java/gradle.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists