Support for jetty12 (#507)

Support for jetty12

Author: Jad-el-khoury

model/toolchain.xml

@@ -38,7 +38,7 @@
       <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_pnz6IJUdEeq-KoPaR9_Cfg"/>
       <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_pn2WYZUdEeq-KoPaR9_Cfg"/>
     </webServices>
-    <trsService xsi:type="oslc4j_ai:InmemPagedTrsService" basePageLimit="50" changeLogPageLimit="50"/>
+    <trsService xsi:type="oslc4j_ai:InmemPagedTrsService" basePageLimit="5" changeLogPageLimit="5"/>
     <specification/>
     <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">

src/lib-common/pom.xml

@@ -96,4 +96,22 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <version>3.14.1</version>
+              <configuration>
+                <compilerArgument>
+                  -Xlint:fallthrough,unchecked,removal,deprecation,dep-ann,varargs,overloads,serial,try,finally
+                </compilerArgument>
+              </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

src/server-am/Dockerfile

@@ -32,6 +32,6 @@ LABEL org.opencontainers.image.licenses="EPL-2.0"
 
 COPY --from=build /src/server-am/target/*.war /var/lib/jetty/webapps/ROOT.war
 
-RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl
+RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee10-deploy,ee10-jsp,ee10-jstl
 
 EXPOSE 8080

src/server-am/pom.xml

@@ -286,14 +286,15 @@
     <build>
         <finalName>${application.filename}</finalName>
         <plugins>
-            <!-- Start of user code plugins
-      -->
+            <!-- Start of user code plugins_start
+            -->
+            <!-- TODO: Add additional plugins here to avoid them be overridden upon future re-generation -->
+            <!-- End of user code
+            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
             </plugin>
-            <!-- End of user code
-            -->
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-compiler-plugin</artifactId>
@@ -305,9 +306,9 @@
               </configuration>
             </plugin>
             <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>11.0.20</version>
+                <groupId>org.eclipse.jetty.ee10</groupId>
+                <artifactId>jetty-ee10-maven-plugin</artifactId>
+                <version>12.0.16</version>
                 <configuration>
                   <webApp>
                     <contextPath>${application.contextpath}</contextPath>
@@ -396,7 +397,7 @@
                 </configuration>
             </plugin>
 
-            <!-- Start of user code plugins
+            <!-- Start of user code plugins_final
             -->
             <!-- End of user code
             -->