Skip to content

Commit 417e910

Browse files
committed
Fix ftest failure
When a pom file changed in a hosted repo, it will trigger a maven-metadata removing in the GA level and cascading removing for affected groups. For fix problem of this, we use DownloadManager.delete to solve readonly hosted repo deletion not allowed problem, but it does not support clear group metadata. So this fix will allow remove the mergable metadata through that method.
1 parent 39782b9 commit 417e910

3 files changed

Lines changed: 10 additions & 1 deletion

File tree

core/src/main/java/org/commonjava/indy/core/content/DefaultDownloadManager.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,14 @@ public boolean delete( final ArtifactStore store, final String path, final Event
970970

971971
if ( store.getKey().getType() == StoreType.group )
972972
{
973-
return false;
973+
// We should allow deletion of the group level mergeable metadata here, for supporting
974+
// the cascading deletion from hosted member pom file deletion. See MetadataMergePomChangeListener.metaClear
975+
// for details
976+
final SpecialPathInfo pathInfo = specialPathManager.getSpecialPathInfo( path );
977+
if ( pathInfo == null || !pathInfo.isMetadata() || !pathInfo.isMergable() )
978+
{
979+
return false;
980+
}
974981
}
975982

976983
if ( storeManager.isReadonly( store ) && !isIgnoreReadonly( eventMetadata ) )

embedder/src/it/resources/logback.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<logger name="org.commonjava" level="TRACE" />
3737
<logger name="org.commonjava.indy.model.core.StoreKey" level="INFO" />
3838
<logger name="org.commonjava.indy.pkg.npm.content.NPMStoragePathCalculator" level="INFO" />
39+
<logger name="org.commonjava.indy.metrics" level="INFO" />
3940
<!-- <logger name="org.commonjava.maven.galley.transport" level="DEBUG" /> -->
4041

4142
<root level="INFO">

embedder/src/test/resources/logback-test.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<logger name="org.commonjava.maven.galley" level="TRACE"/>
4747
<logger name="org.commonjava.indy.model.core.StoreKey" level="INFO" />
4848
<logger name="org.commonjava.indy.pkg.npm.content.NPMStoragePathCalculator" level="INFO" />
49+
<logger name="org.commonjava.indy.metrics" level="INFO" />
4950

5051
<root level="INFO">
5152
<appender-ref ref="STDOUT" />

0 commit comments

Comments
 (0)