Trying to remove compiler warning
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/60bbe9dd Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/60bbe9dd Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/60bbe9dd Branch: refs/heads/master Commit: 60bbe9dde66927177808f577eca9b5238ec7c614 Parents: 83df105 Author: Martin Stockhammer <[email protected]> Authored: Mon Apr 2 00:22:19 2018 +0200 Committer: Martin Stockhammer <[email protected]> Committed: Mon Apr 2 00:22:19 2018 +0200 ---------------------------------------------------------------------- ...CleanupReleasedSnapshotsRepositoryPurge.java | 52 ++++++++++++++++++-- ...nupReleasedSnapshotsRepositoryPurgeTest.java | 1 + .../repository/metadata/MetadataTools.java | 2 + 3 files changed, 52 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/60bbe9dd/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java index f30bf6a..e36b394 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java @@ -166,7 +166,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge if ( needsMetadataUpdate ) { - updateMetadata( path ); + updateMetadata( artifactRef ); } } catch ( LayoutException e ) @@ -183,17 +183,63 @@ public class CleanupReleasedSnapshotsRepositoryPurge } } - private void updateMetadata( String path ) + + /* + * TODO: Uses a deprecated API, but if we use the API with location string, it does not work as expected + * -> not sure what needs to be changed here. + */ + @SuppressWarnings( "deprecation" ) + private void updateMetadata( ArtifactReference artifact ) { + VersionedReference versionRef = new VersionedReference( ); + versionRef.setGroupId( artifact.getGroupId( ) ); + versionRef.setArtifactId( artifact.getArtifactId( ) ); + versionRef.setVersion( artifact.getVersion( ) ); + + ProjectReference projectRef = new ProjectReference( ); + projectRef.setGroupId( artifact.getGroupId( ) ); + projectRef.setArtifactId( artifact.getArtifactId( ) ); try { - metadataTools.updateMetadata( repository, path ); + metadataTools.updateMetadata( repository, versionRef ); + } + catch ( ContentNotFoundException e ) + { + // Ignore. (Just means we have no snapshot versions left to reference). } catch ( RepositoryMetadataException e ) { // Ignore. } + catch ( IOException e ) + { + // Ignore. + } + catch ( LayoutException e ) + { + // Ignore. + } + try + { + metadataTools.updateMetadata( repository, projectRef ); + } + catch ( ContentNotFoundException e ) + { + // Ignore. (Just means we have no snapshot versions left to reference). + } + catch ( RepositoryMetadataException e ) + { + // Ignore. + } + catch ( IOException e ) + { + // Ignore. + } + catch ( LayoutException e ) + { + // Ignore. + } } } http://git-wip-us.apache.org/repos/asf/archiva/blob/60bbe9dd/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java index 2ee46ed..01f9a29 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java @@ -171,6 +171,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest XMLAssert.assertXpathEvaluatesTo( "2.3", "//metadata/versioning/release", metadataXml ); XMLAssert.assertXpathEvaluatesTo( "2.3", "//metadata/versioning/latest", metadataXml ); + System.out.println(metadataXml); XMLAssert.assertXpathsEqual( "//expected/versions/version", expectedVersions, "//metadata/versioning/versions/version", metadataXml ); XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml ); http://git-wip-us.apache.org/repos/asf/archiva/blob/60bbe9dd/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java index 4444e7c..8312e2b 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java @@ -285,6 +285,8 @@ public class MetadataTools return reference; } + + public String toPath( ProjectReference reference ) { StringBuilder path = new StringBuilder();
