diff --git a/.github/workflows/on-code-change.yml b/.github/workflows/on-code-change.yml index 5aef4bc..d692589 100644 --- a/.github/workflows/on-code-change.yml +++ b/.github/workflows/on-code-change.yml @@ -26,7 +26,7 @@ jobs: env: NEXUS_INTERNAL_URL: ${{ secrets.NEXUS_INTERNAL_URL }} container: - image: jahia/cimg-mvn-cache:ga_cimg_openjdk_11.0.20-node + image: jahia/cimg-mvn-cache:ga_cimg_openjdk_17.0.9-node credentials: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} diff --git a/.github/workflows/on-merge.yml b/.github/workflows/on-merge.yml index 5358a61..44dc03a 100644 --- a/.github/workflows/on-merge.yml +++ b/.github/workflows/on-merge.yml @@ -29,7 +29,7 @@ jobs: env: NEXUS_INTERNAL_URL: https://devtools.jahia.com/nexus/content/groups/internal/ container: - image: jahia/cimg-mvn-cache:ga_cimg_openjdk_11.0.20-node + image: jahia/cimg-mvn-cache:ga_cimg_openjdk_17.0.9-node credentials: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} @@ -111,7 +111,7 @@ jobs: if: github.ref == 'refs/heads/main' runs-on: self-hosted container: - image: jahia/cimg-mvn-cache:ga_cimg_openjdk_11.0.20-node + image: jahia/cimg-mvn-cache:ga_cimg_openjdk_17.0.9-node credentials: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml index 1f69b74..3402272 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release.yml @@ -15,7 +15,7 @@ jobs: # downloading the entire world when building. # More on https://github.com/Jahia/cimg-mvn-cache container: - image: jahia/cimg-mvn-cache:ga_cimg_openjdk_11.0.20-node + image: jahia/cimg-mvn-cache:ga_cimg_openjdk_17.0.9-node credentials: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} diff --git a/javascript-modules-engine-java/.java-ts-bind/package.json b/javascript-modules-engine-java/.java-ts-bind/package.json index 1fa1642..d74f7f2 100644 --- a/javascript-modules-engine-java/.java-ts-bind/package.json +++ b/javascript-modules-engine-java/.java-ts-bind/package.json @@ -2,7 +2,7 @@ "tsbindOptions": { "in": [ "src/main/java", - "target/java-ts-bind/sources/jdk11u-master/src/java.base/share/classes", + "target/java-ts-bind/sources/jdk17u-master/src/java.base/share/classes", "target/java-ts-bind/sources/dependencies" ], "symbols": [ diff --git a/javascript-modules-engine-java/pom.xml b/javascript-modules-engine-java/pom.xml index 7ab3f9a..066d3d9 100644 --- a/javascript-modules-engine-java/pom.xml +++ b/javascript-modules-engine-java/pom.xml @@ -28,44 +28,6 @@ This is the Java part of the Javascript modules engine. - - org.osgi - osgi.annotation - ${osgi.version} - provided - - - - org.ops4j.pax.swissbox - pax-swissbox-bnd - 1.8.3 - - - org.slf4j - slf4j-api - - - - - - org.apache.felix - org.apache.felix.fileinstall - ${felix.fileinstall.version} - provided - - - - org.graalvm.sdk - graal-sdk - 22.3.3 - provided - - - - org.apache.commons - commons-pool2 - 2.9.0 - @@ -82,12 +44,7 @@ 2.0 provided - - javax.servlet.jsp - jsp-api - 2.1 - provided - + javax.servlet javax.servlet-api @@ -111,7 +68,7 @@ maven-compiler-plugin 3.11.0 - 11 + 17 @@ -127,10 +84,10 @@ - - + + - + diff --git a/javascript-modules-engine/pom.xml b/javascript-modules-engine/pom.xml index 7e01707..e2c9a88 100644 --- a/javascript-modules-engine/pom.xml +++ b/javascript-modules-engine/pom.xml @@ -40,91 +40,10 @@ v18.12.0 v1.22.19 + osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))" - - org.osgi - osgi.annotation - ${osgi.version} - provided - - - - - - - - - - - - org.ops4j.pax.swissbox - pax-swissbox-bnd - 1.8.3 - - - org.slf4j - slf4j-api - - - - - - org.apache.felix - org.apache.felix.fileinstall - ${felix.fileinstall.version} - provided - - - - org.slf4j - slf4j-simple - 1.7.26 - provided - - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - - org.graalvm.sdk - graal-sdk - 22.3.3 - provided - - - - org.apache.commons - commons-pool2 - 2.9.0 - - - - org.jahia.modules - graphql-dxm-provider - 2.7.0 - provided - - - - io.github.graphql-java - graphql-java-annotations - ${graphql-java-annotations.version} - provided - - - - pl.touk - throwing-function - 1.3 - provided - - ${project.groupId} javascript-modules-library @@ -268,7 +187,7 @@ maven-compiler-plugin 3.11.0 - 11 + 17 diff --git a/javascript-modules-engine/tests/jahia-module/yarn.lock b/javascript-modules-engine/tests/jahia-module/yarn.lock index d5fec95..4eb2135 100644 --- a/javascript-modules-engine/tests/jahia-module/yarn.lock +++ b/javascript-modules-engine/tests/jahia-module/yarn.lock @@ -1703,7 +1703,7 @@ __metadata: "@jahia/javascript-modules-library@file:../../../javascript-modules-library/dist::locator=%40jahia%2Fnpm-module-example%40workspace%3A.": version: 0.3.0-SNAPSHOT - resolution: "@jahia/javascript-modules-library@file:../../../javascript-modules-library/dist#../../../javascript-modules-library/dist::hash=ea8139&locator=%40jahia%2Fnpm-module-example%40workspace%3A." + resolution: "@jahia/javascript-modules-library@file:../../../javascript-modules-library/dist#../../../javascript-modules-library/dist::hash=0531a1&locator=%40jahia%2Fnpm-module-example%40workspace%3A." dependencies: graphql: "npm:^16.0.1" graphql-tag: "npm:^2.12.6" @@ -1711,7 +1711,7 @@ __metadata: prop-types: "npm:^15.8.1" react: "npm:^18.2.0" react-i18next: "npm:^14.1.0" - checksum: 10/578e5681989e76167eb37cb74f2efdc18cfc61f0971747f9eeca0cc94d8cc6032a829e7744e0e1697ed04ec160069fe2837907426a6d0b5cdddb3246d28d1994 + checksum: 10/95cbb053f952ea849c2eb11491a09e1b9b593335c59e36072e5e66851f6e6f449a868309888ca2b60b719354c7dbff11004451b5188c8a0cef15691ccf48d4c5 languageName: node linkType: hard @@ -8056,11 +8056,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.3.3#optional!builtin": version: 5.6.3 - resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin::version=5.6.3&hash=379a07" + resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin::version=5.6.3&hash=8c6c40" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/dc4bec403cd33a204b655b1152a096a08e7bad2c931cb59ef8ff26b6f2aa541bf98f09fc157958a60c921b1983a8dde9a85b692f9de60fa8f574fd131e3ae4dd + checksum: 10/00504c01ee42d470c23495426af07512e25e6546bce7e24572e72a9ca2e6b2e9bea63de4286c3cfea644874da1467dcfca23f4f98f7caf20f8b03c0213bb6837 languageName: node linkType: hard diff --git a/javascript-modules-engine/tests/yarn.lock b/javascript-modules-engine/tests/yarn.lock index a4e39e2..3442645 100644 --- a/javascript-modules-engine/tests/yarn.lock +++ b/javascript-modules-engine/tests/yarn.lock @@ -165,9 +165,9 @@ __metadata: languageName: node linkType: hard -"@jahia/cypress@npm:^3.35.0": - version: 3.35.0 - resolution: "@jahia/cypress@npm:3.35.0" +"@jahia/cypress@npm:^3.34.0": + version: 3.34.0 + resolution: "@jahia/cypress@npm:3.34.0" dependencies: "@apollo/client": "npm:^3.4.9" cypress-real-events: "npm:^1.11.0" @@ -178,7 +178,7 @@ __metadata: ci.startup: ci.startup.sh env.debug: env.debug.sh env.run: env.run.sh - checksum: 10c0/91da095565d7b8008e6e4a8e53d6c9714de8c5310f84d7f3baa1659eb5226a6a5ec49f1bdd31242f140d8a035cc7879e40fe083a8db4c20d1c314ff2956e5811 + checksum: 10c0/b3fbb673d4409b9d99bf626baa5cd4b730d50d231177a7761d4cbd48fbadc444ec1d06f18dbe3c2d19d2a063cf312eb495c2c7ffd387944fb5991b0abc5aa4cd languageName: node linkType: hard @@ -224,7 +224,7 @@ __metadata: resolution: "@jahia/javascript-modules-engine-cypress@workspace:." dependencies: "@4tw/cypress-drag-drop": "npm:^2.2.1" - "@jahia/cypress": "npm:^3.35.0" + "@jahia/cypress": "npm:^3.34.0" "@jahia/jahia-reporter": "npm:^1.0.30" "@jahia/jcontent-cypress": "npm:^3.0.0-tests.8" "@types/node": "npm:^18.11.18" diff --git a/pom.xml b/pom.xml index bee8794..806a014 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,8 @@ limitations under the License. --> - + 4.0.0 jahia-modules @@ -27,7 +28,9 @@ Javascript Modules 0.3.0-SNAPSHOT pom - Multi-module project with the backend engine and the frontend library allowing Javascript modules to run on a Jahia server. + Multi-module project with the backend engine and the frontend library allowing Javascript modules to + run on a Jahia server. + scm:git:git@github.com:Jahia/javascript-modules.git @@ -56,6 +59,81 @@ + + + org.osgi + osgi.annotation + ${osgi.version} + provided + + + + org.ops4j.pax.swissbox + pax-swissbox-bnd + 1.8.3 + + + org.slf4j + slf4j-api + + + + + + org.apache.felix + org.apache.felix.fileinstall + ${felix.fileinstall.version} + provided + + + + org.slf4j + slf4j-simple + 1.7.26 + provided + + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + + org.graalvm.sdk + graal-sdk + 23.0.2 + provided + + + + org.apache.commons + commons-pool2 + 2.9.0 + + + + org.jahia.modules + graphql-dxm-provider + 2.7.0 + provided + + + + io.github.graphql-java + graphql-java-annotations + ${graphql-java-annotations.version} + provided + + + + pl.touk + throwing-function + 1.3 + provided + + @@ -101,8 +179,12 @@ maven-scm-plugin - javascript-modules-engine/yarn.lock,javascript-modules-engine/tests/jahia-module/yarn.lock - [skip ci] [maven-release-plugin] Update yarn.lock files for version ${project.version} + + javascript-modules-engine/yarn.lock,javascript-modules-engine/tests/jahia-module/yarn.lock + + [skip ci] [maven-release-plugin] Update yarn.lock files for version + ${project.version} +