Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: airlift/resolver
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: prestodb/resolver
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 15 commits
  • 20 files changed
  • 7 contributors

Commits on Mar 10, 2023

  1. Update project 

    Changes:
* update to latest resolver and maven (move off org.sonatype)
* keep all almost untouched (but mark deprecations)
    @cstamas
    cstamas committed Mar 10, 2023
    Copy the full SHA
    30ddfc7 View commit details

  2. Fix TODOs

    @cstamas
    cstamas committed Mar 10, 2023
    Copy the full SHA
    836cc77 View commit details

Commits on Oct 8, 2024

  1. Upgraded resolver

    @infvg
    infvg authored and infvg committed Oct 8, 2024

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    f27484f View commit details

  2. Modified versions

    infvg committed Oct 8, 2024

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    4bf4472 View commit details

  3. Removed broken files

    @infvg
    infvg authored and infvg committed Oct 8, 2024

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    ee19518 View commit details

Commits on Jan 6, 2025

  1. Add cli tests 

    If implemented, this will enable cli tests on this repository
    @infvg
    infvg committed Jan 6, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    infvg inf
    GPG key ID: 065294EFA895EFDB
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a6fb22f View commit details

Commits on Jan 8, 2025

  1. Merge pull request #3 from infvg/add-cli 

    Add cli tests
    @tdcmeehan
    tdcmeehan authored Jan 8, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    40f6dad View commit details

Commits on Jan 16, 2025

  1. Moved initialization to improve speed

    @infvg
    infvg authored and infvg committed Jan 16, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    infvg inf
    GPG key ID: 065294EFA895EFDB
    Verified
    Learn about vigilant mode
    Copy the full SHA
    263ff8c View commit details

  2. Merge pull request #2 from infvg/rework-maven 

    Reworked to use maven resolver
    @tdcmeehan
    tdcmeehan authored Jan 16, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dc97f92 View commit details

Commits on May 8, 2025

  1. - Change airbase parent to com.facebook.airlift:airbase 

    - Revert version to 1.7-SNAPSHOT
