diff --git a/ozgcloud-common-dependencies/pom.xml b/ozgcloud-common-dependencies/pom.xml index 05738f19771e8959d28333185885468626458088..189ea2f93fd090fff3498a1e40d685fa13347b5e 100644 --- a/ozgcloud-common-dependencies/pom.xml +++ b/ozgcloud-common-dependencies/pom.xml @@ -41,7 +41,7 @@ <properties> <vorgang-manager.version>2.15.0-SNAPSHOT</vorgang-manager.version> - <license.version>1.3.0</license.version> + <ozgcloud.license.version>1.7.0-SNAPSHOT</ozgcloud.license.version> <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> @@ -109,7 +109,7 @@ <dependency> <groupId>de.ozgcloud.common</groupId> <artifactId>ozgcloud-common-license</artifactId> - <version>${license.version}</version> + <version>${ozgcloud.license.version}</version> </dependency> <dependency> diff --git a/ozgcloud-common-license/pom.xml b/ozgcloud-common-license/pom.xml index 64d9236ef6a57ebed91f7dd79a24db054cb5f1b9..3876e9f900faee7ae29cb30eb5deaee2e697504b 100644 --- a/ozgcloud-common-license/pom.xml +++ b/ozgcloud-common-license/pom.xml @@ -30,7 +30,7 @@ <groupId>de.ozgcloud.common</groupId> <artifactId>ozgcloud-common-license</artifactId> - <version>1.6.0</version> + <version>1.7.0-SNAPSHOT</version> <packaging>jar</packaging> <name>OzgCloud Common - OS license provider</name> @@ -49,4 +49,29 @@ <distribution>repo</distribution> </license> </licenses> + + <distributionManagement> + <repository> + <id>ozg-nexus</id> + <name>ozg-releases</name> + <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <snapshotRepository> + <id>ozg-nexus</id> + <name>ozg-snapshots</name> + <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </snapshotRepository> + </distributionManagement> </project> \ No newline at end of file diff --git a/ozgcloud-common-license/src/main/resources/license/eupl_v1_2_de/header.txt b/ozgcloud-common-license/src/main/resources/license/eupl_v1_2_de/header.txt index adf6269212fbf7e68b03280a8c7d38a9fddd92b9..16f1fcc19a1d5ab1ed39b8ad6dffed2c8b74e74b 100644 --- a/ozgcloud-common-license/src/main/resources/license/eupl_v1_2_de/header.txt +++ b/ozgcloud-common-license/src/main/resources/license/eupl_v1_2_de/header.txt @@ -1,4 +1,4 @@ -Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den +Copyright (C) ${license.git.copyrightCreationYear} Das Land Schleswig-Holstein vertreten durch den Ministerpräsidenten des Landes Schleswig-Holstein Staatskanzlei Abteilung Digitalisierung und zentrales IT-Management der Landesregierung diff --git a/ozgcloud-common-parent/pom.xml b/ozgcloud-common-parent/pom.xml index 7e7d94e92dc0271ae2fb4fde3d7ca56f9a697d55..35d80815df767a728d0472ab29d8487b3a08f60a 100644 --- a/ozgcloud-common-parent/pom.xml +++ b/ozgcloud-common-parent/pom.xml @@ -49,7 +49,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <ozgcloud-common.version>4.4.0-SNAPSHOT</ozgcloud-common.version> - <ozgcloud.license.version>1.3.0</ozgcloud.license.version> + <ozgcloud.license.version>1.7.0-SNAPSHOT</ozgcloud.license.version> <mapstruct.version>1.6.0</mapstruct.version> <spring-boot.version>3.3.3</spring-boot.version> @@ -60,7 +60,7 @@ <jacoco.plugin.version>0.8.12</jacoco.plugin.version> <sonarqube.version>3.9.1.2184</sonarqube.version> - <license.plugin.version>4.1</license.plugin.version> + <license.plugin.version>4.6</license.plugin.version> <rewrite.plugin.version>4.38.2</rewrite.plugin.version> <!--overriden for issue CVE-2021-26291--> @@ -319,6 +319,13 @@ <artifactId>license-maven-plugin</artifactId> <version>${license.plugin.version}</version> <configuration> + <properties> + <license.git.maxCommitsLookup>10000</license.git.maxCommitsLookup> + </properties> + <mapping> + <proto>SLASHSTAR_STYLE</proto> + <config>SCRIPT_STYLE</config> + </mapping> <licenseSets> <licenseSet> <header>license/eupl_v1_2_de/header.txt</header> @@ -331,6 +338,11 @@ </licenseSets> </configuration> <dependencies> + <dependency> + <groupId>com.mycila</groupId> + <artifactId>license-maven-plugin-git</artifactId> + <version>${license.plugin.version}</version> + </dependency> <dependency> <groupId>de.ozgcloud.common</groupId> <artifactId>ozgcloud-common-license</artifactId> diff --git a/pom.xml b/pom.xml index 323ab0cdd03999636767280609aa06d0d4f02336..4e63eb4b74cfd2552aea432bf5db391cff875aa5 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ <module>ozgcloud-common-dependencies</module> <module>ozgcloud-common-parent</module> <module>ozgcloud-common-lib</module> + <module>ozgcloud-common-license</module> <module>ozgcloud-common-test</module> <module>ozgcloud-common-pdf</module> </modules> @@ -46,9 +47,10 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <ozgcloud-common.version>4.4.0-SNAPSHOT</ozgcloud-common.version> - <ozgcloud.license.version>1.3.0</ozgcloud.license.version> + <ozgcloud.license.version>1.7.0-SNAPSHOT</ozgcloud.license.version> <java.version>21</java.version> + <license.plugin.version>4.6</license.plugin.version> <maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.source>${java.version}</maven.compiler.source> <maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version> @@ -81,9 +83,13 @@ <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> - <version>4.1</version> + <version>${license.plugin.version}</version> <configuration> + <properties> + <license.git.maxCommitsLookup>10000</license.git.maxCommitsLookup> + </properties> <mapping> + <proto>SLASHSTAR_STYLE</proto> <config>SCRIPT_STYLE</config> </mapping> <licenseSets> @@ -98,6 +104,11 @@ </licenseSets> </configuration> <dependencies> + <dependency> + <groupId>com.mycila</groupId> + <artifactId>license-maven-plugin-git</artifactId> + <version>${license.plugin.version}</version> + </dependency> <dependency> <groupId>de.ozgcloud.common</groupId> <artifactId>ozgcloud-common-license</artifactId>