Support building quarkus 3.2.x applications (#765)

jfrog · Nov 22, 2023 · dc03705 · dc03705
1 parent b2b0f84
commit dc03705
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 740 deletions.
diff --git a/...nfo-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildInfoRecorder.java b/...nfo-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildInfoRecorder.java
@@ -116,9 +116,7 @@ public void setDependencyParentsMaps(Map<String, String[][]> dependencyParentsMa
     }
 
     /**
-     * The repository listeners (either ArtifactoryEclipseRepositoryListener or
-     * ArtifactorySonatypeRepositoryListener) invoke this method with each
-     * artifact being resolved by Maven.
+     * The repository listener invokes this method with each artifact being resolved by Maven.
      *
      * @param artifact The artifact being resolved by Maven.
      */

diff --git a/...in/java/org/jfrog/build/extractor/maven/resolver/ArtifactoryResolutionRepositoryBase.java b/...in/java/org/jfrog/build/extractor/maven/resolver/ArtifactoryResolutionRepositoryBase.java
@@ -7,8 +7,8 @@
 import org.jfrog.build.extractor.Proxy;
 import org.jfrog.build.extractor.ProxySelector;
 
-import static org.sonatype.aether.repository.Proxy.TYPE_HTTP;
-import static org.sonatype.aether.repository.Proxy.TYPE_HTTPS;
+import static org.eclipse.aether.repository.Proxy.TYPE_HTTP;
+import static org.eclipse.aether.repository.Proxy.TYPE_HTTPS;
 
 public abstract class ArtifactoryResolutionRepositoryBase {
     protected final String releaseRepoUrl;
@@ -65,18 +65,6 @@ public org.apache.maven.repository.Proxy createMavenProxy(String repoUrl) {
         return proxy;
     }
 
-    public org.sonatype.aether.repository.Proxy createSonatypeProxy(String repoUrl) {
-        Proxy proxyConfig = proxySelector.getProxy(repoUrl);
-        if (proxyConfig == null) {
-            return null;
-        }
-        return new org.sonatype.aether.repository.Proxy(
-                proxyConfig.isHttps() ? TYPE_HTTPS : TYPE_HTTP,
-                proxyConfig.getHost(),
-                proxyConfig.getPort(),
-                StringUtils.isNotBlank(proxyConfig.getUsername()) ? new org.sonatype.aether.repository.Authentication(proxyConfig.getUsername(), proxyConfig.getPassword()) : null);
-    }
-
     public org.eclipse.aether.repository.Proxy createEclipseProxy(String repoUrl) {
         Proxy proxyConfig = proxySelector.getProxy(repoUrl);
         if (proxyConfig == null) {

diff --git a/...in/java/org/jfrog/build/extractor/maven/resolver/ArtifactorySonatypeArtifactResolver.java b/...in/java/org/jfrog/build/extractor/maven/resolver/ArtifactorySonatypeArtifactResolver.java
diff --git a/...in/java/org/jfrog/build/extractor/maven/resolver/ArtifactorySonatypeMetadataResolver.java b/...in/java/org/jfrog/build/extractor/maven/resolver/ArtifactorySonatypeMetadataResolver.java