diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 17d73a1f..ef9f74d0 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -65,6 +65,10 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' # See 'Supported distributions' for available options + java-version: '17' - name: Autobuild uses: github/codeql-action/autobuild@v2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1c7ac388..b4ee6a26 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,17 +21,23 @@ jobs: strategy: fail-fast: false matrix: - jdk: ['11', '17', '20'] - distribution: ['zulu'] + jdk: ['17'] + distribution: ['temurin'] experimental: [false] include: - - jdk: '21-ea' + - jdk: '20' + distribution: zulu + experimental: true + - jdk: '21' distribution: zulu experimental: true continue-on-error: ${{ matrix.experimental }} steps: - - uses: actions/checkout@v3 + - name: Checkout Code + uses: actions/checkout@v4 + with: + show-progress: false - name: Set up JDK ${{ matrix.jdk }} uses: actions/setup-java@v3 with: @@ -53,7 +59,7 @@ jobs: fail-fast: false matrix: jdk: ['17'] - distribution: ['zulu'] + distribution: ['temurin'] experimental: [false] # include: # - jdk: '21-ea' @@ -62,7 +68,10 @@ jobs: continue-on-error: ${{ matrix.experimental }} steps: - - uses: actions/checkout@v3 + - name: Checkout Code + uses: actions/checkout@v4 + with: + show-progress: false - name: Set up JDK ${{ matrix.jdk }} uses: actions/setup-java@v3 with: diff --git a/README.md b/README.md index a6b6c701..4520dffb 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ There are multiple options to run the OSLC Server. This is the simplest option if you don't want to use anything except JDK and a Maven installation. Prerequisites: -- JDK 11 +- JDK 17 - Maven 3 Follow these steps to start 4 servers: diff --git a/model/toolchain.xml b/model/toolchain.xml index fdd7f472..8ced714b 100644 --- a/model/toolchain.xml +++ b/model/toolchain.xml @@ -42,7 +42,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -254,7 +254,7 @@ - + diff --git a/src/client-toolchain/pom.xml b/src/client-toolchain/pom.xml index ccb870de..b4cd2375 100644 --- a/src/client-toolchain/pom.xml +++ b/src/client-toolchain/pom.xml @@ -13,11 +13,11 @@ UTF-8 UTF-8 - 11 - 11 + 17 + 17 1.8.20 - 5.2.0-SNAPSHOT + 6.0.0-SNAPSHOT 2.35 1.6.4 diff --git a/src/lib-common/pom.xml b/src/lib-common/pom.xml index c456965f..377ceba2 100644 --- a/src/lib-common/pom.xml +++ b/src/lib-common/pom.xml @@ -16,10 +16,10 @@ UTF-8 UTF-8 - 11 - 11 + 17 + 17 - 5.2.0-SNAPSHOT + 6.0.0-SNAPSHOT 2.35 diff --git a/src/pom.xml b/src/pom.xml index 951bed69..310c8dfb 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -10,8 +10,8 @@ UTF-8 UTF-8 - 1.8 - 11 + 17 + 17 diff --git a/src/server-am/pom.xml b/src/server-am/pom.xml index 6b572788..b96b9c58 100644 --- a/src/server-am/pom.xml +++ b/src/server-am/pom.xml @@ -16,10 +16,10 @@ UTF-8 UTF-8 - 11 - 11 - 11 - 5.2.0-SNAPSHOT + 17 + 17 + 17 + 6.0.0-SNAPSHOT 2.35 2.2.7 3.52.5 @@ -272,6 +272,9 @@ ${application.contextpath} + <_initParams> + false + ${servlet.port} diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java index c06866bd..f1cdf2ae 100644 --- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java +++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java @@ -31,7 +31,7 @@ import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import co.oslc.refimpl.am.gen.ServerConstants; import co.oslc.refimpl.am.gen.servlet.ServiceProviderCatalogSingleton; -import co.oslc.refimpl.am.gen.auth.AuthenticationApplication;; +import co.oslc.refimpl.am.gen.auth.AuthenticationApplication; // Start of user code imports // End of user code diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java index 468aa17e..a2387cc5 100644 --- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java +++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java @@ -87,7 +87,7 @@ // End of user code /** - * Generated by Lyo Designer 5.0.1.qualifier + * Generated by Lyo Designer 6.0.0.202310032221 */ @OpenAPIDefinition(info = @Info(title = "AM", version = "1.0.0"), servers = @Server(url = "/services/")) diff --git a/src/server-am/src/main/webapp/WEB-INF/web.xml b/src/server-am/src/main/webapp/WEB-INF/web.xml index 9c9996f3..0eb8d674 100644 --- a/src/server-am/src/main/webapp/WEB-INF/web.xml +++ b/src/server-am/src/main/webapp/WEB-INF/web.xml @@ -37,10 +37,10 @@ 1 - - - + + JAX-RS Servlet @@ -55,9 +55,10 @@ CredentialsFilter /services/* - - - + + diff --git a/src/server-cm/pom.xml b/src/server-cm/pom.xml index 0d5d6e92..035d6ec8 100644 --- a/src/server-cm/pom.xml +++ b/src/server-cm/pom.xml @@ -16,10 +16,10 @@ UTF-8 UTF-8 - 11 - 11 - 11 - 5.2.0-SNAPSHOT + 17 + 17 + 17 + 6.0.0-SNAPSHOT 2.35 2.2.7 3.52.5 @@ -278,6 +278,9 @@ ${application.contextpath} + <_initParams> + false + ${servlet.port} diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java index ae8a7917..6a5100d1 100644 --- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java +++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java @@ -31,7 +31,7 @@ import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import co.oslc.refimpl.cm.gen.ServerConstants; import co.oslc.refimpl.cm.gen.servlet.ServiceProviderCatalogSingleton; -import co.oslc.refimpl.cm.gen.auth.AuthenticationApplication;; +import co.oslc.refimpl.cm.gen.auth.AuthenticationApplication; // Start of user code imports // End of user code diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java index 749478fa..1827603c 100644 --- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java +++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java @@ -103,7 +103,7 @@ // End of user code /** - * Generated by Lyo Designer 5.0.1.qualifier + * Generated by Lyo Designer 6.0.0.202310032221 */ @OpenAPIDefinition(info = @Info(title = "CM", version = "1.0.0"), servers = @Server(url = "/services/")) diff --git a/src/server-cm/src/main/webapp/WEB-INF/web.xml b/src/server-cm/src/main/webapp/WEB-INF/web.xml index 3ebfc258..f30c2f17 100644 --- a/src/server-cm/src/main/webapp/WEB-INF/web.xml +++ b/src/server-cm/src/main/webapp/WEB-INF/web.xml @@ -37,10 +37,10 @@ 1 - - - + + JAX-RS Servlet @@ -55,9 +55,10 @@ CredentialsFilter /services/* - - - + + diff --git a/src/server-qm/pom.xml b/src/server-qm/pom.xml index 4c995c67..6016d81d 100644 --- a/src/server-qm/pom.xml +++ b/src/server-qm/pom.xml @@ -16,10 +16,10 @@ UTF-8 UTF-8 - 11 - 11 - 11 - 5.2.0-SNAPSHOT + 17 + 17 + 17 + 6.0.0-SNAPSHOT 2.35 2.2.7 3.52.5 @@ -272,6 +272,9 @@ ${application.contextpath} + <_initParams> + false + ${servlet.port} diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java index 841b14a0..318d4c21 100644 --- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java +++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java @@ -31,7 +31,7 @@ import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import co.oslc.refimpl.qm.gen.ServerConstants; import co.oslc.refimpl.qm.gen.servlet.ServiceProviderCatalogSingleton; -import co.oslc.refimpl.qm.gen.auth.AuthenticationApplication;; +import co.oslc.refimpl.qm.gen.auth.AuthenticationApplication; // Start of user code imports // End of user code diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java index f6e0a23d..d84587de 100644 --- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java +++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java @@ -115,7 +115,7 @@ // End of user code /** - * Generated by Lyo Designer 5.0.1.qualifier + * Generated by Lyo Designer 6.0.0.202310032221 */ @OpenAPIDefinition(info = @Info(title = "QM", version = "1.0.0"), servers = @Server(url = "/services/")) diff --git a/src/server-qm/src/main/webapp/WEB-INF/web.xml b/src/server-qm/src/main/webapp/WEB-INF/web.xml index c249183b..8d178cd5 100644 --- a/src/server-qm/src/main/webapp/WEB-INF/web.xml +++ b/src/server-qm/src/main/webapp/WEB-INF/web.xml @@ -37,10 +37,10 @@ 1 - - - + + JAX-RS Servlet @@ -55,9 +55,10 @@ CredentialsFilter /services/* - - - + + diff --git a/src/server-rm/pom.xml b/src/server-rm/pom.xml index 4b269295..eaa79258 100644 --- a/src/server-rm/pom.xml +++ b/src/server-rm/pom.xml @@ -16,10 +16,10 @@ UTF-8 UTF-8 - 11 - 11 - 11 - 5.2.0-SNAPSHOT + 17 + 17 + 17 + 6.0.0-SNAPSHOT 2.35 2.2.7 3.52.5 @@ -298,6 +298,9 @@ ${application.contextpath} + <_initParams> + false + ${servlet.port} diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java index efd12472..92c00f7d 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java @@ -31,7 +31,7 @@ import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import co.oslc.refimpl.rm.gen.ServerConstants; import co.oslc.refimpl.rm.gen.servlet.ServiceProviderCatalogSingleton; -import co.oslc.refimpl.rm.gen.auth.AuthenticationApplication;; +import co.oslc.refimpl.rm.gen.auth.AuthenticationApplication; // Start of user code imports // End of user code diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java index c2d824a7..6f479020 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java @@ -84,7 +84,7 @@ // End of user code /** - * Generated by Lyo Designer 5.0.1.qualifier + * Generated by Lyo Designer 6.0.0.202310032221 */ @OpenAPIDefinition(info = @Info(title = "RM", version = "1.0.0"), servers = @Server(url = "/services/")) diff --git a/src/server-rm/src/main/webapp/WEB-INF/web.xml b/src/server-rm/src/main/webapp/WEB-INF/web.xml index deaeb54b..77903237 100644 --- a/src/server-rm/src/main/webapp/WEB-INF/web.xml +++ b/src/server-rm/src/main/webapp/WEB-INF/web.xml @@ -37,9 +37,9 @@ 1 - - + @@ -55,9 +55,10 @@ CredentialsFilter /services/* - - +