From 1d52e26b0fc51d6cfa2a92225b81d39916ac6357 Mon Sep 17 00:00:00 2001 From: "Matteo Franci a.k.a. Fugerit" Date: Fri, 23 Aug 2024 22:11:38 +0200 Subject: [PATCH] groupId from parent --- CHANGELOG.md | 6 ++++++ .../fugerit/java/doc/project/facade/VenusContext.java | 10 +++++++++- fj-doc-maven-plugin/src/test/resources/ok2-pom/pom.xml | 7 ++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5966b3945..9437bbdd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- [fj-doc-maven-plugin] groupId from parent + +## [8.6.4] - 2024-08-22 + ### Changed - quarkus version set to 3.14.0 diff --git a/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/VenusContext.java b/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/VenusContext.java index 9d40d9dde..0f515f1df 100644 --- a/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/VenusContext.java +++ b/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/VenusContext.java @@ -58,6 +58,14 @@ public VenusContext(File projectDir, String version, String extensions ) { this.modules = new HashSet<>(); } + public String getGroupId() { + if ( this.getMavenModel().getGroupId() != null ) { + return this.getMavenModel().getGroupId(); + } else { + return this.getMavenModel().getParent().getGroupId(); + } + } + public String getArtificatIdForFolder() { return this.getMavenModel().getArtifactId().toLowerCase(); } @@ -75,7 +83,7 @@ public String getFreemarkerVersion() { } public String getDocConfigPackage() { - return this.getMavenModel().getGroupId()+"."+this.getArtificatIdForName(); + return this.getGroupId()+"."+this.getArtificatIdForName(); } public String getTemplateSubPath() { diff --git a/fj-doc-maven-plugin/src/test/resources/ok2-pom/pom.xml b/fj-doc-maven-plugin/src/test/resources/ok2-pom/pom.xml index 59a1d1a34..4f7c4e121 100644 --- a/fj-doc-maven-plugin/src/test/resources/ok2-pom/pom.xml +++ b/fj-doc-maven-plugin/src/test/resources/ok2-pom/pom.xml @@ -2,8 +2,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.fugerit.java + fj-bom + 1.6.5 + + fjdocmavenpluginok2 - org.fugerit.java.test 1.0.0-SNAPSHOT Fugerit Doc Maven Plugin Ok POM Test 2