Skip to content

Commit

Permalink
Merge branch 'main' into support_secondarytable_annotation
Browse files Browse the repository at this point in the history
  • Loading branch information
filipelautert authored Sep 18, 2023
2 parents aeaff4d + 0ab9bdb commit bf0d570
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
3 changes: 1 addition & 2 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,4 @@ template: |
$CHANGES
**Full Changelog**: https://github.com/liquibase/liquibase-mongodb/compare/liquibase-mongodb-$PREVIOUS_TAG...liquibase-mongodb-$RESOLVED_VERSION
**Full Changelog**: https://github.com/liquibase/liquibase-hibernate/compare/$PREVIOUS_TAG...$RESOLVED_VERSION
2 changes: 1 addition & 1 deletion .github/workflows/attach-artifact-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:
jobs:

attach-artifact-to-release:
uses: liquibase/build-logic/.github/workflows/extension-attach-artifact-release.yml@v0.3.5
uses: liquibase/build-logic/.github/workflows/extension-attach-artifact-release.yml@v0.4.2
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ permissions:

jobs:
create-release:
uses: liquibase/build-logic/.github/workflows/create-release.yml@v0.3.5
uses: liquibase/build-logic/.github/workflows/create-release.yml@v0.4.2
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/release-published.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ permissions:

jobs:
release:
uses: liquibase/build-logic/.github/workflows/extension-release-published.yml@v0.3.5
uses: liquibase/build-logic/.github/workflows/extension-release-published.yml@v0.4.2
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/snyk-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ on:

jobs:
security-scan:
uses: liquibase/build-logic/.github/workflows/synk-nightly.yml@v0.3.5
uses: liquibase/build-logic/.github/workflows/synk-nightly.yml@v0.4.2
secrets: inherit
21 changes: 11 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
name: Build & Package
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3
Expand Down Expand Up @@ -63,17 +63,17 @@ jobs:
java: [ 17, 19 ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
cache: 'maven'

- name: Build Cache
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
key: build-${{ github.run_number }}-${{ github.run_attempt }}
path: |
Expand All @@ -85,7 +85,7 @@ jobs:

- name: Archive Test Results
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: test-reports-jdk-${{ matrix.java }}
path: |
Expand All @@ -103,10 +103,10 @@ jobs:
hibernate: [ "6.0.2.Final", "6.1.7.Final" ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'temurin'
Expand All @@ -120,13 +120,14 @@ jobs:

- name: Archive Test Results
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: test-reports-hibernate-${{ matrix.hibernate }}
path: |
**/target/surefire-reports
**/target/jacoco.exec
dependabot:
uses: liquibase/build-logic/.github/workflows/[email protected]
secrets: inherit
needs: hibernate-test
uses: liquibase/build-logic/.github/workflows/[email protected]
secrets: inherit
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.liquibase.ext</groupId>
<artifactId>liquibase-hibernate6</artifactId>
<version>4.23.1-SNAPSHOT</version>
<version>4.24.2-SNAPSHOT</version>

<name>Liquibase Hibernate Integration</name>
<description>Liquibase extension for hibernate integration including generating changesets based on changed
Expand Down Expand Up @@ -69,8 +69,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hibernate.version>6.2.7.Final</hibernate.version>
<spring.version>6.0.11</spring.version>
<liquibase.version>4.23.1</liquibase.version>
<spring.version>6.0.12</spring.version>
<liquibase.version>4.23.2</liquibase.version>
<!--suppress UnresolvedMavenProperty -->
<liquibase.sdk.github.token>${env.GITHUB_TOKEN}</liquibase.sdk.github.token>
<sonar.organization>liquibase</sonar.organization>
Expand Down Expand Up @@ -149,13 +149,13 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.1</version>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.2.220</version>
<version>2.2.222</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -342,7 +342,7 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>3.9.1.2184</version>
<version>3.10.0.2594</version>
</plugin>

<plugin>
Expand Down

0 comments on commit bf0d570

Please sign in to comment.