groupId from parent

fugerit-org · Aug 23, 2024 · 1d52e26 · 1d52e26
1 parent 8e567fc
commit 1d52e26
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git 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
@@ -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
@@ -2,8 +2,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
+	<parent>
+		<groupId>org.fugerit.java</groupId>
+		<artifactId>fj-bom</artifactId>
+		<version>1.6.5</version>
+	</parent>
+
 	<artifactId>fjdocmavenpluginok2</artifactId>
-	<groupId>org.fugerit.java.test</groupId>
 	<version>1.0.0-SNAPSHOT</version>
 
 	<name>Fugerit Doc Maven Plugin Ok POM Test 2</name>