Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support building quarkus 3.2.x applications #765

Merged
merged 1 commit into from
Nov 22, 2023
Merged

Support building quarkus 3.2.x applications #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...nfo-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildInfoRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
16 changes: 2 additions & 14 deletions ...in/java/org/jfrog/build/extractor/maven/resolver/ArtifactoryResolutionRepositoryBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
72 changes: 0 additions & 72 deletions ...in/java/org/jfrog/build/extractor/maven/resolver/ArtifactorySonatypeArtifactResolver.java
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions ...in/java/org/jfrog/build/extractor/maven/resolver/ArtifactorySonatypeMetadataResolver.java
View file
Open in desktop

This file was deleted.

Loading
Loading