Merge branch 'release/v1.6.1-1'

Author: Vincent

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.6.1-1] - 2022-05-11
+
+### Security
+- java base image
+- updated some maven dependencies
+
 ## [v1.6.0-2] - 2022-04-29
 
 ### Fixed

Dockerfile

@@ -5,10 +5,10 @@ RUN set -x \
  && ./mvnw package
 
 
-FROM registry.cloudogu.com/official/java:8u302-1
+FROM registry.cloudogu.com/official/java:8u302-3
 
 LABEL NAME="official/usermgt" \
-   VERSION="1.6.0-2" \
+   VERSION="1.6.1-1" \
    maintainer="[email protected]"
 
 # mark as webapp for nginx

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=usermgt
-VERSION=1.6.0-2
+VERSION=1.6.1-1
 # overwrite ADDITIONAL_LDFLAGS to disable static compilation
 # this should fix https://github.com/golang/go/issues/13470
 ADDITIONAL_LDFLAGS=""

app/pom.xml

@@ -97,7 +97,7 @@
     <dependency>
       <groupId>org.apache.santuario</groupId>
       <artifactId>xmlsec</artifactId>
-      <version>1.4.3</version>
+      <version>1.5.6</version>
     </dependency>
 
     <!-- rest -->
@@ -153,7 +153,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-validator</artifactId>
-      <version>5.1.3.Final</version>
+      <version>5.4.2.Final</version>
     </dependency>
 
     <!-- util -->
@@ -195,7 +195,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.1.2</version>
+      <version>1.2.9</version>
     </dependency>
 
     <!-- services -->
@@ -701,7 +701,7 @@
     <slf4j.version>1.7.7</slf4j.version>
     <resteasy.version>3.0.10.Final</resteasy.version>
     <guice.version>3.0</guice.version>
-    <shiro.version>1.2.3</shiro.version>
+    <shiro.version>1.4.2</shiro.version>
     <legman.version>1.2.0</legman.version>
   </properties>
 

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/usermgt",
-  "Version": "1.6.0-2",
+  "Version": "1.6.1-1",
   "DisplayName": "User Management",
   "Description": "User and Group Management.",
   "Category": "Administration Apps",