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

Merge pull request 'OZG-6839 License Header auf Jahr-der-Erstellung ändern'...

Merge pull request 'OZG-6839 License Header auf Jahr-der-Erstellung ändern' (#28) from OZG-6839-License-Header-auf-Jahr-der-Erstellung-aendern into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-lib/common-lib/pulls/28


Reviewed-by: default avatarOZGCloud <ozgcloud@mgm-tp.com>
Reviewed-by: default avatarOZGCloud <ozgcloud@mgm-tp.com>
parents 75b2e088 61944b71
No related branches found
No related tags found
No related merge requests found
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<properties> <properties>
<vorgang-manager.version>2.15.0-SNAPSHOT</vorgang-manager.version> <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.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<dependency> <dependency>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-license</artifactId> <artifactId>ozgcloud-common-license</artifactId>
<version>${license.version}</version> <version>${ozgcloud.license.version}</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-license</artifactId> <artifactId>ozgcloud-common-license</artifactId>
<version>1.6.0</version> <version>1.7.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OzgCloud Common - OS license provider</name> <name>OzgCloud Common - OS license provider</name>
...@@ -49,4 +49,29 @@ ...@@ -49,4 +49,29 @@
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </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> </project>
\ No newline at end of file
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 Ministerpräsidenten des Landes Schleswig-Holstein
Staatskanzlei Staatskanzlei
Abteilung Digitalisierung und zentrales IT-Management der Landesregierung Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<ozgcloud-common.version>4.4.0-SNAPSHOT</ozgcloud-common.version> <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> <mapstruct.version>1.6.0</mapstruct.version>
<spring-boot.version>3.3.3</spring-boot.version> <spring-boot.version>3.3.3</spring-boot.version>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<jacoco.plugin.version>0.8.12</jacoco.plugin.version> <jacoco.plugin.version>0.8.12</jacoco.plugin.version>
<sonarqube.version>3.9.1.2184</sonarqube.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> <rewrite.plugin.version>4.38.2</rewrite.plugin.version>
<!--overriden for issue CVE-2021-26291--> <!--overriden for issue CVE-2021-26291-->
...@@ -319,6 +319,13 @@ ...@@ -319,6 +319,13 @@
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>${license.plugin.version}</version> <version>${license.plugin.version}</version>
<configuration> <configuration>
<properties>
<license.git.maxCommitsLookup>10000</license.git.maxCommitsLookup>
</properties>
<mapping>
<proto>SLASHSTAR_STYLE</proto>
<config>SCRIPT_STYLE</config>
</mapping>
<licenseSets> <licenseSets>
<licenseSet> <licenseSet>
<header>license/eupl_v1_2_de/header.txt</header> <header>license/eupl_v1_2_de/header.txt</header>
...@@ -331,6 +338,11 @@ ...@@ -331,6 +338,11 @@
</licenseSets> </licenseSets>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin-git</artifactId>
<version>${license.plugin.version}</version>
</dependency>
<dependency> <dependency>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-license</artifactId> <artifactId>ozgcloud-common-license</artifactId>
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<module>ozgcloud-common-dependencies</module> <module>ozgcloud-common-dependencies</module>
<module>ozgcloud-common-parent</module> <module>ozgcloud-common-parent</module>
<module>ozgcloud-common-lib</module> <module>ozgcloud-common-lib</module>
<module>ozgcloud-common-license</module>
<module>ozgcloud-common-test</module> <module>ozgcloud-common-test</module>
<module>ozgcloud-common-pdf</module> <module>ozgcloud-common-pdf</module>
</modules> </modules>
...@@ -46,9 +47,10 @@ ...@@ -46,9 +47,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ozgcloud-common.version>4.4.0-SNAPSHOT</ozgcloud-common.version> <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> <java.version>21</java.version>
<license.plugin.version>4.6</license.plugin.version>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version> <maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version>
...@@ -81,9 +83,13 @@ ...@@ -81,9 +83,13 @@
<plugin> <plugin>
<groupId>com.mycila</groupId> <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>4.1</version> <version>${license.plugin.version}</version>
<configuration> <configuration>
<properties>
<license.git.maxCommitsLookup>10000</license.git.maxCommitsLookup>
</properties>
<mapping> <mapping>
<proto>SLASHSTAR_STYLE</proto>
<config>SCRIPT_STYLE</config> <config>SCRIPT_STYLE</config>
</mapping> </mapping>
<licenseSets> <licenseSets>
...@@ -98,6 +104,11 @@ ...@@ -98,6 +104,11 @@
</licenseSets> </licenseSets>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin-git</artifactId>
<version>${license.plugin.version}</version>
</dependency>
<dependency> <dependency>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-license</artifactId> <artifactId>ozgcloud-common-license</artifactId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment