debian/changelog

+maven-resolver (1.1.1-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patch
+    - Ignore the new maven-resolver-demos module
+  * Use XZ compression for the upstream tarball
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 13 Jun 2018 10:40:47 +0200
+
 maven-resolver (1.1.0-3) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11~),
  default-jdk,
  junit4,
  libbuild-helper-maven-plugin-java,
@@ -18,9 +18,9 @@ Build-Depends:
  libsisu-plexus-java,
  libwagon-provider-api-java,
  maven-debian-helper (>= 1.4)
-Standards-Version: 4.1.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-resolver.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-resolver.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/maven-resolver.git
+Vcs-Browser: https://salsa.debian.org/java-team/maven-resolver
 Homepage: https://maven.apache.org/resolver/index.html
 
 Package: libmaven-resolver-java

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Maven Resolver
 Source: https://maven.apache.org/resolver/
 
 Files: *
 Copyright: 2010-2011 Sonatype, Inc.
            2011-2015, The Eclipse Foundation
-           2016-2017, The Apache Software Foundation
+           2016-2018, The Apache Software Foundation
 License: Apache-2.0
 
 Files: debian/*
 Copyright: 2011, Damien Raude-Morvan <drazzib@debian.org>
-           2014-2017, Emmanuel Bourg <ebourg@apache.org>
+           2014-2018, Emmanuel Bourg <ebourg@apache.org>
 License: Apache-2.0
 
 License: Apache-2.0

debian/libmaven-resolver-java.poms

@@ -27,6 +27,7 @@
 #
 pom.xml --no-parent --has-package-version
 maven-resolver-api/pom.xml --has-package-version
+maven-resolver-demos/pom.xml --ignore
 maven-resolver-spi/pom.xml --has-package-version
 maven-resolver-util/pom.xml --has-package-version
 maven-resolver-impl/pom.xml --has-package-version

debian/patches/01-sisu-maven-plugin.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/pom.xml
 +++ b/pom.xml
-@@ -294,7 +294,7 @@
+@@ -325,7 +325,7 @@
          <plugin>
            <groupId>org.eclipse.sisu</groupId>
            <artifactId>sisu-maven-plugin</artifactId>

debian/rules

 #!/usr/bin/make -f
 
 %:
-	dh $@ --buildsystem=maven
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename
+	dh $@

debian/watch

 version=3
+opts="repack,compression=xz" \
 https://github.com/apache/maven-resolver/tags .*/maven-resolver-([\d\.]+).*.tar.gz

maven-resolver-api/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.resolver</groupId>
     <artifactId>maven-resolver</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <artifactId>maven-resolver-api</artifactId>

maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionRange.java

@@ -54,7 +54,7 @@ public interface VersionRange
     /**
      * A bound of a version range.
      */
