diff --git a/.github/workflows/image-build.yaml b/.github/workflows/image-build.yaml index 60bc7dd..b4a2530 100644 --- a/.github/workflows/image-build.yaml +++ b/.github/workflows/image-build.yaml @@ -13,7 +13,46 @@ concurrency: group: build-${{ github.ref }} cancel-in-progress: true +env: + tag: ${{ github.ref == 'refs/heads/main' && 'latest' || github.ref_name }} jobs: + jar-artifact: + name: Publish package to GitHub Packages + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + pull-requests: write + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: temurin + - name: set-version + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + run: | + echo "TAG=${{ env.tag }}" >> $GITHUB_ENV + echo "VERSION=${TAG#v}" >> $GITHUB_ENV + mvn org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${VERSION} + - name: Publish package + run: mvn --batch-mode deploy + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: create new snapshot version on release + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + run: | + echo "TAG=${{ env.tag }}" >> $GITHUB_ENV + echo "VERSION=${TAG#v}" >> $GITHUB_ENV + mvn org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${VERSION}-SNAPSHOT + - name: create pull request with changes + uses: peter-evans/create-pull-request@v7 + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + with: + commit-message: Bumping to new snapshot for release ${{env.tag}} + title: Bumping to new snapshot for release ${{env.tag}} + branch: "${{env.tag}}-snapshot" + image-build: uses: konveyor/release-tools/.github/workflows/build-push-images.yaml@main with: diff --git a/Dockerfile b/Dockerfile index 5b25d4b..5e40734 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,11 @@ RUN ./gradlew build -x test && rm -rf /root/.gradle RUN mkdir /output && cp ./build/libs/fernflower.jar /output FROM registry.access.redhat.com/ubi9/ubi AS addon-build -RUN dnf install -y maven-openjdk17 && dnf clean all && rm -rf /var/cache/dnf +RUN curl -fsSL -o /tmp/apache-maven.tar.gz https://dlcdn.apache.org/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.tar.gz && \ + tar -xzf /tmp/apache-maven.tar.gz -C /usr/local/ && \ + ln -s /usr/local/apache-maven-3.9.5/bin/mvn /usr/bin/mvn && \ + rm /tmp/apache-maven.tar.gz +RUN dnf install -y java-17-openjdk-devel && dnf clean all && rm -rf /var/cache/dnf WORKDIR /app COPY ./ /app/ RUN export JAVA_HOME=/usr/lib/jvm/java-17-openjdk diff --git a/gradle/.gradle/8.8/checksums/checksums.lock b/gradle/.gradle/8.8/checksums/checksums.lock new file mode 100644 index 0000000..27d2b6a Binary files /dev/null and b/gradle/.gradle/8.8/checksums/checksums.lock differ diff --git a/gradle/.gradle/8.8/dependencies-accessors/gc.properties b/gradle/.gradle/8.8/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/gradle/.gradle/8.8/fileChanges/last-build.bin b/gradle/.gradle/8.8/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/gradle/.gradle/8.8/fileChanges/last-build.bin differ diff --git a/gradle/.gradle/8.8/fileHashes/fileHashes.bin b/gradle/.gradle/8.8/fileHashes/fileHashes.bin new file mode 100644 index 0000000..203f5e0 Binary files /dev/null and b/gradle/.gradle/8.8/fileHashes/fileHashes.bin differ diff --git a/gradle/.gradle/8.8/fileHashes/fileHashes.lock b/gradle/.gradle/8.8/fileHashes/fileHashes.lock new file mode 100644 index 0000000..1f43595 Binary files /dev/null and b/gradle/.gradle/8.8/fileHashes/fileHashes.lock differ diff --git a/gradle/.gradle/8.8/gc.properties b/gradle/.gradle/8.8/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/gradle/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/gradle/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..399f43e Binary files /dev/null and b/gradle/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/gradle/.gradle/buildOutputCleanup/cache.properties b/gradle/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..29d0374 --- /dev/null +++ b/gradle/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Tue Mar 04 12:44:54 EST 2025 +gradle.version=8.8 diff --git a/gradle/.gradle/vcs-1/gc.properties b/gradle/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/pom.xml b/pom.xml index ccdc200..41a9f63 100644 --- a/pom.xml +++ b/pom.xml @@ -15,18 +15,20 @@ UTF-8 UTF-8 - 3.0.1 - 3.0.1 + 4.0.9 + ${tycho.version} scm:git:https://github.com/konveyor/java-analyzer-bundle.git true - -Xmx512m ${tycho.test.platformArgs} + -Xmx1G -DDetectVMInstallationsJob.disabled=true ${tycho.test.platformArgs} + - 0.7.9 - org.eclipse.jdt.ls.* + 0.8.8 + org.eclipse.lsp4mp.jdt.* reuseReports ${project.build.directory}/jacoco.exec ${jacoco.destFile} + 600 @@ -164,8 +166,15 @@ java-analyzer-bundle.core - java-analyzer-bundle.site + java-analyzer-bundle.test java-analyzer-bundle.tp + + + github + GitHub Packages + https://maven.pkg.github.com/shawn-hurley/java-analyzer-bundle + +