Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • ozg-cloud/lib/common-lib
1 result
Select Git revision
Loading items
Show changes

Commits on Source 10

Show whitespace changes
Inline Side-by-side
Showing
with 106 additions and 29 deletions
README.md
View file @ b11e0931
# Common Library for OZG-Cloud Applications # Common Library for OZG-Cloud Applications
## Changelog ## Changelog
* Add protoc-jar-maven-plugin to plugin management
* Update Spring-Boot to 3.4.6 / Spring 6.2.7
* Update commons-io
* Update commons-beanutils
* Update commons-collections
* Update Quarkus-Platform to 3.15.4
* Added shedlock in Version 6.6.1
### 4.12.0 ### 4.12.0
* Extend GrpcFileUploadUtils to enable uploads with multiple files * Extend GrpcFileUploadUtils to enable uploads with multiple files
......
ozgcloud-common-dependencies/pom.xml
View file @ b11e0931
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<parent> <parent>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common</artifactId> <artifactId>ozgcloud-common</artifactId>
<version>4.14.0</version> <version>4.15.0</version>
</parent> </parent>
<artifactId>ozgcloud-common-dependencies</artifactId> <artifactId>ozgcloud-common-dependencies</artifactId>
...@@ -41,15 +41,17 @@ ...@@ -41,15 +41,17 @@
<inceptionYear>2021</inceptionYear> <inceptionYear>2021</inceptionYear>
<properties> <properties>
<vorgang-manager.version>2.17.0</vorgang-manager.version> <vorgang-manager.version>2.27.0</vorgang-manager.version>
<ozgcloud.license.version>1.16.0</ozgcloud.license.version> <ozgcloud.license.version>1.16.0</ozgcloud.license.version>
<zufi-manager.version>1.11.0</zufi-manager.version>
<api-lib.version>0.14.0</api-lib.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.4.2</spring-boot.version> <spring-boot.version>3.4.6</spring-boot.version>
<spring.version>6.2.2</spring.version> <spring.version>6.2.7</spring.version>
<grpc.spring-boot-starter.version>5.1.5</grpc.spring-boot-starter.version> <grpc.spring-boot-starter.version>5.1.5</grpc.spring-boot-starter.version>
...@@ -63,19 +65,21 @@ ...@@ -63,19 +65,21 @@
<protoc-gen.version>1.69.0</protoc-gen.version> <protoc-gen.version>1.69.0</protoc-gen.version>
<mapstruct.version>1.6.3</mapstruct.version> <mapstruct.version>1.6.3</mapstruct.version>
<commons-io.version>2.18.0</commons-io.version> <shedlock.version>6.6.1</shedlock.version>
<commons-beanutils.version>1.10.0</commons-beanutils.version>
<commons-io.version>2.19.0</commons-io.version>
<commons-beanutils.version>1.10.1</commons-beanutils.version>
<commons-lang3.version>3.17.0</commons-lang3.version> <commons-lang3.version>3.17.0</commons-lang3.version>
<commons-collections.version>4.4</commons-collections.version> <commons-collections.version>4.5.0</commons-collections.version>
<java-jwt.version>4.4.0</java-jwt.version> <java-jwt.version>4.5.0</java-jwt.version>
<jjwt.version>0.12.6</jjwt.version> <jjwt.version>0.12.6</jjwt.version>
<jakarta.version>2.2.0</jakarta.version> <jakarta.version>2.2.0</jakarta.version>
<quarkus.platform.version>3.15.1</quarkus.platform.version> <quarkus.platform.version>3.15.4</quarkus.platform.version>
<keycloak-adapter.version>24.0.5</keycloak-adapter.version> <keyclo-lodapter.version>24.0.5</keyclo-lodapter.version>
<keycloak-spring-boot-starter.version>24.0.5</keycloak-spring-boot-starter.version> <keycloak-spring-boot-starter.version>24.0.5</keycloak-spring-boot-starter.version>
<!-- Test --> <!-- Test -->
...@@ -114,27 +118,44 @@ ...@@ -114,27 +118,44 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.ozgcloud.vorgang-manager</groupId> <groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-interface</artifactId> <artifactId>vorgang-manager-interface</artifactId>
<version>${vorgang-manager.version}</version> <version>${vorgang-manager.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.ozgcloud.vorgang-manager</groupId> <groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-utils</artifactId> <artifactId>vorgang-manager-utils</artifactId>
<version>${vorgang-manager.version}</version> <version>${vorgang-manager.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.ozgcloud.vorgang-manager</groupId> <groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-utils</artifactId> <artifactId>vorgang-manager-utils</artifactId>
<type>test-jar</type> <type>test-jar</type>
<version>${vorgang-manager.version}</version> <version>${vorgang-manager.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.ozgcloud.vorgang-manager</groupId> <groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-command</artifactId> <artifactId>vorgang-manager-command</artifactId>
<version>${vorgang-manager.version}</version> <version>${vorgang-manager.version}</version>
</dependency> </dependency>
<dependency>
<groupId>de.ozgcloud.api-lib</groupId>
<artifactId>api-lib-core</artifactId>
<version>${api-lib.version}</version>
</dependency>
<dependency>
<groupId>de.ozgcloud.api-lib</groupId>
<artifactId>api-lib-core</artifactId>
<version>${api-lib.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.ozgcloud.zufi</groupId>
<artifactId>zufi-manager-interface</artifactId>
<version>${zufi-manager.version}</version>
</dependency>
<!-- spring --> <!-- spring -->
<dependency> <dependency>
...@@ -171,6 +192,17 @@ ...@@ -171,6 +192,17 @@
<artifactId>mapstruct</artifactId> <artifactId>mapstruct</artifactId>
<version>${mapstruct.version}</version> <version>${mapstruct.version}</version>
</dependency> </dependency>
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
<artifactId>shedlock-spring</artifactId>
<version>${shedlock.version}</version>
</dependency>
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
<artifactId>shedlock-provider-mongo</artifactId>
<version>${shedlock.version}</version>
</dependency>
<!-- grpc --> <!-- grpc -->
<dependency> <dependency>
......
ozgcloud-common-lib/pom.xml
View file @ b11e0931
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<parent> <parent>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common</artifactId> <artifactId>ozgcloud-common</artifactId>
<version>4.14.0</version> <version>4.15.0</version>
</parent> </parent>
<artifactId>ozgcloud-common-lib</artifactId> <artifactId>ozgcloud-common-lib</artifactId>
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
<properties> <properties>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<mockito.version>5.10.0</mockito.version>
<mockito.version>5.14.2</mockito.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
......
ozgcloud-common-lib/src/main/java/de/ozgcloud/common/grpc/GrpcUtil.java
View file @ b11e0931
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
package de.ozgcloud.common.grpc; package de.ozgcloud.common.grpc;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
......
ozgcloud-common-license/pom.xml
View file @ b11e0931
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-license</artifactId> <artifactId>ozgcloud-common-license</artifactId>
<version>1.16.0</version> <version>1.17.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OzgCloud Common - OS license provider</name> <name>OzgCloud Common - OS license provider</name>
......
ozgcloud-common-parent/pom.xml
View file @ b11e0931
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.2</version> <version>3.4.6</version>
<relativePath /> <relativePath />
</parent> </parent>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId> <artifactId>ozgcloud-common-parent</artifactId>
<version>4.14.0</version> <version>4.15.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>OzgCloud Common - Parent</name> <name>OzgCloud Common - Parent</name>
...@@ -49,11 +49,11 @@ ...@@ -49,11 +49,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<ozgcloud-common.version>4.14.0</ozgcloud-common.version> <ozgcloud-common.version>4.15.0</ozgcloud-common.version>
<ozgcloud.license.version>1.16.0</ozgcloud.license.version> <ozgcloud.license.version>1.17.0</ozgcloud.license.version>
<mapstruct.version>1.6.3</mapstruct.version> <mapstruct.version>1.6.3</mapstruct.version>
<spring-boot.version>3.4.2</spring-boot.version> <spring-boot.version>3.4.6</spring-boot.version>
<spring-cloud-config.version>4.2.0</spring-cloud-config.version> <spring-cloud-config.version>4.2.0</spring-cloud-config.version>
<!-- plugins --> <!-- plugins -->
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
<sonarqube.version>3.9.1.2184</sonarqube.version> <sonarqube.version>3.9.1.2184</sonarqube.version>
<license.plugin.version>4.6</license.plugin.version> <license.plugin.version>4.6</license.plugin.version>
<rewrite.plugin.version>4.38.2</rewrite.plugin.version> <rewrite.plugin.version>4.38.2</rewrite.plugin.version>
<protoc-jar-plugin.version>3.11.4</protoc-jar-plugin.version>
<dependency-track-maven-plugin.version>1.7.0</dependency-track-maven-plugin.version> <dependency-track-maven-plugin.version>1.7.0</dependency-track-maven-plugin.version>
</properties> </properties>
...@@ -202,6 +203,10 @@ ...@@ -202,6 +203,10 @@
<artifactId>mapstruct-processor</artifactId> <artifactId>mapstruct-processor</artifactId>
<version>${mapstruct.version}</version> <version>${mapstruct.version}</version>
</path> </path>
<path>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</path>
<!-- other annotation processors --> <!-- other annotation processors -->
</annotationProcessorPaths> </annotationProcessorPaths>
...@@ -269,6 +274,35 @@ ...@@ -269,6 +274,35 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
<version>${protoc-jar-plugin.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<protocVersion>${protobuf.version}</protocVersion>
<includeMavenTypes>direct</includeMavenTypes>
<outputTargets>
<outputTarget>
<type>java</type>
</outputTarget>
<outputTarget>
<type>grpc-java</type>
<pluginArtifact>
io.grpc:protoc-gen-grpc-java:${protoc-gen.version}
</pluginArtifact>
</outputTarget>
</outputTargets>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.sonarsource.scanner.maven</groupId> <groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId> <artifactId>sonar-maven-plugin</artifactId>
...@@ -355,6 +389,7 @@ ...@@ -355,6 +389,7 @@
<licenseSet> <licenseSet>
<header>license/eupl_v1_2_de/header.txt</header> <header>license/eupl_v1_2_de/header.txt</header>
<excludes> <excludes>
<exclude>**/README</exclude>
<exclude>src/test/resources/**</exclude> <exclude>src/test/resources/**</exclude>
<exclude>src/main/resources/**</exclude> <exclude>src/main/resources/**</exclude>
<exclude>**/.angular/cache/**</exclude> <exclude>**/.angular/cache/**</exclude>
...@@ -385,7 +420,6 @@ ...@@ -385,7 +420,6 @@
<configuration> <configuration>
<dependencyTrackBaseUrl>https://dependency-track.ozg-sh.de</dependencyTrackBaseUrl> <dependencyTrackBaseUrl>https://dependency-track.ozg-sh.de</dependencyTrackBaseUrl>
<failOnError>true</failOnError> <failOnError>true</failOnError>
<createProject>true</createProject>
<bomLocation> <bomLocation>
${project.build.outputDirectory}/META-INF/sbom/application.cdx.json</bomLocation> ${project.build.outputDirectory}/META-INF/sbom/application.cdx.json</bomLocation>
</configuration> </configuration>
...@@ -406,6 +440,7 @@ ...@@ -406,6 +440,7 @@
<executions> <executions>
<execution> <execution>
<id>attach-sources</id> <id>attach-sources</id>
<phase>verify</phase>
<goals> <goals>
<goal>jar-no-fork</goal> <goal>jar-no-fork</goal>
</goals> </goals>
......
ozgcloud-common-pdf/pom.xml
View file @ b11e0931
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<parent> <parent>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId> <artifactId>ozgcloud-common-dependencies</artifactId>
<version>4.14.0</version> <version>4.15.0</version>
<relativePath>../ozgcloud-common-dependencies</relativePath> <relativePath>../ozgcloud-common-dependencies</relativePath>
</parent> </parent>
<artifactId>ozgcloud-common-pdf</artifactId> <artifactId>ozgcloud-common-pdf</artifactId>
......
ozgcloud-common-test/pom.xml
View file @ b11e0931
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<parent> <parent>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId> <artifactId>ozgcloud-common-dependencies</artifactId>
<version>4.14.0</version> <version>4.15.0</version>
<relativePath>../ozgcloud-common-dependencies</relativePath> <relativePath>../ozgcloud-common-dependencies</relativePath>
</parent> </parent>
......
pom.xml
View file @ b11e0931
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common</artifactId> <artifactId>ozgcloud-common</artifactId>
<version>4.14.0</version> <version>4.15.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<inceptionYear>2021</inceptionYear> <inceptionYear>2021</inceptionYear>
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ozgcloud-common.version>4.14.0</ozgcloud-common.version> <ozgcloud-common.version>4.15.0</ozgcloud-common.version>
<ozgcloud.license.version>1.16.0</ozgcloud.license.version> <ozgcloud.license.version>1.17.0</ozgcloud.license.version>
<java.version>21</java.version> <java.version>21</java.version>
<license.plugin.version>4.6</license.plugin.version> <license.plugin.version>4.6</license.plugin.version>
......

Impressum - Datenschutz - Barrierefreiheit