-    static final class Bound
+    final class Bound
     {
 
         private final Version version;

maven-resolver-connector-basic/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.resolver</groupId>
     <artifactId>maven-resolver</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <artifactId>maven-resolver-connector-basic</artifactId>

maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ArtifactTransportListener.java

@@ -32,7 +32,7 @@ final class ArtifactTransportListener
 
     private final RemoteRepository repository;
 
-    public ArtifactTransportListener( ArtifactTransfer transfer, RemoteRepository repository,
+    ArtifactTransportListener( ArtifactTransfer transfer, RemoteRepository repository,
                                       TransferEvent.Builder eventBuilder )
     {
         super( transfer, eventBuilder );

maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java

@@ -106,7 +106,7 @@ final class BasicRepositoryConnector
 
     private boolean closed;
 
-    public BasicRepositoryConnector( RepositorySystemSession session, RemoteRepository repository,
+    BasicRepositoryConnector( RepositorySystemSession session, RemoteRepository repository,
                                      TransporterProvider transporterProvider, RepositoryLayoutProvider layoutProvider,
                                      ChecksumPolicyProvider checksumPolicyProvider, FileProcessor fileProcessor,
                                      Logger logger )
@@ -346,7 +346,7 @@ final class BasicRepositoryConnector
 
         protected final TransferTransportListener<?> listener;
 
-        public TaskRunner( URI path, TransferTransportListener<?> listener )
+        TaskRunner( URI path, TransferTransportListener<?> listener )
         {
             this.path = path;
             this.listener = listener;
@@ -375,7 +375,7 @@ final class BasicRepositoryConnector
         extends TaskRunner
     {
 
-        public PeekTaskRunner( URI path, TransferTransportListener<?> listener )
+        PeekTaskRunner( URI path, TransferTransportListener<?> listener )
         {
             super( path, listener );
         }
@@ -397,7 +397,7 @@ final class BasicRepositoryConnector
 
         private final ChecksumValidator checksumValidator;
 
-        public GetTaskRunner( URI path, File file, ChecksumPolicy checksumPolicy,
+        GetTaskRunner( URI path, File file, ChecksumPolicy checksumPolicy,
                               List<RepositoryLayout.Checksum> checksums, TransferTransportListener<?> listener )
         {
             super( path, listener );
@@ -498,7 +498,7 @@ final class BasicRepositoryConnector
 
         private final Collection<RepositoryLayout.Checksum> checksums;
 
-        public PutTaskRunner( URI path, File file, List<RepositoryLayout.Checksum> checksums,
+        PutTaskRunner( URI path, File file, List<RepositoryLayout.Checksum> checksums,
                               TransferTransportListener<?> listener )
         {
             super( path, listener );

maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java

@@ -51,7 +51,7 @@ final class ChecksumCalculator
 
         Exception error;
 
-        public Checksum( String algorithm )
+        Checksum( String algorithm )
         {
             this.algorithm = algorithm;
             MessageDigest digest = null;

maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java

@@ -66,7 +66,7 @@ final class ChecksumValidator
 
     private final Map<File, Object> checksumFiles;
 
-    public ChecksumValidator( Logger logger, File dataFile, FileProcessor fileProcessor,
+    ChecksumValidator( Logger logger, File dataFile, FileProcessor fileProcessor,
                               ChecksumFetcher checksumFetcher, ChecksumPolicy checksumPolicy,
                               Collection<Checksum> checksums )
     {

maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/MetadataTransportListener.java

@@ -32,7 +32,7 @@ final class MetadataTransportListener
 
     private final RemoteRepository repository;
 
-    public MetadataTransportListener( MetadataTransfer transfer, RemoteRepository repository,
+    MetadataTransportListener( MetadataTransfer transfer, RemoteRepository repository,
                                       TransferEvent.Builder eventBuilder )
     {
         super( transfer, eventBuilder );

maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java

@@ -61,7 +61,7 @@ final class PartialFile
 
         private final AtomicBoolean concurrent;
 
-        public LockFile( File partFile, int requestTimeout, RemoteAccessChecker checker, Logger logger )
+        LockFile( File partFile, int requestTimeout, RemoteAccessChecker checker, Logger logger )
             throws Exception
         {
             lockFile = new File( partFile.getPath() + EXT_LOCK );
@@ -110,7 +110,7 @@ final class PartialFile
 
                     try
                     {
-                        Thread.sleep( Math.max( requestTimeout / 2, 100 ) );
+                        Thread.sleep( 100 );
                     }
                     catch ( InterruptedException e )
                     {
@@ -259,7 +259,7 @@ final class PartialFile
 
         private final Logger logger;
 
-        public Factory( boolean resume, long resumeThreshold, int requestTimeout, Logger logger )
+        Factory( boolean resume, long resumeThreshold, int requestTimeout, Logger logger )
         {
             this.resume = resume;
             this.resumeThreshold = resumeThreshold;

maven-resolver-demos/.gitattributes

+*        text=auto

maven-resolver-demos/.gitignore

+target/
+.project
+.classpath
+.settings/
+.idea
+*.iml
+*.ipr
+*.iws

maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.resolver</groupId>
+    <artifactId>maven-resolver-demos</artifactId>
+    <version>1.1.1</version>
+  </parent>
+
+  <artifactId>maven-resolver-demo-maven-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+
+  <name>Maven Artifact Resolver Demo Maven Plugin</name>
+  <description>
+    A simple Maven plugin using Maven Artifact Resolver with Maven repositories.
+  </description>
+
+  <prerequisites>
+    <maven>3.5.0</maven>
+  </prerequisites>
+
+  <properties>
+    <mavenVersion>3.5.0</mavenVersion>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-model</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>org.eclipse.sisu.plexus</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>run-its</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <version>3.0.1</version>
+            <configuration>
+              <debug>false</debug>
+              <projectsDirectory>src/it</projectsDirectory>
+              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+              <pomIncludes>
+                <pomInclude>*/pom.xml</pomInclude>
+              </pomIncludes>
+              <preBuildHookScript>setup</preBuildHookScript>
+              <postBuildHookScript>verify</postBuildHookScript>
+              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+              <settingsFile>src/it/settings.xml</settingsFile>
+              <goals>
+                <goal>clean</goal>
+                <goal>validate</goal>
+              </goals>
+            </configuration>
+            <executions>
+              <execution>
+                <id>integration-test</id>
+                <goals>
+                  <goal>install</goal>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>