diff --git a/pom.xml b/pom.xml index a590078..5b74aff 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,14 @@ 4.0.0 - io.airlift + com.facebook.airlift airbase - 134 + 105 - io.airlift.resolver + com.facebook.airlift.resolver resolver-root - 1.7.4-wxd + 1.7-SNASPSHOT pom Resolve the dependencies of Maven coordinates or POM file @@ -17,8 +17,8 @@ 2013 - scm:git:git://github.com/airlift/resolver.git - https://github.com/airlift/resolver + scm:git:git://github.com/prestodb/resolver.git + https://github.com/prestodb/resolver HEAD @@ -37,7 +37,7 @@ - io.airlift.resolver + com.facebook.airlift.resolver resolver ${project.version} diff --git a/resolver-integration/pom.xml b/resolver-integration/pom.xml index 3d35ccf..39e4c6f 100644 --- a/resolver-integration/pom.xml +++ b/resolver-integration/pom.xml @@ -2,12 +2,11 @@ 4.0.0 - io.airlift.resolver + com.facebook.airlift.resolver resolver-root - 1.7.4-wxd + 1.7-SNASPSHOT - io.airlift.resolver resolver-integration jar @@ -18,7 +17,7 @@ - io.airlift.resolver + com.facebook.airlift.resolver resolver test diff --git a/resolver-integration/src/main/java/io/airlift/resolver/Lame.java b/resolver-integration/src/main/java/com/facebook/airlift/resolver/Lame.java similarity index 70% rename from resolver-integration/src/main/java/io/airlift/resolver/Lame.java rename to resolver-integration/src/main/java/com/facebook/airlift/resolver/Lame.java index 53d8b94..dadc922 100644 --- a/resolver-integration/src/main/java/io/airlift/resolver/Lame.java +++ b/resolver-integration/src/main/java/com/facebook/airlift/resolver/Lame.java @@ -1,4 +1,4 @@ -package io.airlift.resolver; +package com.facebook.airlift.resolver; public class Lame { // TODO remove this when the maven build is fixed so we can release diff --git a/resolver-integration/src/test/java/io/airlift/resolver/TestArtifactResolve.java b/resolver-integration/src/test/java/com/facebook/airlift/resolver/TestArtifactResolve.java similarity index 94% rename from resolver-integration/src/test/java/io/airlift/resolver/TestArtifactResolve.java rename to resolver-integration/src/test/java/com/facebook/airlift/resolver/TestArtifactResolve.java index 84721d5..984aff7 100644 --- a/resolver-integration/src/test/java/io/airlift/resolver/TestArtifactResolve.java +++ b/resolver-integration/src/test/java/com/facebook/airlift/resolver/TestArtifactResolve.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.resolver; +package com.facebook.airlift.resolver; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; @@ -21,7 +21,7 @@ import java.io.File; import java.util.List; -import static io.airlift.resolver.ArtifactResolver.MAVEN_CENTRAL_URI; +import static com.facebook.airlift.resolver.ArtifactResolver.MAVEN_CENTRAL_URI; // NOTE: Intellij does not resolver this class correctly since the resolver jar is generated by the assembler plugin public class TestArtifactResolve diff --git a/resolver/pom.xml b/resolver/pom.xml index 9cc5773..dc8f2ea 100644 --- a/resolver/pom.xml +++ b/resolver/pom.xml @@ -2,16 +2,16 @@ 4.0.0 - io.airlift.resolver + com.facebook.airlift.resolver resolver-root - 1.7.4-wxd + 1.7-SNASPSHOT - io.airlift.resolver resolver ${project.parent.basedir} + 2.0.16 @@ -98,6 +98,14 @@ org.slf4j slf4j-api + ${dep.slf4j.version} + + + + org.slf4j + jcl-over-slf4j + ${dep.slf4j.version} + provided diff --git a/resolver/src/main/java/io/airlift/resolver/ArtifactResolver.java b/resolver/src/main/java/com/facebook/airlift/resolver/ArtifactResolver.java similarity index 98% rename from resolver/src/main/java/io/airlift/resolver/ArtifactResolver.java rename to resolver/src/main/java/com/facebook/airlift/resolver/ArtifactResolver.java index 3161374..0a0c5fe 100644 --- a/resolver/src/main/java/io/airlift/resolver/ArtifactResolver.java +++ b/resolver/src/main/java/com/facebook/airlift/resolver/ArtifactResolver.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.resolver; +package com.facebook.airlift.resolver; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.airlift.resolver.internal.ConsoleRepositoryListener; -import io.airlift.resolver.internal.ConsoleTransferListener; -import io.airlift.resolver.internal.DefaultArtifactResolver; +import com.facebook.airlift.resolver.internal.ConsoleRepositoryListener; +import com.facebook.airlift.resolver.internal.ConsoleTransferListener; +import com.facebook.airlift.resolver.internal.DefaultArtifactResolver; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.MavenProject; diff --git a/resolver/src/main/java/io/airlift/resolver/Main.java b/resolver/src/main/java/com/facebook/airlift/resolver/Main.java similarity index 91% rename from resolver/src/main/java/io/airlift/resolver/Main.java rename to resolver/src/main/java/com/facebook/airlift/resolver/Main.java index ad9e01b..0ff681a 100644 --- a/resolver/src/main/java/io/airlift/resolver/Main.java +++ b/resolver/src/main/java/com/facebook/airlift/resolver/Main.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.resolver; +package com.facebook.airlift.resolver; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; -import static io.airlift.resolver.ArtifactResolver.MAVEN_CENTRAL_URI; -import static io.airlift.resolver.ArtifactResolver.USER_LOCAL_REPO; +import static com.facebook.airlift.resolver.ArtifactResolver.MAVEN_CENTRAL_URI; +import static com.facebook.airlift.resolver.ArtifactResolver.USER_LOCAL_REPO; public class Main { diff --git a/resolver/src/main/java/io/airlift/resolver/internal/ConsoleRepositoryListener.java b/resolver/src/main/java/com/facebook/airlift/resolver/internal/ConsoleRepositoryListener.java similarity index 98% rename from resolver/src/main/java/io/airlift/resolver/internal/ConsoleRepositoryListener.java rename to resolver/src/main/java/com/facebook/airlift/resolver/internal/ConsoleRepositoryListener.java index 0123554..378c454 100644 --- a/resolver/src/main/java/io/airlift/resolver/internal/ConsoleRepositoryListener.java +++ b/resolver/src/main/java/com/facebook/airlift/resolver/internal/ConsoleRepositoryListener.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.resolver.internal; +package com.facebook.airlift.resolver.internal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/resolver/src/main/java/io/airlift/resolver/internal/ConsoleTransferListener.java b/resolver/src/main/java/com/facebook/airlift/resolver/internal/ConsoleTransferListener.java similarity index 98% rename from resolver/src/main/java/io/airlift/resolver/internal/ConsoleTransferListener.java rename to resolver/src/main/java/com/facebook/airlift/resolver/internal/ConsoleTransferListener.java index 1ec3d3c..0fccf08 100644 --- a/resolver/src/main/java/io/airlift/resolver/internal/ConsoleTransferListener.java +++ b/resolver/src/main/java/com/facebook/airlift/resolver/internal/ConsoleTransferListener.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.resolver.internal; +package com.facebook.airlift.resolver.internal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/resolver/src/main/java/io/airlift/resolver/internal/DefaultArtifactResolver.java b/resolver/src/main/java/com/facebook/airlift/resolver/internal/DefaultArtifactResolver.java similarity index 89% rename from resolver/src/main/java/io/airlift/resolver/internal/DefaultArtifactResolver.java rename to resolver/src/main/java/com/facebook/airlift/resolver/internal/DefaultArtifactResolver.java index ccd467b..ac3be03 100644 --- a/resolver/src/main/java/io/airlift/resolver/internal/DefaultArtifactResolver.java +++ b/resolver/src/main/java/com/facebook/airlift/resolver/internal/DefaultArtifactResolver.java @@ -1,4 +1,4 @@ -package io.airlift.resolver.internal; +package com.facebook.airlift.resolver.internal; import java.io.File; import java.io.IOException; @@ -65,7 +65,7 @@ public class DefaultArtifactResolver implements ArtifactResolver, Service { private static final String CONFIG_PROP_SNAPSHOT_NORMALIZATION = "aether.artifactResolver.snapshotNormalization"; private static final String CONFIG_PROP_SIMPLE_LRM_INTEROP = "aether.artifactResolver.simpleLrmInterop"; - private static final Logger LOGGER = LoggerFactory.getLogger(io.airlift.resolver.internal.DefaultArtifactResolver.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArtifactResolver.class); private FileProcessor fileProcessor; private RepositoryEventDispatcher repositoryEventDispatcher; private VersionResolver versionResolver; @@ -109,56 +109,56 @@ public void initService(ServiceLocator locator) { /** @deprecated */ @Deprecated - public io.airlift.resolver.internal.DefaultArtifactResolver setLoggerFactory(org.eclipse.aether.spi.log.LoggerFactory loggerFactory) { + public DefaultArtifactResolver setLoggerFactory(org.eclipse.aether.spi.log.LoggerFactory loggerFactory) { return this; } - public io.airlift.resolver.internal.DefaultArtifactResolver setFileProcessor(FileProcessor fileProcessor) { + public DefaultArtifactResolver setFileProcessor(FileProcessor fileProcessor) { this.fileProcessor = (FileProcessor)Objects.requireNonNull(fileProcessor, "file processor cannot be null"); return this; } - public io.airlift.resolver.internal.DefaultArtifactResolver setRepositoryEventDispatcher(RepositoryEventDispatcher repositoryEventDispatcher) { + public DefaultArtifactResolver setRepositoryEventDispatcher(RepositoryEventDispatcher repositoryEventDispatcher) { this.repositoryEventDispatcher = (RepositoryEventDispatcher)Objects.requireNonNull(repositoryEventDispatcher, "repository event dispatcher cannot be null"); return this; } - public io.airlift.resolver.internal.DefaultArtifactResolver setVersionResolver(VersionResolver versionResolver) { + public DefaultArtifactResolver setVersionResolver(VersionResolver versionResolver) { this.versionResolver = (VersionResolver)Objects.requireNonNull(versionResolver, "version resolver cannot be null"); return this; } - public io.airlift.resolver.internal.DefaultArtifactResolver setUpdateCheckManager(UpdateCheckManager updateCheckManager) { + public DefaultArtifactResolver setUpdateCheckManager(UpdateCheckManager updateCheckManager) { this.updateCheckManager = (UpdateCheckManager)Objects.requireNonNull(updateCheckManager, "update check manager cannot be null"); return this; } - public io.airlift.resolver.internal.DefaultArtifactResolver setRepositoryConnectorProvider(RepositoryConnectorProvider repositoryConnectorProvider) { + public DefaultArtifactResolver setRepositoryConnectorProvider(RepositoryConnectorProvider repositoryConnectorProvider) { this.repositoryConnectorProvider = (RepositoryConnectorProvider)Objects.requireNonNull(repositoryConnectorProvider, "repository connector provider cannot be null"); return this; } - public io.airlift.resolver.internal.DefaultArtifactResolver setRemoteRepositoryManager(RemoteRepositoryManager remoteRepositoryManager) { + public DefaultArtifactResolver setRemoteRepositoryManager(RemoteRepositoryManager remoteRepositoryManager) { this.remoteRepositoryManager = (RemoteRepositoryManager)Objects.requireNonNull(remoteRepositoryManager, "remote repository provider cannot be null"); return this; } - public io.airlift.resolver.internal.DefaultArtifactResolver setSyncContextFactory(SyncContextFactory syncContextFactory) { + public DefaultArtifactResolver setSyncContextFactory(SyncContextFactory syncContextFactory) { this.syncContextFactory = (SyncContextFactory)Objects.requireNonNull(syncContextFactory, "sync context factory cannot be null"); return this; } - public io.airlift.resolver.internal.DefaultArtifactResolver setOfflineController(OfflineController offlineController) { + public DefaultArtifactResolver setOfflineController(OfflineController offlineController) { this.offlineController = (OfflineController)Objects.requireNonNull(offlineController, "offline controller cannot be null"); return this; } - public io.airlift.resolver.internal.DefaultArtifactResolver setArtifactResolverPostProcessors(Map artifactResolverPostProcessors) { + public DefaultArtifactResolver setArtifactResolverPostProcessors(Map artifactResolverPostProcessors) { this.artifactResolverPostProcessors = (Map)Objects.requireNonNull(artifactResolverPostProcessors, "artifact resolver post-processors cannot be null"); return this; } - public io.airlift.resolver.internal.DefaultArtifactResolver setRemoteRepositoryFilterManager(RemoteRepositoryFilterManager remoteRepositoryFilterManager) { + public DefaultArtifactResolver setRemoteRepositoryFilterManager(RemoteRepositoryFilterManager remoteRepositoryFilterManager) { this.remoteRepositoryFilterManager = (RemoteRepositoryFilterManager)Objects.requireNonNull(remoteRepositoryFilterManager, "remote repository filter manager cannot be null"); return this; } @@ -213,7 +213,7 @@ private List resolve(RepositorySystemSession session, Collection boolean simpleLrmInterop = ConfigUtils.getBoolean(session, false, new String[]{"aether.artifactResolver.simpleLrmInterop"}); LocalRepositoryManager lrm = session.getLocalRepositoryManager(); WorkspaceReader workspace = session.getWorkspaceReader(); - List groups = new ArrayList(); + List groups = new ArrayList(); RemoteRepositoryFilter filter = this.remoteRepositoryFilterManager.getRemoteRepositoryFilter(session); Iterator var10 = requests.iterator(); @@ -310,7 +310,7 @@ private List resolve(RepositorySystemSession session, Collection LOGGER.debug("Resolving artifact {} from {}", artifact, remoteRepositories); AtomicBoolean resolved = new AtomicBoolean(false); - Iterator groupIt = groups.iterator(); + Iterator groupIt = groups.iterator(); Iterator var23 = ((List)filteredRemoteRepositories).iterator(); while(true) { @@ -334,10 +334,10 @@ private List resolve(RepositorySystemSession session, Collection } } - io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup group = null; + DefaultArtifactResolver.ResolutionGroup group = null; while(groupIt.hasNext()) { - io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup t = (io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup)groupIt.next(); + DefaultArtifactResolver.ResolutionGroup t = (DefaultArtifactResolver.ResolutionGroup)groupIt.next(); if (t.matches(repo)) { group = t; break; @@ -345,12 +345,12 @@ private List resolve(RepositorySystemSession session, Collection } if (group == null) { - group = new io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup(repo); + group = new DefaultArtifactResolver.ResolutionGroup(repo); groups.add(group); groupIt = Collections.emptyIterator(); } - group.items.add(new io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionItem(trace, artifact, resolved, result, local, repo)); + group.items.add(new DefaultArtifactResolver.ResolutionItem(trace, artifact, resolved, result, local, repo)); } } } @@ -359,7 +359,7 @@ private List resolve(RepositorySystemSession session, Collection var10 = groups.iterator(); while(var10.hasNext()) { - io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup group = (io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup)var10.next(); + DefaultArtifactResolver.ResolutionGroup group = (DefaultArtifactResolver.ResolutionGroup)var10.next(); this.performDownloads(session, group); } @@ -441,7 +441,7 @@ private File getFile(RepositorySystemSession session, Artifact artifact, File fi return file; } - private void performDownloads(RepositorySystemSession session, io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup group) { + private void performDownloads(RepositorySystemSession session, DefaultArtifactResolver.ResolutionGroup group) { List downloads = this.gatherDownloads(session, group); if (!downloads.isEmpty()) { Iterator var4 = downloads.iterator(); @@ -485,21 +485,21 @@ private void performDownloads(RepositorySystemSession session, io.airlift.resolv } } - private List gatherDownloads(RepositorySystemSession session, io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup group) { + private List gatherDownloads(RepositorySystemSession session, DefaultArtifactResolver.ResolutionGroup group) { LocalRepositoryManager lrm = session.getLocalRepositoryManager(); List downloads = new ArrayList(); Iterator var5 = group.items.iterator(); while(true) { while(true) { - io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionItem item; + DefaultArtifactResolver.ResolutionItem item; Artifact artifact; do { if (!var5.hasNext()) { return downloads; } - item = (io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionItem)var5.next(); + item = (DefaultArtifactResolver.ResolutionItem)var5.next(); artifact = item.artifact; } while(item.resolved.get()); @@ -542,12 +542,12 @@ private List gatherDownloads(RepositorySystemSession session, } } - private void evaluateDownloads(RepositorySystemSession session, io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup group) { + private void evaluateDownloads(RepositorySystemSession session, DefaultArtifactResolver.ResolutionGroup group) { LocalRepositoryManager lrm = session.getLocalRepositoryManager(); Iterator var4 = group.items.iterator(); while(var4.hasNext()) { - io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionItem item = (io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionItem)var4.next(); + DefaultArtifactResolver.ResolutionItem item = (DefaultArtifactResolver.ResolutionItem)var4.next(); ArtifactDownload download = item.download; if (download != null) { Artifact artifact = download.getArtifact(); @@ -625,7 +625,7 @@ private void artifactDownloaded(RepositorySystemSession session, RequestTrace tr static class ResolutionGroup { final RemoteRepository repository; - final List items = new ArrayList(); + final List items = new ArrayList(); ResolutionGroup(RemoteRepository repository) { this.repository = repository; diff --git a/resolver/src/main/java/io/airlift/resolver/internal/SafeTransferListener.java b/resolver/src/main/java/com/facebook/airlift/resolver/internal/SafeTransferListener.java similarity index 94% rename from resolver/src/main/java/io/airlift/resolver/internal/SafeTransferListener.java rename to resolver/src/main/java/com/facebook/airlift/resolver/internal/SafeTransferListener.java index 37111a0..8949484 100644 --- a/resolver/src/main/java/io/airlift/resolver/internal/SafeTransferListener.java +++ b/resolver/src/main/java/com/facebook/airlift/resolver/internal/SafeTransferListener.java @@ -1,4 +1,4 @@ -package io.airlift.resolver.internal; +package com.facebook.airlift.resolver.internal; import org.eclipse.aether.RepositorySystemSession; @@ -12,12 +12,12 @@ import java.util.Objects; class SafeTransferListener extends AbstractTransferListener { - private static final Logger LOGGER = LoggerFactory.getLogger(io.airlift.resolver.internal.SafeTransferListener.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SafeTransferListener.class); private final TransferListener listener; public static TransferListener wrap(RepositorySystemSession session) { TransferListener listener = session.getTransferListener(); - return listener == null ? null : new io.airlift.resolver.internal.SafeTransferListener(listener); + return listener == null ? null : new SafeTransferListener(listener); } protected SafeTransferListener(RepositorySystemSession session) { diff --git a/resolver/src/main/java/io/airlift/resolver/internal/Utils.java b/resolver/src/main/java/com/facebook/airlift/resolver/internal/Utils.java similarity index 96% rename from resolver/src/main/java/io/airlift/resolver/internal/Utils.java rename to resolver/src/main/java/com/facebook/airlift/resolver/internal/Utils.java index 8287686..3594993 100644 --- a/resolver/src/main/java/io/airlift/resolver/internal/Utils.java +++ b/resolver/src/main/java/com/facebook/airlift/resolver/internal/Utils.java @@ -1,4 +1,4 @@ -package io.airlift.resolver.internal; +package com.facebook.airlift.resolver.internal; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; diff --git a/resolver/src/test/java/io/airlift/resolver/ArtifactResolverTest.java b/resolver/src/test/java/com/facebook/airlift/resolver/ArtifactResolverTest.java similarity index 93% rename from resolver/src/test/java/io/airlift/resolver/ArtifactResolverTest.java rename to resolver/src/test/java/com/facebook/airlift/resolver/ArtifactResolverTest.java index 79a1de4..0f4ab2c 100644 --- a/resolver/src/test/java/io/airlift/resolver/ArtifactResolverTest.java +++ b/resolver/src/test/java/com/facebook/airlift/resolver/ArtifactResolverTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.resolver; +package com.facebook.airlift.resolver; import com.google.common.collect.ImmutableList; import org.eclipse.aether.artifact.Artifact; @@ -25,8 +25,8 @@ import java.util.Objects; import static com.google.common.collect.ImmutableList.toImmutableList; -import static io.airlift.resolver.ArtifactResolver.MAVEN_CENTRAL_URI; -import static io.airlift.resolver.ArtifactResolver.USER_LOCAL_REPO; +import static com.facebook.airlift.resolver.ArtifactResolver.MAVEN_CENTRAL_URI; +import static com.facebook.airlift.resolver.ArtifactResolver.USER_LOCAL_REPO; import static org.testng.Assert.assertTrue; public class ArtifactResolverTest