File: 01-maven-compatibility.patch

package info (click to toggle)
maven-deploy-plugin 2.8.2-3
  • links: PTS, VCS
  • area: main
  • in suites: bullseye, buster
  • size: 880 kB
  • ctags: 269
  • sloc: xml: 1,973; java: 1,811; sh: 8; makefile: 5
file content (51 lines) | stat: -rw-r--r-- 1,905 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
Description: Fixes the compilation failures with the latest version of Maven in Debian
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java
+++ b/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java
@@ -27,7 +27,7 @@
 import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
 
 public class ArtifactRepositoryStub
-    implements ArtifactRepository
+    extends org.apache.maven.plugin.testing.stubs.StubArtifactRepository
 {
     private boolean blacklisted;
     
@@ -37,6 +37,16 @@
     
     private String basedir = System.getProperty( "basedir" );
 
+    public ArtifactRepositoryStub()
+    {
+        super( null );
+    }
+
+    public ArtifactRepositoryStub( String dir )
+    {
+        super( dir );
+    }
+
     public String pathOf( Artifact artifact )
     {
         return getLayout().pathOf( artifact );
--- a/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java
+++ b/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java
@@ -412,7 +412,7 @@
         
         
         @SuppressWarnings( "unchecked" )
-        List<AttachedArtifactStub> attachedArtifacts = project.getAttachedArtifacts();
+        List<org.apache.maven.artifact.Artifact> attachedArtifacts = project.getAttachedArtifacts();
 
         ArtifactRepositoryStub repo = getRepoStub( mojo );
         
@@ -422,7 +422,7 @@
 
         String packaging = project.getPackaging();
 
-        for( AttachedArtifactStub attachedArtifact : attachedArtifacts )
+        for( org.apache.maven.artifact.Artifact attachedArtifact : attachedArtifacts )
         {
             File deployedArtifact = new File( remoteRepo, "basic-deploy-with-attached-artifacts" + "/" +
                                                attachedArtifact.getGroupId().replace( '.', '/' ) + "/" +