diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 2d0a05320..fa6fde3f1 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -57,7 +57,7 @@ jobs: with: servers: | [{ - "id": "sonatype-nexus-snapshots", + "id": "central-portal-snapshots", "username": "${{ secrets.SONATYPE_BOT_USERNAME }}", "password": "${{ secrets.SONATYPE_BOT_TOKEN }}" }] diff --git a/api/src/main/java/org/commonjava/maven/galley/model/Transfer.java b/api/src/main/java/org/commonjava/maven/galley/model/Transfer.java index e6943d4dd..396f4e993 100644 --- a/api/src/main/java/org/commonjava/maven/galley/model/Transfer.java +++ b/api/src/main/java/org/commonjava/maven/galley/model/Transfer.java @@ -34,7 +34,7 @@ import java.io.InputStream; import java.io.OutputStream; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; public class Transfer { diff --git a/api/src/main/java/org/commonjava/maven/galley/util/UrlUtils.java b/api/src/main/java/org/commonjava/maven/galley/util/UrlUtils.java index 85d159e4c..af8beabdf 100644 --- a/api/src/main/java/org/commonjava/maven/galley/util/UrlUtils.java +++ b/api/src/main/java/org/commonjava/maven/galley/util/UrlUtils.java @@ -15,7 +15,7 @@ */ package org.commonjava.maven.galley.util; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.commonjava.maven.galley.util.LocationUtils.ATTR_PATH_ENCODE; import static org.commonjava.maven.galley.util.LocationUtils.PATH_ENCODE_BASE64; diff --git a/caches/partyline/src/main/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProvider.java b/caches/partyline/src/main/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProvider.java index 78032e5a9..7f572cb6e 100644 --- a/caches/partyline/src/main/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProvider.java +++ b/caches/partyline/src/main/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProvider.java @@ -25,7 +25,7 @@ import org.commonjava.maven.galley.spi.event.FileEventManager; import org.commonjava.maven.galley.spi.io.PathGenerator; import org.commonjava.maven.galley.util.PathUtils; -import org.commonjava.util.partyline.JoinableFileManager; +import org.commonjava.util.partyline.Partyline; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +55,7 @@ public class PartyLineCacheProvider private final Logger logger = LoggerFactory.getLogger( getClass() ); - private final JoinableFileManager fileManager; + private final Partyline fileManager; private final PartyLineCacheProviderConfig config; @@ -70,7 +70,7 @@ public class PartyLineCacheProvider public PartyLineCacheProvider( final File cacheBasedir, final PathGenerator pathGenerator, final FileEventManager fileEventManager, final TransferDecoratorManager transferDecorator, final ScheduledExecutorService deleteExecutor, - final JoinableFileManager fileManager) + final Partyline fileManager) { this.pathGenerator = pathGenerator; this.fileEventManager = fileEventManager; diff --git a/caches/partyline/src/main/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderFactory.java b/caches/partyline/src/main/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderFactory.java index 816b444e2..c257e8982 100644 --- a/caches/partyline/src/main/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderFactory.java +++ b/caches/partyline/src/main/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderFactory.java @@ -20,7 +20,7 @@ import org.commonjava.maven.galley.spi.cache.CacheProvider; import org.commonjava.maven.galley.spi.event.FileEventManager; import org.commonjava.maven.galley.spi.io.PathGenerator; -import org.commonjava.util.partyline.JoinableFileManager; +import org.commonjava.util.partyline.Partyline; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +61,7 @@ public synchronized CacheProvider create( PathGenerator pathGenerator, TransferD { if ( provider == null ) { - JoinableFileManager fileManager = new JoinableFileManager(); + Partyline fileManager = new Partyline(); provider = new PartyLineCacheProvider( cacheDir, pathGenerator, fileEventManager, transferDecorator, deleteExecutor, fileManager ); provider.getConfig().withTimeoutProcessingEnabled( timeoutProcessing ); diff --git a/caches/partyline/src/test/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderConcurrentIOTest.java b/caches/partyline/src/test/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderConcurrentIOTest.java index cc76876a7..e94100e3e 100644 --- a/caches/partyline/src/test/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderConcurrentIOTest.java +++ b/caches/partyline/src/test/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderConcurrentIOTest.java @@ -28,7 +28,7 @@ import org.commonjava.maven.galley.spi.event.FileEventManager; import org.commonjava.maven.galley.spi.io.PathGenerator; import org.commonjava.maven.galley.spi.io.TransferDecorator; -import org.commonjava.util.partyline.JoinableFileManager; +import org.commonjava.util.partyline.Partyline; import org.jboss.byteman.contrib.bmunit.BMScript; import org.jboss.byteman.contrib.bmunit.BMUnitConfig; import org.junit.Before; @@ -81,7 +81,7 @@ public void setup() throws Exception { provider = new PartyLineCacheProvider( temp.newFolder(), pathgen, events, new TransferDecoratorManager( decorator ), - Executors.newScheduledThreadPool( 2 ), new JoinableFileManager() ); + Executors.newScheduledThreadPool( 2 ), new Partyline() ); latch = new CountDownLatch( 2 ); } diff --git a/caches/partyline/src/test/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderTest.java b/caches/partyline/src/test/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderTest.java index d70634789..01a8703c4 100644 --- a/caches/partyline/src/test/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderTest.java +++ b/caches/partyline/src/test/java/org/commonjava/maven/galley/cache/partyline/PartyLineCacheProviderTest.java @@ -24,7 +24,7 @@ import org.commonjava.maven.galley.spi.event.FileEventManager; import org.commonjava.maven.galley.spi.io.PathGenerator; import org.commonjava.maven.galley.spi.io.TransferDecorator; -import org.commonjava.util.partyline.JoinableFileManager; +import org.commonjava.util.partyline.Partyline; import org.junit.Before; import org.junit.Rule; import org.junit.rules.TemporaryFolder; @@ -49,7 +49,7 @@ public void setup() final TransferDecorator decorator = new TestTransferDecorator(); provider = new PartyLineCacheProvider( temp.newFolder(), pathgen, events, new TransferDecoratorManager( decorator ), - Executors.newScheduledThreadPool( 2 ), new JoinableFileManager() ); + Executors.newScheduledThreadPool( 2 ), new Partyline() ); } @Override diff --git a/caches/tck/src/main/java/org/commonjava/maven/galley/cache/CacheProviderTCK.java b/caches/tck/src/main/java/org/commonjava/maven/galley/cache/CacheProviderTCK.java index fea2f97e4..b0b6b37fd 100644 --- a/caches/tck/src/main/java/org/commonjava/maven/galley/cache/CacheProviderTCK.java +++ b/caches/tck/src/main/java/org/commonjava/maven/galley/cache/CacheProviderTCK.java @@ -36,7 +36,7 @@ import java.util.HashSet; import java.util.Set; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -122,8 +122,8 @@ public void writeAndListDirectory() out.flush(); out.close(); - // NOTE: This is NOT as tightly specified as I would like. - // We keep the listing assertions loose (greater-than instead of equals, + // NOTE: This is NOT as tightly specified as I would like. + // We keep the listing assertions loose (greater-than instead of equals, // contains instead of exact positional assertion) because the Infinispan // live testing has these spurious foo.txt.#0 files cropping up. // diff --git a/cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java b/cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java index dda6c5c3f..c8ce82705 100644 --- a/cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java +++ b/cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java @@ -42,7 +42,7 @@ import org.commonjava.o11yphant.trace.SpanFieldsDecorator; import org.commonjava.o11yphant.trace.TraceManager; import org.commonjava.o11yphant.trace.TracerConfiguration; -import org.commonjava.util.partyline.JoinableFileManager; +import org.commonjava.util.partyline.Partyline; import org.junit.Assert; import org.junit.rules.TemporaryFolder; @@ -155,7 +155,7 @@ public void start() temp.create(); cacheProvider = new PartyLineCacheProvider( temp.newFolder(), pathGenerator, eventManager, transferDecorator, - Executors.newScheduledThreadPool( 2 ), new JoinableFileManager() ); + Executors.newScheduledThreadPool( 2 ), new Partyline() ); fileTransportConfig = new FileTransportConfig( temp.newFolder(), pathGenerator ); } catch ( IOException e ) diff --git a/core/src/main/java/org/commonjava/maven/galley/internal/TransferManagerImpl.java b/core/src/main/java/org/commonjava/maven/galley/internal/TransferManagerImpl.java index 7cf8b1a83..4b197e946 100644 --- a/core/src/main/java/org/commonjava/maven/galley/internal/TransferManagerImpl.java +++ b/core/src/main/java/org/commonjava/maven/galley/internal/TransferManagerImpl.java @@ -72,7 +72,7 @@ import static java.lang.Boolean.TRUE; import static org.apache.commons.io.IOUtils.closeQuietly; import static org.apache.commons.io.IOUtils.copy; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import static org.commonjava.maven.galley.model.Transfer.DELETE_CONTENT_LOG; import static org.commonjava.maven.galley.util.LocationUtils.getTimeoutSeconds; diff --git a/core/src/main/java/org/commonjava/maven/galley/io/SpecialPathManagerImpl.java b/core/src/main/java/org/commonjava/maven/galley/io/SpecialPathManagerImpl.java index facb67536..cbb82f268 100644 --- a/core/src/main/java/org/commonjava/maven/galley/io/SpecialPathManagerImpl.java +++ b/core/src/main/java/org/commonjava/maven/galley/io/SpecialPathManagerImpl.java @@ -34,7 +34,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import static org.commonjava.maven.galley.io.SpecialPathConstants.MVN_SP_PATH_SET; import static org.commonjava.maven.galley.io.SpecialPathConstants.NPM_SP_PATH_SET; import static org.commonjava.maven.galley.io.SpecialPathConstants.PKG_TYPE_MAVEN; diff --git a/maven/src/main/java/org/commonjava/maven/galley/maven/parse/PomPeek.java b/maven/src/main/java/org/commonjava/maven/galley/maven/parse/PomPeek.java index bb72c176d..cb4199680 100644 --- a/maven/src/main/java/org/commonjava/maven/galley/maven/parse/PomPeek.java +++ b/maven/src/main/java/org/commonjava/maven/galley/maven/parse/PomPeek.java @@ -18,12 +18,11 @@ import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; import static org.apache.commons.io.IOUtils.closeQuietly; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.join; import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; diff --git a/maven/src/main/java/org/commonjava/maven/galley/maven/parse/XMLInfrastructure.java b/maven/src/main/java/org/commonjava/maven/galley/maven/parse/XMLInfrastructure.java index a54a8ee79..ff0b0d5a9 100644 --- a/maven/src/main/java/org/commonjava/maven/galley/maven/parse/XMLInfrastructure.java +++ b/maven/src/main/java/org/commonjava/maven/galley/maven/parse/XMLInfrastructure.java @@ -16,7 +16,7 @@ package org.commonjava.maven.galley.maven.parse; import static org.apache.commons.io.IOUtils.closeQuietly; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; import java.io.File; import java.io.FileInputStream; diff --git a/pom.xml b/pom.xml index c6b94a900..40fdac174 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.commonjava commonjava - 18 + 21 org.commonjava.maven.galley @@ -50,15 +50,17 @@ Red Hat, Inc. https://github.com/Commonjava/galley - 1.1.3 - 1.16 - 2.5 - 1.24 - 1.15 - 9.4.7.Final + 1.1.8 + 2.2 + 3.1 + 1.25 + 1.16 + + 9.4.24.Final 3.1.9.Final - 4.0.20 - 1.9.1 + 4.0.26 + 1.9.2 + 3.7.1.0 5.4.33.Final 2.2.220 @@ -66,8 +68,6 @@ 1.3.2 1 true - 2.15.2 - 1.4.14 false @@ -179,7 +179,7 @@ org.commonjava.boms web-commons-bom - 29 + 31 import pom @@ -187,20 +187,10 @@ org.commonjava.util http-testserver - 1.3 + 1.5.3 test - - org.apache.commons - commons-lang3 - 3.7 - - - commons-codec - commons-codec - 1.15 - org.hamcrest hamcrest-core @@ -242,7 +232,7 @@ org.jsoup jsoup - 1.15.3 + 1.21.2 org.codehaus.plexus @@ -265,11 +255,6 @@ infinispan-commons ${infinispanVersion} - - org.jboss.logging - jboss-logging - 3.4.3.Final - @@ -347,29 +332,10 @@ javax.annotation-api ${annotationVersion} - - com.fasterxml.jackson.core - jackson-core - ${jacksonVersion} - - - com.fasterxml.jackson.core - jackson-annotations - ${jacksonVersion} - - - com.fasterxml.jackson.core - jackson-databind - ${jacksonVersion} - - - commons-lang - commons-lang - junit junit @@ -388,16 +354,6 @@ javax.enterprise cdi-api - - ch.qos.logback - logback-classic - ${logbackVersion} - - - ch.qos.logback - logback-core - ${logbackVersion} - @@ -424,7 +380,6 @@ ${javaVersion} ${javaVersion} - ${javaVersion} diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java index 92818c74b..1cf7bf152 100644 --- a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java +++ b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java @@ -122,7 +122,7 @@ public DownloadJob createDownloadJob( final ConcreteResource resource, final Tra { return new HttpDownload( getUrl( resource ), getHttpLocation( resource.getLocation(), download ), target, transferSizes, eventMetadata, http, mapper, metricRegistry, metricConfig, - globalProxyConfig.getEgressSites(), proxySitesCache ); + globalProxyConfig == null ? null : globalProxyConfig.getEgressSites(), proxySitesCache ); } @Override @@ -165,7 +165,8 @@ public ListingJob createListingJob( final ConcreteResource resource, final Trans { return new HttpListing( getUrl( resource ), new ConcreteResource( getHttpLocation( resource.getLocation(), listing ), - resource.getPath() ), http, globalProxyConfig.getEgressSites(), + resource.getPath() ), http, + globalProxyConfig == null ? null : globalProxyConfig.getEgressSites(), proxySitesCache ); } @@ -190,7 +191,7 @@ public ExistenceJob createExistenceJob( final ConcreteResource resource, final T throws TransferException { return new HttpExistence( getUrl( resource ), getHttpLocation( resource.getLocation(), existence ), target, - http, mapper, globalProxyConfig.getEgressSites(), proxySitesCache ); + http, mapper, globalProxyConfig == null ? null : globalProxyConfig.getEgressSites(), proxySitesCache ); } private String getUrl( final ConcreteResource resource )