Merge pull request #9 from SoftlySplinter/main

Fix Gradle build

Author: SoftlySplinter

README.md

@@ -11,7 +11,7 @@ The CICS program `EVNTCONS` is a Java EE program designed to consume CICS events
 
 ## Requirements
 
-* CICS TS V5.3 or later
+* CICS TS V5.5 or later
 * A configured Liberty JVM server
 * Java SE 1.8 or later on the workstation
 * Either Gradle or Apache Maven on the workstation (optional if using Wrappers)

cics-eventprocessing-java-webapp/build.gradle

@@ -1,15 +1,27 @@
 /*
  * This file was generated by the Gradle 'init' task.
  */
-
-plugins {
-    id 'war'
+plugins
+{
+	id 'java'
+	id 'eclipse'
+	id 'idea'
+	id 'war'
 }
 
 repositories {
     mavenCentral()
 }
 
+// If in Eclipse, add Javadoc to the local project classpath
+eclipse 
+{
+    classpath 
+    {
+        downloadJavadoc = true
+    }
+}
+
 java
 {
     toolchain
@@ -21,9 +33,19 @@ java
 }
 
 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'
-    providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
+    // CICS TS V5.5 Maven BOM (as of 19th May 2020)
+    compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:5.5-20200519131930-PH25409")	
+    //annotationProcessor enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:5.5-20200519131930-PH25409")
+
+    // Don't include JCICS components in the final build (no need for version because we have BOM)
+    compileOnly 'com.ibm.cics:com.ibm.cics.server'
+    compileOnly 'com.ibm.cics:com.ibm.cics.server.invocation.annotations'
+    compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
+
+    // Enable CICS Link to Liberty annotation processor   
+    // Note: Java 11 support is only currently available in the 6.1 version of the annotation processor. 
+    // This is backwards compatible with older version so long as we don't use the new function in 6.1 (Link to CDI beans).
+    annotationProcessor ("com.ibm.cics:com.ibm.cics.server.invocation:6.1")
 }
 
 description = 'cics-eventprocessing-java - Webapp'

pom.xml

@@ -10,27 +10,26 @@
 
 	<name>cics-eventprocessing-java</name>
 
-  <properties>
-	<java.version>1.8</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>
-  </properties>
-  
-  <build>
-      <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>com.ibm.cics</groupId>
-          <artifactId>cics-bundle-maven-plugin</artifactId>
-          <version>1.0.3</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  
-  
+	<properties>
+		<java.version>1.8</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>
+	</properties>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>com.ibm.cics</groupId>
+					<artifactId>cics-bundle-maven-plugin</artifactId>
+					<version>1.0.3</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
 
 	<!-- CICS TS V5.5 BOM (as of May 2020) -->
 	<dependencyManagement>
@@ -44,10 +43,10 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-  
-  <url>https://github.com/cicsdev/cics-eventprocessing-java</url>
-  <modules>
-  	<module>cics-eventprocessing-java-webapp</module>
-  	<module>cics-eventprocessing-java-bundle</module>
-  </modules>
-</project>
+
+	<url>https://github.com/cicsdev/cics-eventprocessing-java</url>
+	<modules>
+		<module>cics-eventprocessing-java-webapp</module>
+		<module>cics-eventprocessing-java-bundle</module>
+	</modules>
+</project>