From 8dda61f5dd50859deaa8751f7d94b407c804a31a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 27 Nov 2024 11:59:12 +0100
Subject: [PATCH] OZG-6544: Move excludes to licenseSet due to deprecation.
Readd resources-folders as excludes to avoid headers in text files. Clearify
by commentary, where each configuration is used. Add inceptionYear for
correct setup.
---
ozgcloud-common-dependencies/pom.xml | 1 +
ozgcloud-common-lib/pom.xml | 2 +-
ozgcloud-common-license/pom.xml | 1 +
ozgcloud-common-parent/pom.xml | 14 +++++++++-----
ozgcloud-common-pdf/pom.xml | 1 +
ozgcloud-common-test/pom.xml | 1 +
pom.xml | 14 ++++++--------
7 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/ozgcloud-common-dependencies/pom.xml b/ozgcloud-common-dependencies/pom.xml
index 30a84e4..74f63ce 100644
--- a/ozgcloud-common-dependencies/pom.xml
+++ b/ozgcloud-common-dependencies/pom.xml
@@ -38,6 +38,7 @@
<name>OzgCloud Common - Dependencies</name>
<packaging>pom</packaging>
<description>Dependenencies management for ozgcloud projects</description>
+ <inceptionYear>2021</inceptionYear>
<properties>
<vorgang-manager.version>2.17.0</vorgang-manager.version>
diff --git a/ozgcloud-common-lib/pom.xml b/ozgcloud-common-lib/pom.xml
index 1373e1d..fd696ec 100644
--- a/ozgcloud-common-lib/pom.xml
+++ b/ozgcloud-common-lib/pom.xml
@@ -36,12 +36,12 @@
<artifactId>ozgcloud-common-lib</artifactId>
<name>OzgCloud Common - Shared Lib</name>
+ <inceptionYear>2021</inceptionYear>
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<mockito.version>5.10.0</mockito.version>
-
</properties>
<dependencyManagement>
diff --git a/ozgcloud-common-license/pom.xml b/ozgcloud-common-license/pom.xml
index ee4b1da..73855ae 100644
--- a/ozgcloud-common-license/pom.xml
+++ b/ozgcloud-common-license/pom.xml
@@ -35,6 +35,7 @@
<name>OzgCloud Common - OS license provider</name>
<description>A Maven project for providing the license to all OzgCloud Projects</description>
+ <inceptionYear>2021</inceptionYear>
<properties>
<java.version>17</java.version>
diff --git a/ozgcloud-common-parent/pom.xml b/ozgcloud-common-parent/pom.xml
index 3110c96..ec87cda 100644
--- a/ozgcloud-common-parent/pom.xml
+++ b/ozgcloud-common-parent/pom.xml
@@ -42,6 +42,7 @@
<packaging>pom</packaging>
<name>OzgCloud Common - Parent</name>
<description>Parent for all OzgCloud spring boot projects</description>
+ <inceptionYear>2021</inceptionYear>
<properties>
<java.version>21</java.version>
@@ -314,6 +315,7 @@
</execution>
</executions>
</plugin>
+ <!-- This plugin configuration is used for generating licenses in daughter project -->
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
@@ -333,13 +335,15 @@
<licenseSets>
<licenseSet>
<header>license/eupl_v1_2_de/header.txt</header>
+ <excludes>
+ <exclude>src/test/resources/**</exclude>
+ <exclude>src/main/resources/**</exclude>
+ <exclude>**/.angular/cache/**</exclude>
+ <exclude>**/.nx/**</exclude>
+ <exclude>**/node_modules/**</exclude>
+ </excludes>
</licenseSet>
</licenseSets>
- <excludes>
- <exclude>**/.angular/cache/**</exclude>
- <exclude>**/.nx/**</exclude>
- <exclude>**/node_modules/**</exclude>
- </excludes>
</configuration>
<dependencies>
<dependency>
diff --git a/ozgcloud-common-pdf/pom.xml b/ozgcloud-common-pdf/pom.xml
index e892101..3b85975 100644
--- a/ozgcloud-common-pdf/pom.xml
+++ b/ozgcloud-common-pdf/pom.xml
@@ -35,6 +35,7 @@
</parent>
<artifactId>ozgcloud-common-pdf</artifactId>
<name>OzgCloud Common - PDF Export library</name>
+ <inceptionYear>2021</inceptionYear>
<properties>
<fop.version>2.9</fop.version>
diff --git a/ozgcloud-common-test/pom.xml b/ozgcloud-common-test/pom.xml
index 73adb3e..64123f7 100644
--- a/ozgcloud-common-test/pom.xml
+++ b/ozgcloud-common-test/pom.xml
@@ -36,6 +36,7 @@
<artifactId>ozgcloud-common-test</artifactId>
<name>OzgCloud Common - Test Lib</name>
+ <inceptionYear>2021</inceptionYear>
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index a207c85..57aa6db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
<artifactId>ozgcloud-common</artifactId>
<version>4.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <inceptionYear>2021</inceptionYear>
<name>OzgCloud Common</name>
@@ -80,6 +81,7 @@
<build>
<pluginManagement>
<plugins>
+ <!-- This plugin configuration is used for generating licenses in this repository -->
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
@@ -92,20 +94,16 @@
<proto>SLASHSTAR_STYLE</proto>
<config>SCRIPT_STYLE</config>
<md>XML_STYLE</md>
- <ftlh>FTL</ftlh>
- <tpl>SCRIPT_STYLE</tpl>
- <ts>SLASHSTAR_STYLE</ts>
</mapping>
<licenseSets>
<licenseSet>
<header>license/eupl_v1_2_de/header.txt</header>
</licenseSet>
+ <excludes>
+ <exclude>src/test/resources/**</exclude>
+ <exclude>src/main/resources/**</exclude>
+ </excludes>
</licenseSets>
- <excludes>
- <exclude>**/.angular/cache/**</exclude>
- <exclude>**/.nx/**</exclude>
- <exclude>**/node_modules/**</exclude>
- </excludes>
</configuration>
<dependencies>
<dependency>
--
GitLab