292-jakarta-ee

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,7 +18,7 @@ A clear and concise description of what you expected to happen.
 
 **System information:**
  - OS: [e.g. Linux, Windows, Mac]
- - Java Version: [e.g. 8, 11]
+ - Java Version: [e.g. 11, 17]
  - MicroShed Testing Version: [e.g. 0.4.2]
 
 **Additional context**

.github/workflows/microshed-ci.yml

@@ -61,6 +61,7 @@ jobs:
             projects: >
               maven-app
               everything-app
+              everything-jakarta-app
               jdbc-app
               kafka-app
           - category: LIBERTY/PAYARA

CONTRIBUTING.md

@@ -44,7 +44,7 @@ If your Pull Request results in the failure of this build it will not be reviewe
 
 ##### Requirements
 
-- JDK 8 or higher
+- JDK 11 or higher
 - Docker (daemon or desktop)
 <!-- TODO support podman/colima for builds -->
 

build.gradle

@@ -13,8 +13,8 @@ subprojects {
     group = 'org.microshed'
     version = currentVersion
 
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+    sourceCompatibility = 11
+    targetCompatibility = 11
     compileJava.options.encoding = 'UTF-8'
 
     repositories {
@@ -41,7 +41,7 @@ subprojects {
 task updateVersion {
     doLast {
         if (!project.hasProperty('nextVersion'))
-            throw new GradleException("Must define '-PnextVersion=X.Y.Z' when running this task")
+            throw GradleException("Must define '-PnextVersion=X.Y.Z' when running this task")
         def isRelease = !nextVersion.endsWith('SNAPSHOT')
 
         println 'Updating project version: ' + currentVersion + ' --> ' + nextVersion

core/build.gradle

@@ -1,14 +1,17 @@
 ext.title = "MicroShed Testing Framework"
-description = "A test framework for black-box testing MicroProfile and JavaEE applications"
+description="A test framework for black-box testing MicroProfile and Java EE applications"
 
 dependencies {
   compile 'org.junit.jupiter:junit-jupiter-api:5.10.1'
-  implementation group: 'cglib', name: 'cglib-nodep', version: '3.3.0'
-  implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.4.1'
-  implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-extension-providers', version: '3.4.1'
-  implementation group: 'org.bitbucket.b_c', name: 'jose4j', version: '0.7.2'
-  implementation group: 'org.eclipse', name: 'yasson', version: '1.0.11'
-  implementation group: 'org.glassfish', name: 'javax.json', version: '1.1.4'
+
+  implementation 'org.eclipse:yasson:1.0.11'
+  implementation 'org.glassfish:javax.json:1.1.4'
+
+  implementation 'cglib:cglib-nodep:3.3.0'
+  implementation 'org.apache.cxf:cxf-rt-rs-client:3.6.2'
+  implementation 'org.apache.cxf:cxf-rt-rs-extension-providers:3.6.2'
+  implementation 'org.bitbucket.b_c:jose4j:0.7.2'
+
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 

core/jakarta/build.gradle

@@ -0,0 +1,64 @@
+// This is a mock project that takes the core artifact and transforms it to use the Jakarta EE namespace
+
+ext.title = "MicroShed Testing Framework"
+description="A test framework for black-box testing MicroProfile and Jakarta EE applications"
+
+configurations {
+  transformer
+  parent {extendsFrom compile}
+}
+
+dependencies {
+  compile 'org.junit.jupiter:junit-jupiter-api:5.10.1'
+
+  implementation 'org.eclipse:yasson:2.0.4'
+  implementation 'org.eclipse.parsson:parsson:1.0.5'
+
+  implementation 'cglib:cglib-nodep:3.3.0'
+  implementation 'org.apache.cxf:cxf-rt-rs-client:4.0.3'
+  implementation 'org.apache.cxf:cxf-rt-rs-extension-providers:4.0.3'
+  implementation 'org.bitbucket.b_c:jose4j:0.7.2'
+
+  testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+
+  transformer 'org.eclipse.transformer:org.eclipse.transformer.cli:0.5.0'
+
+  parent project(':microshed-testing-core')
+}
+
+ext.parent_jar = configurations.parent.find{
+    it.name.startsWith("microshed-testing-core")
+}
+ext.transformed_jar = new File(projectDir, 'build/tmp/transformed/' + parent_jar.getName().replace('core', 'core-jakarta'))
+
+//Deletes previously transformed jar otherwise transformer will produce an error
+task cleanupTransform() {
+    if(transformed_jar.exists()) {
+        transformed_jar.delete()
+    }
+}
+
+//Creates the transformed archive in the build/tmp/transformed/ directory
+task transform(type: JavaExec) {
+    dependsOn cleanupTransform
+    classpath = configurations.transformer
+    main = 'org.eclipse.transformer.cli.JakartaTransformerCLI'
+    args parent_jar, transformed_jar
+}
+
+//Creates an empty jar file in the build/libs directory
+//since there are no source files
+jar.dependsOn transform
+
+//Overwrites the empty jar with the transformed jar in the build/libs directory
+task overwrite(type: Copy) {
+    from(transformed_jar)
+    into('build/libs')
+}
+
+jar.finalizedBy overwrite
+
+apply from: publishScript
+
+publishToMavenLocal.dependsOn ':microshed-testing-core:publishToMavenLocal'
+

docs/features/SupportedRuntimes.md

@@ -19,7 +19,7 @@ Maven Dependency:
 Example Dockerfile:
 
 ```
-FROM openliberty/open-liberty:full-java8-openj9-ubi
+FROM open-liberty:full-java11-openj9
 COPY src/main/liberty/config /config/
 ADD build/libs/myservice.war /config/dropins
 ```
@@ -39,7 +39,7 @@ Maven Dependency:
 Example Dockerfile:
 
 ```
-FROM payara/micro:5.193
+FROM payara/micro:5.2022.5-jdk11
 CMD ["--deploymentDir", "/opt/payara/deployments", "--noCluster"]
 ADD build/libs/myservice.war /opt/payara/deployments
 ```
@@ -59,7 +59,7 @@ Maven Dependency:
 Example Dockerfile:
 
 ```
-FROM payara/server-full:5.193
+FROM payara/server-full:5.2022.5-jdk11
 ADD target/myservice.war /opt/payara/deployments
 ```
 

docs/features/Walkthrough.md

@@ -43,7 +43,7 @@ public class PersonService {
 Now assume we also have simple Dockerfile in our repository that packages up our application into a container which gets used in production.
 
 ```
-FROM openliberty/open-liberty:full-java8-openj9-ubi
+FROM open-liberty:full-java11-openj9
 COPY src/main/liberty/config /config/
 ADD target/myservice.war /config/dropins
 ```

docs/index.md

@@ -115,7 +115,7 @@ provide the default logic for building an application container. For example, th
 automatically produce a testable container image roughly equivalent to the following Dockerfile:
 
 ```
-FROM openliberty/open-liberty:full-java8-openj9-ubi
+FROM open-liberty:full-java11-openj9
 COPY src/main/liberty/config /config/
 ADD target/$APP_FILE /config/dropins
 ```

modules/liberty/build.gradle

@@ -3,6 +3,7 @@ description = "Extensions for using MicroShed Testing with Liberty servers"
 
 dependencies {
   compile project(':microshed-testing-testcontainers')
+  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

modules/liberty/src/main/java/org/testcontainers/containers/liberty/LibertyAdapter.java

@@ -112,7 +112,7 @@ public ImageFromDockerfile getDefaultImage(File appFile) {
         final File configDir = new File("src/main/liberty/config");
         final boolean configDirExists = configDir.exists() && configDir.canRead();
         // Compose a docker image equivalent to doing:
-        // FROM openliberty/open-liberty:full-java8-openj9-ubi
+        // FROM FROM open-liberty:full-java11-openj9
         // COPY src/main/liberty/config /config/
         // RUN configure.sh
         // ADD build/libs/<appFile> /config/dropins

modules/payara-micro/build.gradle

@@ -3,6 +3,7 @@ description = "Extensions for using MicroShed Testing with Payara Micro servers"
 
 dependencies {
   compile project(':microshed-testing-testcontainers')
+  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

modules/payara-micro/src/main/java/org/testcontainers/containers/payara/PayaraMicroAdapter.java

@@ -45,11 +45,11 @@ public int getDefaultHttpsPort() {
     public ImageFromDockerfile getDefaultImage(File appFile) {
         String appName = appFile.getName();
         // Compose a docker image equivalent to doing:
-        // FROM payara/micro:5.193
+        // FROM payara/micro:5.2022.5-jdk11
         // CMD ["--deploymentDir", "/opt/payara/deployments", "--noCluster"]
         // ADD target/myservice.war /opt/payara/deployments/
         ImageFromDockerfile image = new ImageFromDockerfile()
-                .withDockerfileFromBuilder(builder -> builder.from("payara/micro:5.193")
+                .withDockerfileFromBuilder(builder -> builder.from("payara/micro:5.2022.5-jdk11")
                         .cmd("--deploymentDir", "/opt/payara/deployments/", "--noCluster")
                         .add(appName, "/opt/payara/deployments/")
                         .build())

modules/payara-server/build.gradle

@@ -3,6 +3,7 @@ description = "Extensions for using MicroShed Testing with Payara servers"
 
 dependencies {
   compile project(':microshed-testing-testcontainers')
+  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

modules/payara-server/src/main/java/org/testcontainers/containers/payara/PayaraServerAdapter.java

@@ -45,10 +45,10 @@ public int getDefaultHttpsPort() {
     public ImageFromDockerfile getDefaultImage(File appFile) {
         String appName = appFile.getName();
         // Compose a docker image equivalent to doing:
-        // FROM payara/server-full:5.193
+        // FROM payara/server-full:5.2022.5-jdk11
         // ADD target/myservice.war /opt/payara/deployments/
         ImageFromDockerfile image = new ImageFromDockerfile()
-                .withDockerfileFromBuilder(builder -> builder.from("payara/server-full:5.193")
+                .withDockerfileFromBuilder(builder -> builder.from("payara/server-full:5.2022.5-jdk11")
                         .add(appName, "/opt/payara/deployments/")
                         .build())
                 .withFileFromFile(appName, appFile);

modules/quarkus/build.gradle

@@ -3,6 +3,7 @@ description = "Extensions for using MicroShed Testing with Quarkus"
 
 dependencies {
   compile project(':microshed-testing-testcontainers')
+  compileOnly project(':microshed-testing-core')
   compileOnly 'io.quarkus:quarkus-junit5:1.8.3.Final'
 }
 

modules/testcontainers/build.gradle

@@ -15,11 +15,12 @@ sourceSets {
 }
 
 dependencies {
-  compile project(':microshed-testing-core')
   compile 'org.testcontainers:junit-jupiter:1.19.1'
+  compileOnly project(':microshed-testing-core')
   testCompile 'org.eclipse.microprofile.rest.client:microprofile-rest-client-api:1.4.1'
   testCompile 'org.slf4j:slf4j-log4j12:1.7.36'
   testCompile 'org.testcontainers:mockserver:1.19.1'
+  testCompile project(':microshed-testing-core')
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 

modules/testcontainers/src/integrationTest/resources/Dockerfile

@@ -1 +1 @@
-FROM openliberty/open-liberty:full-java8-openj9-ubi
+FROM open-liberty:full-java11-openj9

modules/testcontainers/src/test/resources/Dockerfile

@@ -1 +1 @@
-FROM openliberty/open-liberty:full-java8-openj9-ubi
+FROM open-liberty:full-java11-openj9

modules/wildfly/build.gradle

@@ -3,6 +3,7 @@ description = "Extensions for using MicroShed Testing with WildFly servers"
 
 dependencies {
   compile project(':microshed-testing-testcontainers')
+  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

publish.gradle

@@ -47,13 +47,6 @@ publishing {
                         url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
                     }
                 }
-                developers {
-                    developer {
-                        id = 'aguibert'
-                        name = 'Andy Guibert'
-                        email = '[email protected]'
-                    }
-                }
                 scm {
                     connection = 'scm:git:ssh://[email protected]/MicroShed/microshed-testing.git'
                     developerConnection = 'scm:git:ssh://[email protected]/MicroShed/microshed-testing.git'

sample-apps/everything-app/Dockerfile

@@ -1,4 +1,4 @@
-FROM openliberty/open-liberty:full-java8-openj9-ubi
+FROM open-liberty:full-java11-openj9
 COPY src/main/liberty/config /config/
 ADD build/libs/myservice.war /config/dropins/
 
@@ -7,7 +7,7 @@ ADD build/libs/myservice.war /config/dropins/
 #ADD build/libs/myservice.war /opt/jboss/wildfly/standalone/deployments/
 
 # Payara
-#FROM payara/micro:5.193
+#FROM payara/micro5.2022.5-jdk11
 #CMD ["--deploymentDir", "/opt/payara/deployments", "--noCluster"]
 #ADD build/libs/myservice.war /opt/payara/deployments
 

sample-apps/everything-app/build.gradle

@@ -7,6 +7,7 @@ dependencies {
   providedCompile 'org.eclipse.microprofile:microprofile:2.1'
   compile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.11.2'
   testCompile project(':microshed-testing-testcontainers')
+  testCompile project(':microshed-testing-core')
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.36'
   testCompile 'org.testcontainers:mockserver:1.19.1'
   testCompile 'org.mock-server:mockserver-client-java:5.5.4'

sample-apps/everything-jakarta-app/Dockerfile

@@ -0,0 +1,16 @@
+FROM open-liberty:full-java11-openj9
+COPY src/main/liberty/config /config/
+ADD build/libs/myservice.war /config/dropins/
+
+# Wildfly
+#FROM jboss/wildfly
+#ADD build/libs/myservice.war /opt/jboss/wildfly/standalone/deployments/
+
+# Payara
+#FROM payara/micro:5.2022.5-jdk11
+#CMD ["--deploymentDir", "/opt/payara/deployments", "--noCluster"]
+#ADD build/libs/myservice.war /opt/payara/deployments
+
+# TomEE (not working yet)
+#FROM tomee:8-jre-8.0.0-M2-microprofile
+#COPY build/libs/myservice.war /usr/local/tomee/webapps/

sample-apps/everything-jakarta-app/build.gradle

@@ -0,0 +1,29 @@
+plugins {
+  id 'war'
+}
+
+dependencies {
+  //TODO update to Jakarta EE 10 once compiling/testing with JDK 17
+  providedCompile 'jakarta.platform:jakarta.jakartaee-api:9.0.0'
+  //TODO update to 6.1 once using Jakarta EE 10
+  providedCompile 'org.eclipse.microprofile:microprofile:5.0'
+
+  compile 'org.mongodb:mongo-java-driver:3.11.2'
+
+  testCompile project(':microshed-testing-testcontainers')
+  testCompile project(':microshed-testing-core-jakarta')
+
+  testCompile 'org.slf4j:slf4j-log4j12:1.7.36'
+  testCompile 'org.testcontainers:mockserver:1.19.1'
+  testCompile 'org.mock-server:mockserver-client-java:5.5.4'
+  testCompile 'io.rest-assured:rest-assured:5.3.2'
+
+  testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+}
+
+war.archiveName 'myservice.war'
+test.dependsOn 'war'
+
+// Always re-run tests on every build for the sake of this sample
+// In a real project, this setting would not be desirable
+test.outputs.upToDateWhen { false }