Skip to content

Commit dc03705

Browse files
authored
Support building quarkus 3.2.x applications (#765)
1 parent b2b0f84 commit dc03705

9 files changed

+3
-740
lines changed

Diff for: build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildInfoRecorder.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ public void setDependencyParentsMaps(Map<String, String[][]> dependencyParentsMa
116116
}
117117

118118
/**
119-
* The repository listeners (either ArtifactoryEclipseRepositoryListener or
120-
* ArtifactorySonatypeRepositoryListener) invoke this method with each
121-
* artifact being resolved by Maven.
119+
* The repository listener invokes this method with each artifact being resolved by Maven.
122120
*
123121
* @param artifact The artifact being resolved by Maven.
124122
*/

Diff for: build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/resolver/ArtifactoryResolutionRepositoryBase.java

+2-14
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import org.jfrog.build.extractor.Proxy;
88
import org.jfrog.build.extractor.ProxySelector;
99

10-
import static org.sonatype.aether.repository.Proxy.TYPE_HTTP;
11-
import static org.sonatype.aether.repository.Proxy.TYPE_HTTPS;
10+
import static org.eclipse.aether.repository.Proxy.TYPE_HTTP;
11+
import static org.eclipse.aether.repository.Proxy.TYPE_HTTPS;
1212

1313
public abstract class ArtifactoryResolutionRepositoryBase {
1414
protected final String releaseRepoUrl;
@@ -65,18 +65,6 @@ public org.apache.maven.repository.Proxy createMavenProxy(String repoUrl) {
6565
return proxy;
6666
}
6767

68-
public org.sonatype.aether.repository.Proxy createSonatypeProxy(String repoUrl) {
69-
Proxy proxyConfig = proxySelector.getProxy(repoUrl);
70-
if (proxyConfig == null) {
71-
return null;
72-
}
73-
return new org.sonatype.aether.repository.Proxy(
74-
proxyConfig.isHttps() ? TYPE_HTTPS : TYPE_HTTP,
75-
proxyConfig.getHost(),
76-
proxyConfig.getPort(),
77-
StringUtils.isNotBlank(proxyConfig.getUsername()) ? new org.sonatype.aether.repository.Authentication(proxyConfig.getUsername(), proxyConfig.getPassword()) : null);
78-
}
79-
8068
public org.eclipse.aether.repository.Proxy createEclipseProxy(String repoUrl) {
8169
Proxy proxyConfig = proxySelector.getProxy(repoUrl);
8270
if (proxyConfig == null) {

Diff for: build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/resolver/ArtifactorySonatypeArtifactResolver.java

-72
This file was deleted.

Diff for: build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/resolver/ArtifactorySonatypeMetadataResolver.java

-61
This file was deleted.

0 commit comments

Comments
 (0)