diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
index 778d802e5..8cce0ef13 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
@@ -106,3 +106,8 @@ NETWORKPROXY_PASSWORD=admin123
# Browse - MRM-1278 test
SNAPSHOTS_REPOSITORY=snapshots
RELEASES_REPOSITORY=releases
+
+# Audit Log Report - MRM-1304
+AUDITLOG_GROUPID=group.id
+AUDITLOG_EXPECTED_ARTIFACT=group/id/test/1.0/test-1.0.jar
+
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
index 0f3dcc6c4..dbe3d08ed 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
@@ -164,4 +164,27 @@ public class AuditLogsReportTest
clickLinkWithText( "Logout" );
login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) );
}
+
+ @Test (dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload")
+ public void testViewAuditLogsReportForGroupId()
+ {
+ String groupId = getProperty("AUDITLOG_GROUPID");
+ String artifactId = getProperty("ARTIFACTID");
+ String version = getProperty("VERSION");
+ String packaging = getProperty("PACKAGING");
+ String repositoryId = getProperty("REPOSITORYID");
+ String expectedArtifact = getProperty("AUDITLOG_EXPECTED_ARTIFACT");
+
+ addArtifact( groupId, artifactId, version, packaging, getProperty( "SNAPSHOT_ARTIFACTFILEPATH" ), repositoryId );
+
+ goToAuditLogReports();
+
+ selectValue( "repository", repositoryId );
+ setFieldValue( "groupId", groupId );
+ submit();
+
+ assertAuditLogsReportPage();
+ assertTextPresent( expectedArtifact );
+ assertTextPresent( repositoryId );
+ }
}
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java
index 5c0aec712..bc121ca1b 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java
@@ -160,7 +160,8 @@ public class ViewAuditLogReportAction
if ( groupId != null && !"".equals( groupId.trim() ) )
{
- artifact = groupId + ( ( artifactId != null && !"".equals( artifactId.trim() ) ) ? ( "/" + artifactId + "/%" ) : "%" );
+ String modifiedGroupId = groupId.replace( ".", "/" );
+ artifact = modifiedGroupId + ( ( artifactId != null && !"".equals( artifactId.trim() ) ) ? ( "/" + artifactId + "/%" ) : "%" );
}
else
{
diff --git a/pom.xml b/pom.xml
index 3c6a2f3a4..3c3089a72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
org.apache.archiva
archiva-parent
- 5
+ 6-SNAPSHOT
../parent/pom.xml
Archiva