fix

Author: wxiaoguang

modules/packages/maven/metadata.go

@@ -4,6 +4,7 @@
 package maven
 
 import (
+"code.gitea.io/gitea/modules/util"
 "encoding/xml"
 "io"
 
@@ -31,18 +32,27 @@ type Dependency struct {
 }
 
 type pomStruct struct {
-XMLName xml.Name `xml:"project"`
-GroupID string `xml:"groupId"`
-ArtifactID string `xml:"artifactId"`
-Version string `xml:"version"`
-Name string `xml:"name"`
-Description string `xml:"description"`
-URL string `xml:"url"`
-Licenses []struct {
+XMLName xml.Name `xml:"project"`
+
+Parent struct {
+GroupID string `xml:"groupId"`
+ArtifactID string `xml:"artifactId"`
+Version string `xml:"version"`
+} `xml:"parent"`
+
+GroupID string `xml:"groupId"`
+ArtifactID string `xml:"artifactId"`
+Version string `xml:"version"`
+Name string `xml:"name"`
+Description string `xml:"description"`
+URL string `xml:"url"`
+
+Licenses []struct {
 Name string `xml:"name"`
 URL string `xml:"url"`
 Distribution string `xml:"distribution"`
 } `xml:"licenses>license"`
+
 Dependencies []struct {
 GroupID string `xml:"groupId"`
 ArtifactID string `xml:"artifactId"`
@@ -81,8 +91,16 @@ func ParsePackageMetaData(r io.Reader) (*Metadata, error) {
 })
 }
 
+pomGroupID := pom.GroupID
+if pomGroupID == "" {
+// the current module could inherit parent: https://maven.apache.org/pom.html#Inheritance
+pomGroupID = pom.Parent.GroupID
+}
+if pomGroupID == "" {
+return nil, util.ErrInvalidArgument
+}
 return &Metadata{
-GroupID: pom.GroupID,
+GroupID: pomGroupID,
 ArtifactID: pom.ArtifactID,
 Name: pom.Name,
 Description: pom.Description,

modules/packages/maven/metadata_test.go

@@ -4,10 +4,12 @@
 package maven
 
 import (
+"code.gitea.io/gitea/modules/util"
 "strings"
 "testing"
 
 "github.com/stretchr/testify/assert"
+"github.com/stretchr/testify/require"
 "golang.org/x/text/encoding/charmap"
 )
 
@@ -86,4 +88,35 @@ func TestParsePackageMetaData(t *testing.T) {
 assert.NoError(t, err)
 assert.NotNil(t, m)
 })
+
+t.Run("ParentInherit", func(t *testing.T) {
+pom := `<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.mycompany.app</groupId>
+ <artifactId>my-app</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>submodule1</artifactId>
+</project>
+`
+m, err := ParsePackageMetaData(strings.NewReader(pom))
+require.NoError(t, err)
+require.NotNil(t, m)
+
+assert.Equal(t, "com.mycompany.app", m.GroupID)
+assert.Equal(t, "submodule1", m.ArtifactID)
+})
+
+t.Run("ParentInherit", func(t *testing.T) {
+pom := `<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId></artifactId>
+</project>
+`
+_, err := ParsePackageMetaData(strings.NewReader(pom))
+require.ErrorIs(t, err, util.ErrInvalidArgument)
+})
 }