Üpdate to Lyo 6.0.0-SNAPSHOT and Java 17 (#185)

Update to Lyo 6.0.0-SNAPSHOT and Java 17
oslc-op · Oct 5, 2023 · 83d768a · 83d768a
1 parent 0f2ab05
commit 83d768a
Show file tree

Hide file tree

Showing 23 changed files with 100 additions and 71 deletions.
diff --git 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
@@ -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
@@ -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
@@ -42,7 +42,7 @@
     <requiredAdaptors xsi:type="oslc4j_ai:GenericRequiredAdaptor" serviceProviderCatalogURI="http://your.host.com/adaptor/services/catalog/singleton" name="GenericRequiredAdaptor"/>
     <configuration xsi:type="oslc4j_ai:MavenServerConfiguration" rootServerBaseUrl="http://localhost:8800/" applicationContextPath="/" servletUrlPattern="/services/*" jettyPort="8800">
       <generalConfiguration doNotGenerateFromImportedModels="true" filesBasePath="../src/server-rm/" javaBasePackageName="co.oslc.refimpl.rm.gen"/>
-      <projectConfiguration xsi:type="oslc4j_ai:MavenProjectConfiguration" lyoVersion="5.1.0-alpha" groupId="co.oslc.refimpl" artifactId="server-rm" version="0.3.0-SNAPSHOT"/>
+      <projectConfiguration xsi:type="oslc4j_ai:MavenProjectConfiguration" lyoVersion="6.0.0-SNAPSHOT" groupId="co.oslc.refimpl" artifactId="server-rm" version="0.3.0-SNAPSHOT"/>
       <authenticationConfiguration applicationName="RM" oauthRealm="RM"/>
     </configuration>
   </adaptorInterfaces>
@@ -116,7 +116,7 @@
     <requiredAdaptors xsi:type="oslc4j_ai:GenericRequiredAdaptor" serviceProviderCatalogURI="http://your.host.com/adaptor/services/catalog/singleton" name="GenericRequiredAdaptor"/>
     <configuration xsi:type="oslc4j_ai:MavenServerConfiguration" rootServerBaseUrl="http://localhost:8801/" applicationContextPath="/" servletUrlPattern="/services/*" generateJspFilesForOslcUI="true" jettyPort="8801">
       <generalConfiguration doNotGenerateFromImportedModels="true" filesBasePath="../src/server-cm/" javaBasePackageName="co.oslc.refimpl.cm.gen"/>
-      <projectConfiguration xsi:type="oslc4j_ai:MavenProjectConfiguration" lyoVersion="5.1.0-alpha" groupId="co.oslc.refimpl" artifactId="server-cm" version="0.3.0-SNAPSHOT"/>
+      <projectConfiguration xsi:type="oslc4j_ai:MavenProjectConfiguration" lyoVersion="6.0.0-SNAPSHOT" groupId="co.oslc.refimpl" artifactId="server-cm" version="0.3.0-SNAPSHOT"/>
       <authenticationConfiguration applicationName="CM" oauthRealm="CM"/>
     </configuration>
   </adaptorInterfaces>
@@ -209,7 +209,7 @@
     <requiredAdaptors xsi:type="oslc4j_ai:GenericRequiredAdaptor" serviceProviderCatalogURI="http://your.host.com/adaptor/services/catalog/singleton" name="GenericRequiredAdaptor"/>
     <configuration xsi:type="oslc4j_ai:MavenServerConfiguration" rootServerBaseUrl="http://localhost:8802/" applicationContextPath="/" servletUrlPattern="/services/*" jettyPort="8802">
       <generalConfiguration doNotGenerateFromImportedModels="true" filesBasePath="../src/server-qm/" javaBasePackageName="co.oslc.refimpl.qm.gen"/>
-      <projectConfiguration xsi:type="oslc4j_ai:MavenProjectConfiguration" lyoVersion="5.1.0-alpha" groupId="co.oslc.refimpl" artifactId="server-qm" version="0.3.0-SNAPSHOT"/>
+      <projectConfiguration xsi:type="oslc4j_ai:MavenProjectConfiguration" lyoVersion="6.0.0-SNAPSHOT" groupId="co.oslc.refimpl" artifactId="server-qm" version="0.3.0-SNAPSHOT"/>
       <authenticationConfiguration applicationName="QM" oauthRealm="QM"/>
     </configuration>
   </adaptorInterfaces>
@@ -254,7 +254,7 @@
     <requiredAdaptors xsi:type="oslc4j_ai:GenericRequiredAdaptor" serviceProviderCatalogURI="http://your.host.com/adaptor/services/catalog/singleton" name="GenericRequiredAdaptor"/>
     <configuration xsi:type="oslc4j_ai:MavenServerConfiguration" rootServerBaseUrl="http://localhost:8803/" applicationContextPath="/" servletUrlPattern="/services/*" jettyPort="8803">
       <generalConfiguration doNotGenerateFromImportedModels="true" filesBasePath="../src/server-am/" javaBasePackageName="co.oslc.refimpl.am.gen"/>
-      <projectConfiguration xsi:type="oslc4j_ai:MavenProjectConfiguration" lyoVersion="5.1.0-alpha" groupId="co.oslc.refimpl" artifactId="server-am" version="0.3.0-SNAPSHOT"/>
+      <projectConfiguration xsi:type="oslc4j_ai:MavenProjectConfiguration" lyoVersion="6.0.0-SNAPSHOT" groupId="co.oslc.refimpl" artifactId="server-am" version="0.3.0-SNAPSHOT"/>
       <authenticationConfiguration applicationName="AM" oauthRealm="AM"/>
     </configuration>
   </adaptorInterfaces>

diff --git a/src/client-toolchain/pom.xml b/src/client-toolchain/pom.xml
@@ -13,11 +13,11 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
 
     <v.kotlin>1.8.20</v.kotlin>
-    <v.lyo>5.2.0-SNAPSHOT</v.lyo>
+    <v.lyo>6.0.0-SNAPSHOT</v.lyo>
 <!--    <v.lyo.oslc-ui>${v.lyo}</v.lyo.oslc-ui>-->
     <v.jersey>2.35</v.jersey>
     <v.kotlin.coroutines>1.6.4</v.kotlin.coroutines>

diff --git a/src/lib-common/pom.xml b/src/lib-common/pom.xml
@@ -16,10 +16,10 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
 
-    <version.lyo>5.2.0-SNAPSHOT</version.lyo>
+    <version.lyo>6.0.0-SNAPSHOT</version.lyo>
 <!--    <version.lyo>5.0.1.CR</version.lyo>-->
     <version.jersey>2.35</version.jersey>
   </properties>

diff --git a/src/pom.xml b/src/pom.xml
@@ -10,8 +10,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <modules>

diff --git a/src/server-am/pom.xml b/src/server-am/pom.xml
@@ -16,10 +16,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.compiler.release>11</maven.compiler.release>
-        <version.lyo>5.2.0-SNAPSHOT</version.lyo>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
+        <version.lyo>6.0.0-SNAPSHOT</version.lyo>
         <jersey.version>2.35</jersey.version>
         <swagger.version>2.2.7</swagger.version>
         <swagger-ui.version>3.52.5</swagger-ui.version>
@@ -272,6 +272,9 @@
                 <configuration>
                   <webApp>
                     <contextPath>${application.contextpath}</contextPath>
+                    <_initParams>
+                        <org.eclipse.jetty.servlet.Default.useFileMappedBuffer>false</org.eclipse.jetty.servlet.Default.useFileMappedBuffer>
+                    </_initParams>
                   </webApp>
                   <httpConnector>
                     <port>${servlet.port}</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
@@ -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
@@ -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
@@ -37,10 +37,10 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    <!-- Start of user code webxml3
-  -->
-  <!-- TODO: Add additional configurations here to avoid them be overrriden upon future re-generation -->
-  <!-- End of user code
+    <!-- Start of user code webxml_servlet
+    -->
+    <!-- TODO: Add additional configurations here to avoid them be overridden upon future re-generation -->
+    <!-- End of user code
     -->
     <servlet-mapping>
         <servlet-name>JAX-RS Servlet</servlet-name>
@@ -55,9 +55,10 @@
         <filter-name>CredentialsFilter</filter-name>
         <url-pattern>/services/*</url-pattern>
     </filter-mapping>
-    <!-- Start of user code webxml4
-  -->
-  <!-- TODO: Add additional configurations here to avoid them be overrriden upon future re-generation -->
-  <!-- End of user code
+
+    <!-- Start of user code webxml_final
+    -->
+    <!-- TODO: Add additional configurations here to avoid them be overridden upon future re-generation -->
+    <!-- End of user code
     -->
 </web-app>
diff --git a/src/server-cm/pom.xml b/src/server-cm/pom.xml
@@ -16,10 +16,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.compiler.release>11</maven.compiler.release>
-        <version.lyo>5.2.0-SNAPSHOT</version.lyo>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
+        <version.lyo>6.0.0-SNAPSHOT</version.lyo>
         <jersey.version>2.35</jersey.version>
         <swagger.version>2.2.7</swagger.version>
         <swagger-ui.version>3.52.5</swagger-ui.version>
@@ -278,6 +278,9 @@
                 <configuration>
                   <webApp>
                     <contextPath>${application.contextpath}</contextPath>
+                    <_initParams>
+                        <org.eclipse.jetty.servlet.Default.useFileMappedBuffer>false</org.eclipse.jetty.servlet.Default.useFileMappedBuffer>
+                    </_initParams>
                   </webApp>
                   <httpConnector>
                     <port>${servlet.port}</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
@@ -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
@@ -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
@@ -37,10 +37,10 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    <!-- Start of user code webxml3
-  -->
-  <!-- TODO: Add additional configurations here to avoid them be overrriden upon future re-generation -->
-  <!-- End of user code
+    <!-- Start of user code webxml_servlet
+    -->
+    <!-- TODO: Add additional configurations here to avoid them be overridden upon future re-generation -->
+    <!-- End of user code
     -->
     <servlet-mapping>
         <servlet-name>JAX-RS Servlet</servlet-name>
@@ -55,9 +55,10 @@
         <filter-name>CredentialsFilter</filter-name>
         <url-pattern>/services/*</url-pattern>
     </filter-mapping>
-    <!-- Start of user code webxml4
-  -->
-  <!-- TODO: Add additional configurations here to avoid them be overrriden upon future re-generation -->
-  <!-- End of user code
+
+    <!-- Start of user code webxml_final
+    -->
+    <!-- TODO: Add additional configurations here to avoid them be overridden upon future re-generation -->
+    <!-- End of user code
     -->
 </web-app>
diff --git a/src/server-qm/pom.xml b/src/server-qm/pom.xml
@@ -16,10 +16,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.compiler.release>11</maven.compiler.release>
-        <version.lyo>5.2.0-SNAPSHOT</version.lyo>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
+        <version.lyo>6.0.0-SNAPSHOT</version.lyo>
         <jersey.version>2.35</jersey.version>
         <swagger.version>2.2.7</swagger.version>
         <swagger-ui.version>3.52.5</swagger-ui.version>
@@ -272,6 +272,9 @@
                 <configuration>
                   <webApp>
                     <contextPath>${application.contextpath}</contextPath>
+                    <_initParams>
+                        <org.eclipse.jetty.servlet.Default.useFileMappedBuffer>false</org.eclipse.jetty.servlet.Default.useFileMappedBuffer>
+                    </_initParams>
                   </webApp>
                   <httpConnector>
                     <port>${servlet.port}</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
@@ -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
@@ -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
@@ -37,10 +37,10 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    <!-- Start of user code webxml3
-  -->
-  <!-- TODO: Add additional configurations here to avoid them be overrriden upon future re-generation -->
-  <!-- End of user code
+    <!-- Start of user code webxml_servlet
+    -->
+    <!-- TODO: Add additional configurations here to avoid them be overridden upon future re-generation -->
+    <!-- End of user code
     -->
     <servlet-mapping>
         <servlet-name>JAX-RS Servlet</servlet-name>
@@ -55,9 +55,10 @@
         <filter-name>CredentialsFilter</filter-name>
         <url-pattern>/services/*</url-pattern>
     </filter-mapping>
-    <!-- Start of user code webxml4
-  -->
-  <!-- TODO: Add additional configurations here to avoid them be overrriden upon future re-generation -->
-  <!-- End of user code
+
+    <!-- Start of user code webxml_final
+    -->
+    <!-- TODO: Add additional configurations here to avoid them be overridden upon future re-generation -->
+    <!-- End of user code
     -->
 </web-app>
diff --git a/src/server-rm/pom.xml b/src/server-rm/pom.xml
@@ -16,10 +16,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.compiler.release>11</maven.compiler.release>
-        <version.lyo>5.2.0-SNAPSHOT</version.lyo>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
+        <version.lyo>6.0.0-SNAPSHOT</version.lyo>
         <jersey.version>2.35</jersey.version>
         <swagger.version>2.2.7</swagger.version>
         <swagger-ui.version>3.52.5</swagger-ui.version>
@@ -298,6 +298,9 @@
                 <configuration>
                   <webApp>
                     <contextPath>${application.contextpath}</contextPath>
+                    <_initParams>
+                        <org.eclipse.jetty.servlet.Default.useFileMappedBuffer>false</org.eclipse.jetty.servlet.Default.useFileMappedBuffer>
+                    </_initParams>
                   </webApp>
                   <httpConnector>
                     <port>${servlet.port}</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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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:
@@ Expand Down @@