- Take direct dependency on slf4j version to resolve maven upper bound conflicts
    @aaneja @ZacBlanco
    aaneja authored and ZacBlanco committed May 8, 2025

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    49cb54f View commit details

  2. Change groupId from io.airlift.resolver to com.facebook.airlift.resolver

    @aaneja @ZacBlanco
    aaneja authored and ZacBlanco committed May 8, 2025

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    ba30199 View commit details

  3. Fix type in POM versions (#6)

    @aaneja
    aaneja authored May 8, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d42b9dd View commit details

Commits on May 15, 2025

  1. Add release action

    @unidevel @ZacBlanco
    unidevel authored and ZacBlanco committed May 15, 2025

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    8bba281 View commit details

  2. [maven-release-plugin] prepare release 1.7

    @prestodb-ci
    prestodb-ci committed May 15, 2025
    Copy the full SHA
    7eeadea View commit details

  3. [maven-release-plugin] prepare for next development iteration

    @prestodb-ci
    prestodb-ci committed May 15, 2025
    Copy the full SHA
    1b132df View commit details
Showing with 1,388 additions and 881 deletions.
  1. +30 −0 .github/workflows/maven.yml
  2. +97 −0 .github/workflows/release.yml
  3. +82 −71 pom.xml
  4. +5 −6 resolver-integration/pom.xml
  5. +1 −1 resolver-integration/src/main/java/{io → com/facebook}/airlift/resolver/Lame.java
  6. +4 −3 resolver-integration/src/test/java/{io → com/facebook}/airlift/resolver/TestArtifactResolve.java
  7. +33 −28 resolver/pom.xml
  8. +82 −39 resolver/src/main/java/{io → com/facebook}/airlift/resolver/ArtifactResolver.java
  9. +5 −4 resolver/src/main/java/{io → com/facebook}/airlift/resolver/Main.java
  10. +3 −3 resolver/src/main/java/{io → com/facebook}/airlift/resolver/internal/ConsoleRepositoryListener.java
  11. +4 −4 resolver/src/main/java/{io → com/facebook}/airlift/resolver/internal/ConsoleTransferListener.java
  12. +660 −0 resolver/src/main/java/com/facebook/airlift/resolver/internal/DefaultArtifactResolver.java
  13. +112 −0 resolver/src/main/java/com/facebook/airlift/resolver/internal/SafeTransferListener.java
  14. +28 −0 resolver/src/main/java/com/facebook/airlift/resolver/internal/Utils.java
  15. +0 −357 resolver/src/main/java/io/airlift/resolver/DefaultArtifact.java
  16. +0 −141 resolver/src/main/java/io/airlift/resolver/internal/Slf4jLogger.java
  17. +0 −142 resolver/src/main/java/io/airlift/resolver/internal/Slf4jLoggerManager.java
  18. +232 −0 resolver/src/main/java/org/eclipse/aether/impl/ResolverArtifactResolver.java
  19. +6 −6 resolver/src/test/java/{io → com/facebook}/airlift/resolver/ArtifactResolverTest.java
  20. +4 −76 resolver/src/test/poms/maven-core-3.0.4.pom
30 changes: 30 additions & 0 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

name: Java CI with Maven

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
show-progress: false
# needed for the git-commit-id-plugin to work
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'temurin'
cache: maven
- name: Maven verify
run: mvn verify
97 changes: 97 additions & 0 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
name: Publish release

on:
workflow_dispatch:

env:
JAVA_VERSION: ${{ vars.JAVA_VERSION }}
JAVA_DISTRIBUTION: ${{ vars.JAVA_DISTRIBUTION }}
MAVEN_OPTS: ${{ vars.MAVEN_OPTS }}
GPG_KEY_FILE: /tmp/gpg-key.txt

jobs:
publish-release:
runs-on: ubuntu-latest
environment: release
strategy:
fail-fast: true
permissions:
contents: write
packages: write

steps:
- name: Check branch
if: ${{ github.ref != 'refs/heads/master' }}
run: echo "Invalid branch. This action can only be run on the master branch." && exit 1

- name: Checkout source
uses: actions/checkout@v4
with:
token: ${{ secrets.PRESTODB_CI_TOKEN }}
show-progress: false
fetch-depth: 0
ref: master

- name: Set up JDK ${{ env.JAVA_DISTRIBUTION }}/${{ env.JAVA_VERSION }}
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
overwrite-settings: true
server-id: ossrh
server-username: NEXUS_USERNAME
server-password: NEXUS_PASSWORD
gpg-private-key: ${{ secrets.GPG_SECRET }}

- name: Set up git
run: |
git config --global --add safe.directory ${{github.workspace}}
git config --global user.email "ci@lists.prestodb.io"
git config --global user.name "prestodb-ci"
git config --global alias.ls 'log --pretty=format:"%cd %h %ce: %s" --date=short --no-merges'
git config pull.rebase false
- name: Get release version
id: get-version
run: |
RELEASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | tail -n 1 | sed 's/-SNAPSHOT//')
echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_ENV
echo "RELEASE_VERSION=$RELEASE_VERSION"
echo "In case cut release failed, please delete the tag ${RELEASE_VERSION} manually"
- name: Prepare release
run: |
git reset --hard
mvn release:prepare -DreleaseVersion=${{ env.RELEASE_VERSION }}
grep -m 1 "<version>" pom.xml
git ls -5
- name: Set up GPG key
env:
GPG_TTY: $(tty)
run: |
echo "${{ secrets.GPG_SECRET }}" > ${{ env.GPG_KEY_FILE }}
chmod 600 ${{ env.GPG_KEY_FILE }}
gpg --import --batch ${{ env.GPG_KEY_FILE }}
gpg --batch --yes --pinentry-mode loopback --passphrase "${{ secrets.GPG_PASSPHRASE }}" --sign ${{ env.GPG_KEY_FILE }}
- name: Publish release
env:
NEXUS_USERNAME: "${{ secrets.NEXUS_USERNAME }}"
NEXUS_PASSWORD: "${{ secrets.NEXUS_PASSWORD }}"
GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}"
run: |
git checkout ${{ env.RELEASE_VERSION }}
git ls -5
cat ~/.m2/settings.xml
mvn -V -B -U -e -T2C deploy -Poss-release \
-DautoReleaseAfterClose=true \
-DkeepStagingRepositoryOnCloseRuleFailure=true \
-DkeepStagingRepositoryOnFailure=true \
-DstagingProgressTimeoutMinutes=10
- name: Push changes and tags
run: |
git checkout master
git ls -5
git push origin master --tags
153 changes: 82 additions & 71 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -2,29 +2,29 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.airlift</groupId>
<groupId>com.facebook.airlift</groupId>
<artifactId>airbase</artifactId>
<version>80</version>
<version>105</version>
</parent>

