From 4b7bc82c63ea3b83cfdaf5edf0cd2861ecbaf4e1 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 26 Nov 2024 11:38:28 +0100
Subject: [PATCH] OZG-6544: OZG-7247: Update commons Version. Update License
Header generation.
---
info-manager-interface/pom.xml | 32 ++---------------
info-manager-server/pom.xml | 35 ++-----------------
.../java/de/ozgcloud/info/GrpcTestConfig.java | 3 --
.../InformationGrpcTestConfiguration.java | 4 +--
pom.xml | 28 +--------------
5 files changed, 7 insertions(+), 95 deletions(-)
diff --git a/info-manager-interface/pom.xml b/info-manager-interface/pom.xml
index 41c3cd4..05ea167 100644
--- a/info-manager-interface/pom.xml
+++ b/info-manager-interface/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>4.5.0</version>
+ <version>4.6.0</version>
<relativePath/>
</parent>
@@ -35,6 +35,7 @@
<name>OZG-Cloud Info Manager gRPC Interface</name>
<description>Interface (gRPC) for Info Manager Server</description>
+ <inceptionYear>2024</inceptionYear>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +46,6 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<find-and-replace-maven-plugin.version>1.1.0</find-and-replace-maven-plugin.version>
- <ozgcloud.license.version>1.6.0</ozgcloud.license.version>
</properties>
<dependencyManagement>
@@ -134,34 +134,6 @@
</execution>
</executions>
</plugin>
- <!-- TODO move to common -->
- <plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <configuration>
- <mapping>
- <proto>SLASHSTAR_STYLE</proto>
- <config>SCRIPT_STYLE</config>
- </mapping>
- <licenseSets>
- <licenseSet>
- <header>license/eupl_v1_2_de/header.txt</header>
- <excludes>
- <exclude>**/*.yaml</exclude>
- <exclude>**/*.yml</exclude>
- <exclude>README.md</exclude>
- </excludes>
- </licenseSet>
- </licenseSets>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>de.ozgcloud.common</groupId>
- <artifactId>ozgcloud-common-license</artifactId>
- <version>${ozgcloud.license.version}</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/info-manager-server/pom.xml b/info-manager-server/pom.xml
index ca17342..23bc79b 100644
--- a/info-manager-server/pom.xml
+++ b/info-manager-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.6.0</version>
<relativePath/>
</parent>
@@ -36,6 +36,7 @@
<name>OZG-Cloud Info Manager Server</name>
<description>Server Implementierung des InfoManagers</description>
+ <inceptionYear>2024</inceptionYear>
<properties>
<java.version>21</java.version>
@@ -44,8 +45,7 @@
<spring-boot.build-image.imageName>docker.ozg-sh.de/info-manager:build-latest
</spring-boot.build-image.imageName>
- <ozgcloud.license.version>1.6.0</ozgcloud.license.version>
- <ozgcloud-starter.version>0.9.0</ozgcloud-starter.version>
+ <ozgcloud-starter.version>0.14.0</ozgcloud-starter.version>
<maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
<find-and-replace-maven-plugin.version>1.1.0</find-and-replace-maven-plugin.version>
@@ -262,35 +262,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
-
- <plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <configuration>
- <mapping>
- <config>SCRIPT_STYLE</config>
- <ftlh>FTL</ftlh>
- </mapping>
- <licenseSets>
- <licenseSet>
- <header>license/eupl_v1_2_de/header.txt</header>
- <excludes>
- <exclude>**/README</exclude>
- <exclude>src/test/resources/**</exclude>
- <exclude>src/main/resources/*.yml</exclude>
- <exclude>src/main/resources/*.txt</exclude>
- </excludes>
- </licenseSet>
- </licenseSets>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>de.ozgcloud.common</groupId>
- <artifactId>ozgcloud-common-license</artifactId>
- <version>${ozgcloud.license.version}</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
diff --git a/info-manager-server/src/test/java/de/ozgcloud/info/GrpcTestConfig.java b/info-manager-server/src/test/java/de/ozgcloud/info/GrpcTestConfig.java
index cf12948..e4f0714 100644
--- a/info-manager-server/src/test/java/de/ozgcloud/info/GrpcTestConfig.java
+++ b/info-manager-server/src/test/java/de/ozgcloud/info/GrpcTestConfig.java
@@ -29,19 +29,16 @@ import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
import net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration;
import net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration;
import net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration;
-import net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration;
import net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration;
import net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration;
@Configuration
@ImportAutoConfiguration({
GrpcCommonCodecAutoConfiguration.class,
-
GrpcClientAutoConfiguration.class,
GrpcClientHealthAutoConfiguration.class,
GrpcClientMetricAutoConfiguration.class,
GrpcClientSecurityAutoConfiguration.class,
- GrpcClientTraceAutoConfiguration.class,
GrpcDiscoveryClientAutoConfiguration.class,
})
class GrpcTestConfig {
diff --git a/info-manager-server/src/test/java/de/ozgcloud/info/information/InformationGrpcTestConfiguration.java b/info-manager-server/src/test/java/de/ozgcloud/info/information/InformationGrpcTestConfiguration.java
index 55f1ce9..02d833a 100644
--- a/info-manager-server/src/test/java/de/ozgcloud/info/information/InformationGrpcTestConfiguration.java
+++ b/info-manager-server/src/test/java/de/ozgcloud/info/information/InformationGrpcTestConfiguration.java
@@ -32,7 +32,6 @@ import org.springframework.context.annotation.Configuration;
import de.ozgcloud.info.NachrichtEventTestFactory;
import lombok.extern.log4j.Log4j2;
import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
-import net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration;
import net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration;
import net.devh.boot.grpc.server.autoconfigure.GrpcServerAutoConfiguration;
import net.devh.boot.grpc.server.autoconfigure.GrpcServerFactoryAutoConfiguration;
@@ -45,8 +44,7 @@ import net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfigurati
GrpcServerAutoConfiguration.class,
GrpcServerFactoryAutoConfiguration.class,
GrpcServerSecurityAutoConfiguration.class,
- GrpcClientAutoConfiguration.class,
- GrpcClientTraceAutoConfiguration.class })
+ GrpcClientAutoConfiguration.class })
public class InformationGrpcTestConfiguration {
@Bean
diff --git a/pom.xml b/pom.xml
index 02a0965..ab221d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,10 +28,7 @@
<name>OZG-Cloud Info Manager</name>
<packaging>pom</packaging>
-
- <properties>
- <ozgcloud.license.version>1.6.0</ozgcloud.license.version>
- </properties>
+ <inceptionYear>2024</inceptionYear>
<modules>
<module>info-manager-interface</module>
@@ -44,29 +41,6 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>4.1</version>
- <configuration>
- <mapping>
- <config>SCRIPT_STYLE</config>
- </mapping>
- <licenseSets>
- <licenseSet>
- <header>license/eupl_v1_2_de/header.txt</header>
- <excludes>
- <exclude>**/README</exclude>
- <exclude>src/test/resources/**</exclude>
- <exclude>src/main/resources/**</exclude>
- </excludes>
- </licenseSet>
- </licenseSets>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>de.ozgcloud.common</groupId>
- <artifactId>ozgcloud-common-license</artifactId>
- <version>${ozgcloud.license.version}</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
--
GitLab