Merge pull request #12383 from cbridgha/Jakartaee9_Package

Jakartaee9 package
OpenLiberty · May 28, 2020 · 00b53f0 · 00b53f0
2 parents 444fc4c + 0c54b97
commit 00b53f0
Show file tree

Hide file tree

Showing 4 changed files with 4,779 additions and 16 deletions.
diff --git a/dev/build.image/build.gradle b/dev/build.image/build.gradle
@@ -231,6 +231,11 @@ def javaee8Features() {
     features
 }
 
+def jakartaee9Features() {
+    String features = project.file('profiles/jakartaee9/features.xml').readLines()
+    features
+}
+
 def microProfile3Features() {
     String features = project.file('profiles/microProfile3/features.xml').readLines()
     features
@@ -301,6 +306,12 @@ if (isAutomatedBuild) {
         dependsOn ':com.ibm.websphere.appserver.features:publishFeatureResources'
         withFeatures this.&gaAndBetaPublicFeatures
         outputTo packageDir
+        doLast {
+            copy {
+                from project.file('publish/beta/NOTICES')
+                into "$packageDir/wlp"
+            }
+        }
     }
 
     task packageOpenLibertyKernel(type: PackageLibertyWithFeatures) {
@@ -364,6 +375,25 @@ if (isAutomatedBuild) {
         }
     }
 
+    task packageOpenLibertyJakartaee9(type: PackageLibertyWithFeatures) {
+
+        enabled rootProject.userProps["ghe.build.type"] == null || !rootProject.userProps["ghe.build.type"].contains("ifix")
+        dependsOn parent.subprojects.assemble
+        dependsOn ':com.ibm.websphere.appserver.features:publishFeatureResources'
+        withFeatures this.&jakartaee9Features
+        outputTo packageDir
+        doLast {
+            copy {
+                from "$packageDir/wlp/templates/servers/jakartaee9/server.xml"
+                into "$packageDir/wlp/templates/servers/defaultServer"
+            }
+            copy {
+                from project.file('publish/beta/NOTICES')
+                into "$packageDir/wlp"
+            }
+        }
+    }
+
     task packageOpenLibertyMicroProfile3(type: PackageLibertyWithFeatures) {
         doFirst {
             excludedEE7Features.each {
@@ -443,22 +473,6 @@ if (isAutomatedBuild) {
     }
     publish.dependsOn zipOpenLiberty
 
-    // Includes both kind=ga and kind=beta features.
-    task zipOpenLibertyBeta(type: Zip) {
-        dependsOn packageOpenLibertyBeta
-        dependsOn genChecksums
-        dependsOn setBetaVersion
-        baseName 'openliberty'
-        from packageDir
-        destinationDir distsDir
-        version betaVersion
-        doLast {
-            rootProject.userProps.setProperty('zipopenliberty.beta.archivename', archivePath.toString())
-            rootProject.storeProps()
-        }
-    }
-    publish.dependsOn zipOpenLibertyBeta
-
     // Includes only kind=ga features.
     task zipOpenLibertyKernel(type: Zip) {
         dependsOn packageOpenLibertyKernel
@@ -517,6 +531,38 @@ if (isAutomatedBuild) {
         }
     }
     publish.dependsOn zipOpenLibertyMicroProfile3
+
+    // Includes both kind=ga and kind=beta features.
+    task zipOpenLibertyBeta(type: Zip) {
+        dependsOn packageOpenLibertyBeta
+        dependsOn genChecksums
+        dependsOn setBetaVersion
+        baseName 'openliberty'
+        from packageDir
+        destinationDir distsDir
+        version betaVersion
+        doLast {
+            rootProject.userProps.setProperty('zipopenliberty.beta.archivename', archivePath.toString())
+            rootProject.storeProps()
+        }
+    }
+    publish.dependsOn zipOpenLibertyBeta
+
+    task zipOpenLibertyJakartaee9Beta(type: Zip) {
+        dependsOn packageOpenLibertyJakartaee9
+        dependsOn genChecksums
+        dependsOn setBetaVersion
+        baseName 'openliberty-jakartaee9'
+        from packageDir
+        destinationDir distsDir
+        version betaVersion
+        doLast {
+            rootProject.userProps.setProperty('zipopenliberty.jakartaee9.archivename', archivePath.toString())
+            rootProject.storeProps()
+        }
+    }
+    publish.dependsOn zipOpenLibertyJakartaee9Beta
+
 }
 
 clean.doLast {

diff --git a/dev/build.image/profiles/jakartaee9/features.xml b/dev/build.image/profiles/jakartaee9/features.xml
@@ -0,0 +1,3 @@
+<feature>el-4.0</feature>
+<feature>jsp-3.0</feature>
+<feature>servlet-5.0</feature>