<groupId>io.airlift.resolver</groupId>
<groupId>com.facebook.airlift.resolver</groupId>
<artifactId>resolver-root</artifactId>
<version>1.7-SNAPSHOT</version>
<version>1.8-SNAPSHOT</version>
<packaging>pom</packaging>

<description>Resolve the dependencies of Maven coordinates or POM file</description>
<name>${project.artifactId}</name>
<inceptionYear>2013</inceptionYear>

<scm>
<connection>scm:git:git://github.com/airlift/resolver.git</connection>
<url>https://github.com/airlift/resolver</url>
<connection>scm:git:git://github.com/prestodb/resolver.git</connection>
<url>https://github.com/prestodb/resolver</url>
<tag>HEAD</tag>
</scm>

<properties>
<dep.aether.version>1.13.1</dep.aether.version>
<dep.maven.version>3.0.4</dep.maven.version>
<dep.aether.version>1.9.6</dep.aether.version>
<dep.maven.version>3.8.7</dep.maven.version>

<air.check.skip-extended>true</air.check.skip-extended>
</properties>
@@ -37,69 +37,58 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.airlift.resolver</groupId>
<groupId>com.facebook.airlift.resolver</groupId>
<artifactId>resolver</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-spi</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-spi</artifactId>
<version>${dep.aether.version}</version>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<version>${dep.aether.version}</version>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-impl</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
<version>${dep.aether.version}</version>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-util</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
<version>${dep.aether.version}</version>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-file</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
<version>${dep.aether.version}</version>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-asynchttpclient</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-file</artifactId>
<version>${dep.aether.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>3.6.2.Final</version>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-http</artifactId>
<version>${dep.aether.version}</version>
</dependency>

<!-- http-client 4.5.x uses old 1.11 -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${dep.maven.version}</version>
<exclusions>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
</exclusion>
</exclusions>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>

<dependency>
@@ -116,54 +105,76 @@

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<artifactId>maven-resolver-provider</artifactId>
<version>${dep.maven.version}</version>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
<artifactId>maven-core</artifactId>
<version>${dep.maven.version}</version>
<exclusions>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
</exclusion>
<exclusion>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- TODO: remove Maven2 compat bits -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${dep.maven.version}</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.5.5</version>
<artifactId>plexus-utils</artifactId>
<version>3.5.1</version>
</dependency>

<!-- DI: Sisu -->
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
<version>0.3.5</version>
<scope>runtime</scope>
</dependency>
<!-- TODO: remove Plexus DI bits -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>2.6.0</version>
</dependency>
<!-- TODO: remove Plexus DI bits -->
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<version>0.3.5</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>4.2.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
</exclusion>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>2.4</version>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
<version>1.0.1</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</dependencyManagement>
Loading