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

OZG-6544: OZG-7192: Raise commons versions, fix license plugin

parent ac2149de
Branches
Tags
No related merge requests found
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
<version>2.12.0-SNAPSHOT</version> <version>2.12.0-SNAPSHOT</version>
<name>OZG-Cloud User Manager</name> <name>OZG-Cloud User Manager</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<inceptionYear>2022</inceptionYear>
<properties> <properties>
<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.license.version>1.6.0</ozgcloud.license.version>
<lombok.version>1.18.34</lombok.version> <lombok.version>1.18.34</lombok.version>
<quarkus.mongock.version>0.3.0</quarkus.mongock.version> <quarkus.mongock.version>0.3.0</quarkus.mongock.version>
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
<maven-source.plugin.version>3.3.0</maven-source.plugin.version> <maven-source.plugin.version>3.3.0</maven-source.plugin.version>
<!-- TODO move to common-dependencies --> <!-- 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> <cyclonedx-maven-plugin.version>2.7.11</cyclonedx-maven-plugin.version>
</properties> </properties>
...@@ -121,29 +120,6 @@ ...@@ -121,29 +120,6 @@
<plugin> <plugin>
<groupId>com.mycila</groupId> <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId> <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>
<plugin> <plugin>
<groupId>io.quarkus.platform</groupId> <groupId>io.quarkus.platform</groupId>
...@@ -248,7 +224,7 @@ ...@@ -248,7 +224,7 @@
<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> <!-- <createProject>true</createProject>-->
</configuration> </configuration>
</plugin> </plugin>
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
<artifactId>user-manager-interface</artifactId> <artifactId>user-manager-interface</artifactId>
<name>OZG-Cloud User Manager Interface</name> <name>OZG-Cloud User Manager Interface</name>
<description>gRPC Interface for User Manager</description> <description>gRPC Interface for User Manager</description>
<inceptionYear>2022</inceptionYear>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -70,17 +71,6 @@ ...@@ -70,17 +71,6 @@
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
</plugin> </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> <plugin>
<groupId>com.github.os72</groupId> <groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId> <artifactId>protoc-jar-maven-plugin</artifactId>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<artifactId>user-manager-server</artifactId> <artifactId>user-manager-server</artifactId>
<name>OZG-Cloud User Manager Server</name> <name>OZG-Cloud User Manager Server</name>
<inceptionYear>2022</inceptionYear>
<properties> <properties>
<skipITs>false</skipITs> <skipITs>false</skipITs>
...@@ -259,10 +260,6 @@ ...@@ -259,10 +260,6 @@
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
</plugin>
<!-- Core plugins --> <!-- Core plugins -->
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment