Skip to content
Snippets Groups Projects
Commit 75b4c5a3 authored by OZGCloud's avatar OZGCloud
Browse files

start version 4; update spring-boot, java,...

parent 2d50ba79
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 56 additions and 75 deletions
README.md 0 → 100644
+ 9
− 0
View file @ 75b4c5a3
# Common Library for OZG-Cloud Applications
## Changelog
### 4.0.0
* Update to Spring-Boot 3.2 / Spring 6.1
* Update to Java 21
* fixed dependencies for jjwt
* Umstellung auf io.github.git-commit-id git-commit-id-maven-plugin
ozgcloud-common-dependencies/pom.xml
+ 9
− 21
View file @ 75b4c5a3
...@@ -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>3.1.0-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>ozgcloud-common-dependencies</artifactId> <artifactId>ozgcloud-common-dependencies</artifactId>
...@@ -40,16 +40,15 @@ ...@@ -40,16 +40,15 @@
<description>Dependenencies management for ozgcloud projects</description> <description>Dependenencies management for ozgcloud projects</description>
<properties> <properties>
<vorgang-manager.version>2.0.0-SNAPSHOT</vorgang-manager.version> <vorgang-manager.version>2.0.0</vorgang-manager.version>
<license.version>1.8.0</license.version> <license.version>1.3.0</license.version>
<java.version>17</java.version> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.1.6</spring-boot.version> <spring-boot.version>3.2.0</spring-boot.version>
<spring.version>6.0.14</spring.version> <spring.version>6.1.1</spring.version>
<grpc.spring-boot-starter.version>5.0.0</grpc.spring-boot-starter.version> <grpc.spring-boot-starter.version>5.0.0</grpc.spring-boot-starter.version>
...@@ -61,10 +60,10 @@ ...@@ -61,10 +60,10 @@
<protoc-jar-plugin.version>3.11.4</protoc-jar-plugin.version> <protoc-jar-plugin.version>3.11.4</protoc-jar-plugin.version>
<protobuf.version>3.25.1</protobuf.version> <protobuf.version>3.25.1</protobuf.version>
<protoc-gen.version>1.59.0</protoc-gen.version> <protoc-gen.version>1.60.0</protoc-gen.version>
<mapstruct.version>1.5.5.Final</mapstruct.version> <mapstruct.version>1.5.5.Final</mapstruct.version>
<commons-io.version>2.15.0</commons-io.version> <commons-io.version>2.15.1</commons-io.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version> <commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-lang3.version>3.14.0</commons-lang3.version> <commons-lang3.version>3.14.0</commons-lang3.version>
<commons-collections.version>4.4</commons-collections.version> <commons-collections.version>4.4</commons-collections.version>
...@@ -252,19 +251,8 @@ ...@@ -252,19 +251,8 @@
<version>${jjwt.version}</version> <version>${jjwt.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<!-- TODO legacy - pleace remove -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<!-- APIs --> <!-- APIs -->
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.version}</version>
</dependency>
<dependency> <dependency>
<groupId>jakarta.interceptor</groupId> <groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId> <artifactId>jakarta.interceptor-api</artifactId>
......
ozgcloud-common-lib/pom.xml
+ 4
− 3
View file @ 75b4c5a3
...@@ -27,18 +27,19 @@ ...@@ -27,18 +27,19 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common</artifactId> <artifactId>ozgcloud-common</artifactId>
<version>3.1.0-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>ozgcloud-common-lib</artifactId> <artifactId>ozgcloud-common-lib</artifactId>
<name>OzgCloud Common - Shared Lib</name> <name>OzgCloud Common - Shared Lib</name>
<properties> <properties>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<mockito.version>5.7.0</mockito.version> <mockito.version>5.7.0</mockito.version>
</properties> </properties>
......
ozgcloud-common-lib/src/test/java/de/ozgcloud/common/errorhandling/ExceptionUtilTest.java
+ 0
− 2
View file @ 75b4c5a3
...@@ -27,8 +27,6 @@ import static org.assertj.core.api.Assertions.*; ...@@ -27,8 +27,6 @@ import static org.assertj.core.api.Assertions.*;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import de.ozgcloud.common.errorhandling.ExceptionUtil;
class ExceptionUtilTest { class ExceptionUtilTest {
@Test @Test
......
ozgcloud-common-lib/src/test/java/de/ozgcloud/common/errorhandling/TechnicalExceptionTest.java
+ 0
− 2
View file @ 75b4c5a3
...@@ -29,8 +29,6 @@ import org.junit.jupiter.api.Test; ...@@ -29,8 +29,6 @@ import org.junit.jupiter.api.Test;
import com.thedeanda.lorem.LoremIpsum; import com.thedeanda.lorem.LoremIpsum;
import de.ozgcloud.common.errorhandling.TechnicalException;
class TechnicalExceptionTest { class TechnicalExceptionTest {
private final String MESSAGE = LoremIpsum.getInstance().getWords(5); private final String MESSAGE = LoremIpsum.getInstance().getWords(5);
......
ozgcloud-common-lib/src/test/java/de/ozgcloud/common/grpc/GrpcUtilTest.java
+ 0
− 1
View file @ 75b4c5a3
...@@ -7,7 +7,6 @@ import org.junit.jupiter.api.DisplayName; ...@@ -7,7 +7,6 @@ import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import de.ozgcloud.common.grpc.GrpcUtil;
import io.grpc.Metadata; import io.grpc.Metadata;
class GrpcUtilTest { class GrpcUtilTest {
......
ozgcloud-common-lib/src/test/java/de/ozgcloud/common/logging/OzgCloudLoggingInterceptorTest.java
+ 4
− 6
View file @ 75b4c5a3
...@@ -23,7 +23,11 @@ ...@@ -23,7 +23,11 @@
*/ */
package de.ozgcloud.common.logging; package de.ozgcloud.common.logging;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import jakarta.interceptor.InvocationContext; import jakarta.interceptor.InvocationContext;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
...@@ -32,12 +36,6 @@ import org.junit.jupiter.api.Test; ...@@ -32,12 +36,6 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockedStatic; import org.mockito.MockedStatic;
import de.ozgcloud.common.logging.AspectLoggingUtils;
import de.ozgcloud.common.logging.OzgCloudLoggingInterceptor;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
class OzgCloudLoggingInterceptorTest { class OzgCloudLoggingInterceptorTest {
private final OzgCloudLoggingInterceptor interceptor = new OzgCloudLoggingInterceptor(); private final OzgCloudLoggingInterceptor interceptor = new OzgCloudLoggingInterceptor();
......
ozgcloud-common-parent/pom.xml
+ 14
− 12
View file @ 75b4c5a3
...@@ -31,28 +31,28 @@ ...@@ -31,28 +31,28 @@
<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.1.6</version> <version>3.2.0</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>3.1.0-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>OzgCloud Common - Parent</name> <name>OzgCloud Common - Parent</name>
<description>Parent for all OzgCloud spring boot projects</description> <description>Parent for all OzgCloud spring boot projects</description>
<properties> <properties>
<java.version>17</java.version> <java.version>21</java.version>
<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>3.0.0</ozgcloud-common.version> <ozgcloud-common.version>4.0.0-SNAPSHOT</ozgcloud-common.version>
<ozgcloud.license.version>1.6.0</ozgcloud.license.version> <ozgcloud.license.version>1.3.0</ozgcloud.license.version>
<mapstruct.version>1.5.5.Final</mapstruct.version> <mapstruct.version>1.5.5.Final</mapstruct.version>
<spring-boot.version>3.1.6</spring-boot.version> <spring-boot.version>3.2.0</spring-boot.version>
<!-- plugins --> <!-- plugins -->
<maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version> <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
<license.plugin.version>4.1</license.plugin.version> <license.plugin.version>4.1</license.plugin.version>
<rewrite.plugin.version>4.38.2</rewrite.plugin.version> <rewrite.plugin.version>4.38.2</rewrite.plugin.version>
<!--overriden to fix security issue CVE-2022-1471 --> <!--overriden for issue CVE-2021-26291-->
<snakeyaml.version>2.2</snakeyaml.version> <git-commit-id-maven-plugin.version>7.0.0.</git-commit-id-maven-plugin.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -97,6 +97,7 @@ ...@@ -97,6 +97,7 @@
<dependency> <dependency>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-test</artifactId> <artifactId>ozgcloud-common-test</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
...@@ -274,8 +275,9 @@ ...@@ -274,8 +275,9 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>pl.project13.maven</groupId> <groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-plugin</artifactId> <artifactId>git-commit-id-maven-plugin</artifactId>
<version>${git-commit-id-maven-plugin.version}</version>
<configuration> <configuration>
<offline>true</offline> <offline>true</offline>
</configuration> </configuration>
......
ozgcloud-common-pdf/pom.xml
+ 9
− 21
View file @ 75b4c5a3
...@@ -23,34 +23,23 @@ ...@@ -23,34 +23,23 @@
unter der Lizenz sind dem Lizenztext zu entnehmen. unter der Lizenz sind dem Lizenztext zu entnehmen.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common</artifactId> <artifactId>ozgcloud-common-dependencies</artifactId>
<version>3.1.0-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
<relativePath>../ozgcloud-common-dependencies</relativePath>
</parent> </parent>
<artifactId>ozgcloud-common-pdf</artifactId> <artifactId>ozgcloud-common-pdf</artifactId>
<name>OzgCloud Common - PDF Export library</name> <name>OzgCloud Common - PDF Export library</name>
<properties> <properties>
<!-- TODO move to ozgcloud-common-dependencies --> <fop.version>2.9</fop.version>
<jakarta.cdi-api.version>4.0.1</jakarta.cdi-api.version>
<fop.version>2.7</fop.version>
</properties> </properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
<version>${ozgcloud-common.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
...@@ -61,7 +50,6 @@ ...@@ -61,7 +50,6 @@
<dependency> <dependency>
<groupId>jakarta.enterprise</groupId> <groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId> <artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${jakarta.cdi-api.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
......
ozgcloud-common-test/pom.xml
+ 1
− 1
View file @ 75b4c5a3
...@@ -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>3.1.0-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
<relativePath>../ozgcloud-common-dependencies</relativePath> <relativePath>../ozgcloud-common-dependencies</relativePath>
</parent> </parent>
......
pom.xml
+ 6
− 6
View file @ 75b4c5a3
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common</artifactId> <artifactId>ozgcloud-common</artifactId>
<version>3.1.0-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>OzgCloud Common</name> <name>OzgCloud Common</name>
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ozgcloud-common.version>3.0.0</ozgcloud-common.version> <ozgcloud-common.version>4.0.0-SNAPSHOT</ozgcloud-common.version>
<ozgcloud.license.version>1.6.0</ozgcloud.license.version> <ozgcloud.license.version>1.3.0</ozgcloud.license.version>
<java.version>17</java.version> <java.version>21</java.version>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
</properties> </properties>
<distributionManagement> <distributionManagement>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit