Skip to content

Commit

Permalink
build: java 21 (#129)
Browse files Browse the repository at this point in the history
* build: java 21

* ci: add dependabot config file

* ci: update actions with java 21
  • Loading branch information
nsenave authored Feb 15, 2024
1 parent 03edc1b commit 00beb90
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 10 deletions.
34 changes: 34 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
version: 2
updates:

# Maintain dependencies for maven in v3-main branch
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
target-branch: "v3-main"

# Maintain dependencies for GitHub Actions in v3-main
- package-ecosystem: "github-actions"
# Workflow files stored in the default location of `.github/workflows`.
# (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
directory: "/"
schedule:
interval: "monthly"
target-branch: "v3-main"

# Maintain dependencies for maven in v2-main branch
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
target-branch: "v2-main"

# Maintain dependencies for GitHub Actions in v2-main
- package-ecosystem: "github-actions"
# Workflow files stored in the default location of `.github/workflows`.
# (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
directory: "/"
schedule:
interval: "monthly"
target-branch: "v2-main"
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Set up Maven Central Repository
uses: actions/setup-java@v3
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
server-id: ossrh
server-username: MAVEN_USERNAME
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/create-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'

- name: Tests
run: mvn test --no-transfer-progress
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Set up Maven Central Repository
uses: actions/setup-java@v3
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
server-id: ossrh
server-username: MAVEN_USERNAME
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'

- name: Tests
run: mvn test --no-transfer-progress
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>lunatic-model</artifactId>
<packaging>jar</packaging>

<version>3.2.7</version>
<version>3.3.0</version>
<name>Lunatic Model</name>
<description>Classes and converters for the Lunatic model</description>
<url>https://inseefr.github.io/Lunatic-Model/</url>
Expand All @@ -18,7 +18,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.release>21</maven.compiler.release>
</properties>

<licenses>
Expand All @@ -38,7 +38,7 @@
<scm>
<connection>scm:git:git://github.com/InseeFr/Lunatic-Model.git</connection>
<developerConnection>scm:git:ssh://github.com:InseeFr/Lunatic-Model.git</developerConnection>
<url>https://github.com/InseeFr/Lunatic-Model.git/tree/master</url>
<url>https://github.com/InseeFr/Lunatic-Model.git/tree/v3-main</url>
</scm>

<distributionManagement>
Expand Down Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.28</version>
<version>1.18.30</version>
</dependency>
</dependencies>

Expand Down

0 comments on commit 00beb90

Please sign in to comment.