Revised Dockerfiles to use ubi-minimal:8.5-204, Updated to current Quarkus 2.4.1.Final

independentid · independentid · commit 0b6a0989966d · 2021-11-12T10:05:44.000-08:00
diff --git a/i2scim-server/pom.xml b/i2scim-server/pom.xml
@@ -38,6 +38,10 @@
             <artifactId>i2scim-core</artifactId>
             <version>0.6.1</version>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
 
     </dependencies>
     <profiles>
diff --git a/i2scim-server/src/main/java/com/independentid/scim/filter/OpaSecurityFilter.java b/i2scim-server/src/main/java/com/independentid/scim/filter/OpaSecurityFilter.java
@@ -89,7 +89,6 @@ public class OpaSecurityFilter implements Filter {
      * @param filterConfig a <code>FilterConfig</code> object containing the filter's configuration and initialization
      *                     parameters
      * @throws ServletException if an exception has occurred that interferes with the filter's normal operation
-     * @implSpec The default implementation takes no action.
      */
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
@@ -208,7 +207,6 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
      * file handles, threads) and make sure that any persistent state is synchronized with the filter's current state in
      * memory.
      * </p>
-     * @implSpec The default implementation takes no action.
      */
     @Override
     public void destroy() {
diff --git a/pkg-i2scim-prov-memory/src/main/docker/Dockerfile.fast-jar b/pkg-i2scim-prov-memory/src/main/docker/Dockerfile.fast-jar
@@ -27,7 +27,7 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/scim-quarkus-jvm
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
 
 ARG JAVA_PACKAGE=java-11-openjdk-headless
 ARG RUN_JAVA_VERSION=1.3.8
diff --git a/pkg-i2scim-prov-memory/src/main/docker/Dockerfile.jvm b/pkg-i2scim-prov-memory/src/main/docker/Dockerfile.jvm
@@ -27,7 +27,7 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" independentid/i2scim-mem:<version>
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5-204
 
 ARG JAVA_PACKAGE=java-11-openjdk-headless
 ARG RUN_JAVA_VERSION=1.3.8
diff --git a/pkg-i2scim-prov-memory/src/main/docker/Dockerfile.legacy-jar b/pkg-i2scim-prov-memory/src/main/docker/Dockerfile.legacy-jar
@@ -21,7 +21,7 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/scim-quarkus-legacy-jar
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
 
 ARG JAVA_PACKAGE=java-11-openjdk-headless
 ARG RUN_JAVA_VERSION=1.3.8
diff --git a/pkg-i2scim-prov-memory/src/main/docker/Dockerfile.native b/pkg-i2scim-prov-memory/src/main/docker/Dockerfile.native
@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/scim-quarkus
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
diff --git a/pkg-i2scim-prov-mongodb/src/main/docker/Dockerfile.fast-jar b/pkg-i2scim-prov-mongodb/src/main/docker/Dockerfile.fast-jar
@@ -27,7 +27,7 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/scim-quarkus-jvm
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
 
 ARG JAVA_PACKAGE=java-11-openjdk-headless
 ARG RUN_JAVA_VERSION=1.3.8
diff --git a/pkg-i2scim-prov-mongodb/src/main/docker/Dockerfile.jvm b/pkg-i2scim-prov-mongodb/src/main/docker/Dockerfile.jvm
@@ -27,7 +27,7 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" independentid/i2scim-mongo:<version>
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5-204
 
 ARG JAVA_PACKAGE=java-11-openjdk-headless
 ARG RUN_JAVA_VERSION=1.3.8
diff --git a/pkg-i2scim-prov-mongodb/src/main/docker/Dockerfile.legacy-jar b/pkg-i2scim-prov-mongodb/src/main/docker/Dockerfile.legacy-jar
@@ -21,7 +21,7 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/scim-quarkus-legacy-jar
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
 
 ARG JAVA_PACKAGE=java-11-openjdk-headless
 ARG RUN_JAVA_VERSION=1.3.8
diff --git a/pkg-i2scim-prov-mongodb/src/main/docker/Dockerfile.native b/pkg-i2scim-prov-mongodb/src/main/docker/Dockerfile.native
@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/scim-quarkus
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
     <licenses>
         <license>
             <name>The Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
     <developers>
@@ -56,7 +56,7 @@
         <module>i2scim-client</module>
     </modules>
     <properties>
-        <i2scim.version>0.6.0-Alpha</i2scim.version>
+        <i2scim.version>0.6.1</i2scim.version>
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <maven.compiler.parameters>true</maven.compiler.parameters>
         <maven.compiler.source>11</maven.compiler.source>
@@ -65,7 +65,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>2.1.3.Final</quarkus.platform.version>
+        <quarkus.platform.version>2.4.1.Final</quarkus.platform.version>
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
     </properties>
     <distributionManagement>

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/scim-quarkus-jvm`
`28`	`28`	`#`
`29`	`29`	`###`
`30`		`-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3`
	`30`	`+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4`
`31`	`31`
`32`	`32`	`ARG JAVA_PACKAGE=java-11-openjdk-headless`
`33`	`33`	`ARG RUN_JAVA_VERSION=1.3.8`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/scim-quarkus-legacy-jar`
`22`	`22`	`#`
`23`	`23`	`###`
`24`		`-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3`
	`24`	`+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4`
`25`	`25`
`26`	`26`	`ARG JAVA_PACKAGE=java-11-openjdk-headless`
`27`	`27`	`ARG RUN_JAVA_VERSION=1.3.8`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`# docker run -i --rm -p 8080:8080 quarkus/scim-quarkus`
`15`	`15`	`#`
`16`	`16`	`###`
`17`		`-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3`
	`17`	`+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4`
`18`	`18`	`WORKDIR /work/`
`19`	`19`	`RUN chown 1001 /work \`
`20`	`20`	`&& chmod "g+rwX" /work \`