Merge branch 'release/v1.18.0-1'

Author: nfranzeck

CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.18.0-1] - 2025-01-17
+### Changed
+- The internal makefiles have been updated to standardize the versioning of the release notes.
+### Added
+- optional sync query parameter to create user endpoint [#184]
+  - if supplied, users and groups will be added synchronously to avoid unauthorized errors
+
+### Added
+- Add new integration tests [#161]
+  - New integration tests regarding user import, including the testing of the e-mail dispatch
+  - Adjust Pipeline to include Mailhog for Testing 
+
 ## [v1.17.2-1] - 2024-11-22
 ### Removed
 - Remove mail-to link from user-list

Dockerfile

@@ -14,10 +14,10 @@ COPY app/.mvn .mvn
 
 RUN ./mvnw dependency:resolve-plugins dependency:resolve
 COPY app/ .
-RUN ./mvnw package
+RUN ./mvnw package -DskipTests
 
 
-FROM registry.cloudogu.com/official/base:3.20.3-2 as tomcat
+FROM registry.cloudogu.com/official/base:3.21.0-1 as tomcat
 
 ARG TOMCAT_MAJOR_VERSION
 ARG TOMCAT_VERSION
@@ -70,12 +70,12 @@ RUN set -eux \
 RUN chown -R tomcat:tomcat /opt/apache-tomcat
 
 
-FROM registry.cloudogu.com/official/java:8u402-6
+FROM registry.cloudogu.com/official/java:8u432-1
 
 ARG TOMCAT_VERSION
 
 LABEL NAME="official/usermgt" \
-   VERSION="1.17.2-1" \
+   VERSION="1.18.0-1" \
    maintainer="hello@cloudogu.com"
 
 # mark as webapp for nginx

Jenkinsfile

@@ -1,13 +1,13 @@
 # Set these to the desired values
 ARTIFACT_ID=usermgt
-VERSION=1.17.2-1
+VERSION=1.18.0-1
 # overwrite ADDITIONAL_LDFLAGS to disable static compilation
 # this should fix https://github.com/golang/go/issues/13470
 ADDITIONAL_LDFLAGS=""
 NPM_REGISTRY_RELEASE=https://ecosystem.cloudogu.com/nexus/repository/npm-releases/
 NPM_REGISTRY_RC=https://ecosystem.cloudogu.com/nexus/repository/npm-releasecandidates/
 UI_SRC=app/src/main/ui
-MAKEFILES_VERSION=9.1.0
+MAKEFILES_VERSION=9.5.0
 .DEFAULT_GOAL:=default
 
 include build/make/variables.mk

Makefile

@@ -20,10 +20,10 @@ public abstract class AbstractManagerResource<T> {
 
     public static final int PAGING_MAXIMUM_PAGE_SIZE = 100000;
 
-    private static final Logger logger
+    protected static final Logger logger
         = LoggerFactory.getLogger(AbstractManagerResource.class);
 
-    private static final String CONSTRAINT_VIOLATION_LOG_MSG = "entity {} violates constraints";
+    protected static final String CONSTRAINT_VIOLATION_LOG_MSG = "entity {} violates constraints";
 
     @Context
     protected UriInfo uriInfo;