[Git][java-team/maven-artifact-transfer][master] 4 commits: Depend on libmaven-parent-java

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-artifact-transfer


Commits:
45c64ad0 by Emmanuel Bourg at 2023-01-12T11:40:36+01:00
Depend on libmaven-parent-java

- - - - -
5c4e3c07 by Emmanuel Bourg at 2023-01-12T12:35:25+01:00
Fixed the build failure with Maven 3.8 (Closes: #1021549)

- - - - -
55003732 by Emmanuel Bourg at 2023-01-12T12:35:30+01:00
Standards-Version updated to 4.6.2

- - - - -
fcaf6908 by Emmanuel Bourg at 2023-01-12T12:35:40+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/libmaven-artifact-transfer-java.poms
- debian/maven.rules
- debian/patches/02-maven-compatibility.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+maven-artifact-transfer (0.13.1-2) unstable; urgency=medium
+
+  * Fixed the build failure with Maven 3.8 (Closes: #1021549)
+  * Depend on libmaven-parent-java
+  * Standards-Version updated to 4.6.2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 12 Jan 2023 12:35:32 +0100
+
 maven-artifact-transfer (0.13.1-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/control
=====================================
@@ -7,16 +7,19 @@ Build-Depends:
  debhelper-compat (= 13),
  default-jdk,
  junit4,
+ libeclipse-sisu-maven-plugin-java,
  libmaven3-core-java,
  libmaven-common-artifact-filters-java (>= 3.0),
+ libmaven-parent-java,
  libmaven-plugin-testing-java,
  libmaven-resolver-java,
  libmaven-shade-plugin-java,
  libmockito-java,
+ libmodello-maven-plugin-java,
  libplexus-component-annotations-java (>= 1.7.1-6~),
  libplexus-component-metadata-java,
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/maven-artifact-transfer.git
 Vcs-Browser: https://salsa.debian.org/java-team/maven-artifact-transfer
 Homepage: http://maven.apache.org/shared/maven-artifact-transfer/


=====================================
debian/libmaven-artifact-transfer-java.poms
=====================================
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --has-package-version
+pom.xml --has-package-version


=====================================
debian/maven.rules
=====================================
@@ -1,6 +1,7 @@
 junit junit * s/4\..*/4.x/ * *
 org.apache.maven maven-core     * s/.*/3.x/ * *
 org.apache.maven maven-artifact * s/.*/3.x/ * *
+org.apache.maven.shared maven-shared-components pom s/.*/debian/ * *
 org.codehaus.plexus plexus-component-metadata maven-plugin s/1.7.1/1.5.5/ * *
 org.codehaus.plexus plexus-utils * s/.*/2.x/
 


=====================================
debian/patches/02-maven-compatibility.patch
=====================================
@@ -3,7 +3,26 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
 +++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
-@@ -263,4 +263,13 @@
+@@ -165,6 +165,18 @@
+     }
+ 
+     @Override
++    public boolean isBlocked()
++    {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public void setBlocked( boolean blocked )
++    {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
+     public Artifact find( Artifact artifact )
+     {
+         throw new UnsupportedOperationException();
+@@ -263,4 +275,13 @@
          }
          return true;
      }
@@ -19,7 +38,26 @@ Forwarded: no
  }
 --- a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java
 +++ b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java
-@@ -262,4 +262,13 @@
+@@ -165,6 +165,18 @@
+     }
+ 
+     @Override
++    public boolean isBlocked()
++    {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public void setBlocked( boolean blocked )
++    {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
+     public Artifact find( Artifact artifact )
+     {
+         throw new UnsupportedOperationException();
+@@ -262,4 +274,13 @@
          }
          return true;
      }



View it on GitLab: https://salsa.debian.org/java-team/maven-artifact-transfer/-/compare/26bad7324f16b480c313a8dbb86f0f7a1a8d7451...fcaf6908939e1a27f76f2741881cc448fe25371a

-- 
View it on GitLab: https://salsa.debian.org/java-team/maven-artifact-transfer/-/compare/26bad7324f16b480c313a8dbb86f0f7a1a8d7451...fcaf6908939e1a27f76f2741881cc448fe25371a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230112/bb34b457/attachment.htm>