You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/03/31 08:42:38 UTC
[maven-project-info-reports-plugin] branch MPIR-366 updated:
[MPIR-366] Drop Maven 2 support Give maven-compat test-scope Don't try to
get a timestamped version of an artifact if it was. This might cause
differences between build and report.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MPIR-366
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
The following commit(s) were added to refs/heads/MPIR-366 by this push:
new b9a5373 [MPIR-366] Drop Maven 2 support Give maven-compat test-scope Don't try to get a timestamped version of an artifact if it was. This might cause differences between build and report.
b9a5373 is described below
commit b9a537358b407cd3a24f209a2b6100f41980fa01
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Mar 31 10:42:31 2018 +0200
[MPIR-366] Drop Maven 2 support
Give maven-compat test-scope
Don't try to get a timestamped version of an artifact if it was. This might cause differences between build and report.
---
pom.xml | 2 +-
.../projectinfo/dependencies/RepositoryUtils.java | 28 ----------------------
2 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index ff269f0..c775c9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
-<!-- <scope>test</scope> -->
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
index f648019..384ed53 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
@@ -25,12 +25,8 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
-import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
@@ -267,30 +263,6 @@ public class RepositoryUtils
log.error( "Artifact: " + artifact.getId() + " could not be resolved." );
}
}
-
- for ( ArtifactMetadata m : artifact.getMetadataList() )
- {
- if ( m instanceof SnapshotArtifactRepositoryMetadata )
- {
- SnapshotArtifactRepositoryMetadata snapshotMetadata = (SnapshotArtifactRepositoryMetadata) m;
-
- Metadata metadata = snapshotMetadata.getMetadata();
- Versioning versioning = metadata.getVersioning();
- if ( versioning == null || versioning.getSnapshot() == null
- || versioning.getSnapshot().isLocalCopy()
- || versioning.getSnapshot().getTimestamp() == null )
- {
- continue;
- }
-
- // create the version according SnapshotTransformation
- String version =
- StringUtils.replace( copyArtifact.getVersion(), Artifact.SNAPSHOT_VERSION,
- versioning.getSnapshot().getTimestamp() )
- + "-" + versioning.getSnapshot().getBuildNumber();
- copyArtifact.setVersion( version );
- }
- }
}
}
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.