Merge pull request #901 from kevin-ortega/addnewprofile

Author: dmikusa

.github/pipeline-descriptor.yml

@@ -68,15 +68,6 @@ dependencies:
     group_id:    io.openliberty
     artifact_id: openliberty-webProfile8
     packaging:   zip
-- id:   open-liberty-runtime-microProfile6
-  purl_pattern:    "[\\d]+\\.[\\d]+\\.[\\d]+\\.[\\d]+"
-  cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+\\.[\\d]+"
-  uses: docker://ghcr.io/paketo-buildpacks/actions/liberty-dependency:main
-  with:
-    uri:         https://repo1.maven.org/maven2
-    group_id:    io.openliberty
-    artifact_id: openliberty-microProfile6
-    packaging:   zip
 - id:   open-liberty-runtime-microProfile4
   purl_pattern:    "[\\d]+\\.[\\d]+\\.[\\d]+\\.[\\d]+"
   cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+\\.[\\d]+"
@@ -86,15 +77,15 @@ dependencies:
     group_id:    io.openliberty
     artifact_id: openliberty-microProfile4
     packaging:   zip
-- id:   open-liberty-runtime-microProfile3
+- id:   open-liberty-runtime-microProfile7
   purl_pattern:    "[\\d]+\\.[\\d]+\\.[\\d]+\\.[\\d]+"
   cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+\\.[\\d]+"
   uses: docker://ghcr.io/paketo-buildpacks/actions/liberty-dependency:main
   with:
     uri:         https://repo1.maven.org/maven2
     group_id:    io.openliberty
-    artifact_id: openliberty-microProfile3
-    packaging:   zip
+    artifact_id: openliberty-microProfile7
+    packaging:   zip    
 - id:   open-liberty-runtime-kernel
   purl_pattern:    "[\\d]+\\.[\\d]+\\.[\\d]+\\.[\\d]+"
   cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+\\.[\\d]+"

.github/workflows/pb-update-open-liberty-runtime-micro-profile-6.yml

@@ -62,7 +62,7 @@ Valid profiles for Open Liberty are:
 * javaee8
 * webProfile9
 * webProfile8
-* microProfile6
+* microProfile7
 * microProfile4
 
 Valid profiles for WebSphere Liberty are:

README.md

@@ -201,22 +201,6 @@ api = "0.7"
       type = "EPL-2.0"
       uri = "https://raw.githubusercontent.com/OpenLiberty/open-liberty/integration/LICENSE"
 
-  [[metadata.dependencies]]
-    cpes = ["cpe:2.3:a:ibm:open_liberty:24.0.0.11:*:*:*:*:*:*:*"]
-    id = "open-liberty-runtime-microProfile6"
-    name = "Open Liberty (Micro Profile 6)"
-    purl = "pkg:maven/io.openliberty/[email protected]"
-    sha256 = "16c834a41a01f77ec826d9b0f334aed447801b1d9f3fc05f5ac8cf6e0a4736ac"
-    source = "https://github.com/OpenLiberty/open-liberty/archive/refs/tags/gm-24.0.0.11.tar.gz"
-    source-sha256 = "320cf36d310438d615a79350c8de4a737ff697ef45664c5671682284b9c647bb"
-    stacks = ["*"]
-    uri = "https://repo1.maven.org/maven2/io/openliberty/openliberty-microProfile6/24.0.0.11/openliberty-microProfile6-24.0.0.11.zip"
-    version = "24.0.11"
-
-    [[metadata.dependencies.licenses]]
-      type = "EPL-2.0"
-      uri = "https://raw.githubusercontent.com/OpenLiberty/open-liberty/integration/LICENSE"
-
   [[metadata.dependencies]]
     cpes = ["cpe:2.3:a:ibm:open_liberty:24.0.0.12:*:*:*:*:*:*:*"]
     id = "open-liberty-runtime-microProfile4"
@@ -249,6 +233,22 @@ api = "0.7"
       type = "EPL-2.0"
       uri = "https://raw.githubusercontent.com/OpenLiberty/open-liberty/integration/LICENSE"
 
+    [[metadata.dependencies]]
+    cpes = ["cpe:2.3:a:ibm:open_liberty:24.0.0.12:*:*:*:*:*:*:*"]
+    id = "open-liberty-runtime-microProfile7"
+    name = "Open Liberty (Micro Profile 7)"
+    purl = "pkg:maven/io.openliberty/[email protected]"
+    sha256 = "aafcede3ca008f36867f94cd8c6bea7d3c58116eeeb255539b98c0f20c292798"
+    source = "https://github.com/OpenLiberty/open-liberty/archive/refs/tags/gm-24.0.0.12.tar.gz"
+    source-sha256 = "57ff32688ecb5b6d1852e15c7ca388dda13d76d1e218f29a8dae1e552de39fcf"
+    stacks = ["*"]
+    uri = "https://repo1.maven.org/maven2/io/openliberty/openliberty-microProfile7/24.0.0.12/openliberty-microProfile7-24.0.0.12.zip"
+    version = "24.0.12"
+
+    [[metadata.dependencies.licenses]]
+      type = "EPL-2.0"
+      uri = "https://raw.githubusercontent.com/OpenLiberty/open-liberty/integration/LICENSE"    
+
   [[metadata.dependencies]]
     cpes = ["cpe:2.3:a:ibm:websphere_application_server:24.0.0.12:*:*:*:liberty:*:*:*"]
     id = "websphere-liberty-runtime-kernel"

buildpack.toml

@@ -108,7 +108,7 @@ func IsValidOpenLibertyProfile(profile string) bool {
 		profile == "javaee8" ||
 		profile == "webProfile10" ||
 		profile == "webProfile8" ||
-		profile == "microProfile6" ||
+		profile == "microProfile7" ||
 		profile == "microProfile4"
 }
 
@@ -134,8 +134,8 @@ func GetDefaultFeatures(serverProfile string) []string {
 		return []string{"webProfile-10.0"}
 	case "webProfile8":
 		return []string{"webProfile-8.0"}
-	case "microProfile5":
-		return []string{"microProfile-6.0"}
+	case "microProfile7":
+		return []string{"microProfile-7.0"}
 	case "microProfile4":
 		return []string{"microProfile-4.1"}
 	}