Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
spotless:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Setup JDK 17
uses: actions/setup-java@v5
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
with:
distribution: 'oracle'
java-version: '17'
Expand All @@ -25,18 +25,18 @@ jobs:
security-events: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
# By default, the java version is 11, but we need 17
- name: Setup JDK 17
uses: actions/setup-java@v5
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
with:
distribution: 'oracle'
java-version: '17'
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
with:
languages: java
- run: mvn clean install -DskipTests

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
4 changes: 2 additions & 2 deletions .github/workflows/create-diagram.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@master
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Repo Visualizer
uses: githubocto/repo-visualizer@0.9.1
uses: githubocto/repo-visualizer@a999615bdab757559bf94bda1fe6eef232765f85 # 0.9.1
with:
excluded_paths: ".github"
commit_message: "docs: update diagram"
12 changes: 6 additions & 6 deletions .github/workflows/jreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
steps:
# Setups the environment
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
with:
java-version: '17'
distribution: 'oracle'
Expand All @@ -52,7 +52,7 @@ jobs:
- name: Set release version
run: mvn --no-transfer-progress --batch-mode versions:set -DnewVersion=$NEXT_VERSION -DprocessAllModules -DgenerateBackupPoms=false
- name: Commit & Push changes
uses: stefanzweifel/git-auto-commit-action@v5.2.0
uses: stefanzweifel/git-auto-commit-action@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
with:
commit_message: 'chore: releasing version ${{ env.NEXT_VERSION }}'

Expand All @@ -62,7 +62,7 @@ jobs:
- name: Print next version
run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed 's/-SNAPSHOT//'
- name: Run JReleaser
uses: jreleaser/release-action@v2
uses: jreleaser/release-action@90ac653bb9c79d11179e65d81499f3f34527dcd5 # 2.5.0
with:
setup-java: false
arguments: release
Expand Down Expand Up @@ -94,14 +94,14 @@ jobs:
# Time to update some files with the new version
# Commit and push changes
- name: Commit & Push changes
uses: stefanzweifel/git-auto-commit-action@v5.2.0
uses: stefanzweifel/git-auto-commit-action@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
with:
commit_message: 'chore: setting SNAPSHOT version ${{ env.NEXT_RELEASE_VERSION }}'

# Log failure:
- name: JReleaser release output
if: always()
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: jreleaser-release
path: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-on-11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
java-version: [ 11 ]
os: [ ubuntu-latest ]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
submodules: true
- name: Setup JDK21 for building project
uses: actions/setup-java@v5
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
with:
distribution: 'temurin'
java-version: 21
Expand All @@ -27,7 +27,7 @@ jobs:
run: mvn clean install -DskipTests

- name: Setup JDK${{ matrix.java-version }} for running tests
uses: actions/setup-java@v5
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
with:
distribution: 'temurin'
java-version: ${{ matrix.java-version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
java-version: [ 17, 21 ]
os: [ ubuntu-latest]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
submodules: true
- name: Setup JDK${{ matrix.java-version }}
uses: actions/setup-java@v5
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
with:
distribution: 'temurin'
java-version: ${{ matrix.java-version }}
Expand Down
2 changes: 1 addition & 1 deletion classfile-fingerprint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>6.1.3</version>
<version>5.14.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ void jdk21_0_2_indexShouldBeReproducible_temurin(@TempDir Path tempDir) throws I
assertThat(actual).isEqualTo(expected);

Map<String, Set<ClassFileAttributes>> referenceProvenance = ParsingHelper.deserializeFingerprints(actualIndex);
referenceProvenance.values().forEach(classFileAttributes -> assertThat(classFileAttributes.size())
.isEqualTo(1));
referenceProvenance
.values()
.forEach(classFileAttributes ->
assertThat(classFileAttributes.size()).isEqualTo(1));
}

@EnabledIfSystemProperty(named = "java.vendor.version", matches = "Temurin-17\\.0\\.10\\+7")
Expand All @@ -71,8 +73,10 @@ void jdk17_0_10_indexShouldBeReproducibleAcrossMultiple_implementations(@TempDir
assertThat(actual).isEqualTo(expected);

Map<String, Set<ClassFileAttributes>> referenceProvenance = ParsingHelper.deserializeFingerprints(actualIndex);
referenceProvenance.values().forEach(classFileAttributes -> assertThat(classFileAttributes.size())
.isEqualTo(1));
referenceProvenance
.values()
.forEach(classFileAttributes ->
assertThat(classFileAttributes.size()).isEqualTo(1));
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>6.1.3</version>
<version>5.14.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Expand Down Expand Up @@ -140,14 +140,14 @@
<include>src/test/java/**/*.java</include>
<include>src/main/java17/**/*.java</include>
</includes>
<palantirJavaFormat></palantirJavaFormat>
<formatAnnotations></formatAnnotations>
<palantirJavaFormat/>
<formatAnnotations/>
</java>
<pom>
<includes>
<include>pom.xml</include>
</includes>
<sortPom></sortPom>
<sortPom/>
</pom>
</configuration>
</plugin>
Expand Down
Loading