From c605ec2f568ba002a83fcb3e063abb98bd4643aa Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 25 Nov 2024 17:49:31 +0100
Subject: [PATCH] OZG-6544: OZG-7192: Raise commons versions, fix license
plugin
---
pom.xml | 28 ++--------------------------
user-manager-interface/pom.xml | 12 +-----------
user-manager-server/pom.xml | 5 +----
3 files changed, 4 insertions(+), 41 deletions(-)
diff --git a/pom.xml b/pom.xml
index 94e4ac05..3d513328 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,12 +38,12 @@
<version>2.12.0-SNAPSHOT</version>
<name>OZG-Cloud User Manager</name>
<packaging>pom</packaging>
+ <inceptionYear>2022</inceptionYear>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <ozgcloud.license.version>1.6.0</ozgcloud.license.version>
<lombok.version>1.18.34</lombok.version>
<quarkus.mongock.version>0.3.0</quarkus.mongock.version>
@@ -59,7 +59,6 @@
<maven-source.plugin.version>3.3.0</maven-source.plugin.version>
<!-- TODO move to common-dependencies -->
- <dependency-track-maven-plugin.version>1.7.0</dependency-track-maven-plugin.version>
<cyclonedx-maven-plugin.version>2.7.11</cyclonedx-maven-plugin.version>
</properties>
@@ -121,29 +120,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>io.quarkus.platform</groupId>
@@ -248,7 +224,7 @@
<configuration>
<dependencyTrackBaseUrl>https://dependency-track.ozg-sh.de</dependencyTrackBaseUrl>
<failOnError>true</failOnError>
- <createProject>true</createProject>
+<!-- <createProject>true</createProject>-->
</configuration>
</plugin>
diff --git a/user-manager-interface/pom.xml b/user-manager-interface/pom.xml
index 43977d57..a92232ce 100644
--- a/user-manager-interface/pom.xml
+++ b/user-manager-interface/pom.xml
@@ -36,6 +36,7 @@
<artifactId>user-manager-interface</artifactId>
<name>OZG-Cloud User Manager Interface</name>
<description>gRPC Interface for User Manager</description>
+ <inceptionYear>2022</inceptionYear>
<dependencies>
<dependency>
@@ -70,17 +71,6 @@
<artifactId>maven-source-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <configuration>
- <mapping>
- <proto>SLASHSTAR_STYLE</proto>
- <config>SCRIPT_STYLE</config>
- </mapping>
- </configuration>
- </plugin>
-
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
diff --git a/user-manager-server/pom.xml b/user-manager-server/pom.xml
index cc59e8fe..17e83330 100644
--- a/user-manager-server/pom.xml
+++ b/user-manager-server/pom.xml
@@ -33,6 +33,7 @@
<artifactId>user-manager-server</artifactId>
<name>OZG-Cloud User Manager Server</name>
+ <inceptionYear>2022</inceptionYear>
<properties>
<skipITs>false</skipITs>
@@ -259,10 +260,6 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- </plugin>
<!-- Core plugins -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
--
GitLab