From 9802ce9e42f7ff06e1aa3406ab2a91e473521014 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Fri, 19 Jun 2020 23:34:28 -0400 Subject: [PATCH 1/5] Add enforcer for few required files in the project. --- pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pom.xml b/pom.xml index b6b8d10..8af74d0 100644 --- a/pom.xml +++ b/pom.xml @@ -898,6 +898,32 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M3 + + + enforce-files-exist + + enforce + + + + + + ${project.basedir}/README.md + ${project.basedir}/LICENSE.md + ${project.basedir}/CHANGELOG.md + + + + true + + + + + From 4b88c3e8a25282a06e639f827e33e4485abd1160 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Sun, 21 Jun 2020 16:09:23 -0400 Subject: [PATCH 2/5] Add enforcer for the version tag in CHANGELOG.md. --- pom.xml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pom.xml b/pom.xml index 8af74d0..30fce9b 100644 --- a/pom.xml +++ b/pom.xml @@ -924,6 +924,33 @@ + + org.codehaus.gmaven + groovy-maven-plugin + 2.0 + + + process-classes + + execute + + + + tag + + + def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') + matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) + if (!matcher.find()) { + throw new IllegalArgumentException("Tag [v$project.version] not found in CHANGELOG.md") + } + assert matcher[0][1]: "Tag [v$project.version] not found in CHANGELOG.md" + + + + + + From 1959cdf6d8776363813f98cac6b7e755f0e69bad Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Wed, 24 Jun 2020 18:50:41 -0400 Subject: [PATCH 3/5] Add LICENSE.md to META-INF folder when running with staging or release profile. --- pom.xml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 30fce9b..e485450 100644 --- a/pom.xml +++ b/pom.xml @@ -157,6 +157,15 @@ + + + ${project.basedir} + + LICENSE.md + + META-INF + + org.codehaus.mojo @@ -319,8 +328,17 @@ - + + + ${project.basedir} + + LICENSE.md + + META-INF + + + org.codehaus.mojo build-helper-maven-plugin @@ -448,8 +466,17 @@ - + + + ${project.basedir} + + LICENSE.md + + META-INF + + + org.codehaus.mojo build-helper-maven-plugin @@ -942,9 +969,9 @@ def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) if (!matcher.find()) { - throw new IllegalArgumentException("Tag [v$project.version] not found in CHANGELOG.md") + throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") } - assert matcher[0][1]: "Tag [v$project.version] not found in CHANGELOG.md" + assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" From f8a4a175b9618624b01481d8177fc8d8490b12c1 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Wed, 24 Jun 2020 21:21:05 -0400 Subject: [PATCH 4/5] Update README with the new enforcements. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index caf0c60..6a2fced 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ A parent pom for all the gCube artifacts. * Java 8 (target and source) * OpenJDK as target Java VM. * Maven 3.3.9+ +* README.md, CHANGELOG.md and LICENSE.md are present in the baseDir of each Maven module +* CHANGELOG.md must declare a tag [v+Pom version] (e.g. [v1.0.0]) # Build Profiles From 6acb0b5b6697b58bef06ddff2bcab891829204e3 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 6 Jul 2020 13:43:41 -0400 Subject: [PATCH 5/5] Remove release numbers from changelog. --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 415795e..1141b31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog for Maven-Parent -## [v1.1.0] [r4.23.0] 2020-01-27 +## [v1.1.0] - 2020-01-27 + +### Features * New build profiles to support CI/CD * Enforcement for: @@ -8,5 +10,5 @@ * OpenJDK as target Java VM. * Maven 3.3.9+ -## [v1.0.0] [r4.0.0] 2017-12-20 +## [v1.0.0] - 2017-12-20