Skip to content

Commit

Permalink
Merge branch 'release/2024.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jangalinski committed Jan 14, 2024
2 parents c8c060c + 34f8abf commit 6cc0012
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
name: Build and run tests on JDK 11
name: Build and run tests on JDK 17
steps:
# Checkout the code
- name: Checkout code
Expand All @@ -26,10 +26,10 @@ jobs:
${{ runner.os }}-maven
# Setup JDK and Maven
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
server-id: ossrh
server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
run: echo ${{ secrets.GPG_SECRET_KEYS }} | base64 --decode | gpg --import --no-tty --batch --yes

# Setup JDK and .m2/settings.xml
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
server-id: ossrh
server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central
Expand Down
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11.0
17.0
28 changes: 14 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>io.toolisticon.maven.parent</groupId>
<artifactId>maven-parent-kotlin-base</artifactId>
<version>2023.10.3</version>
<version>2024.1.0</version>

<name>Maven Parent - Kotlin Base</name>
<description>Maven parent for a holistic kotlin lib project.</description>
Expand Down Expand Up @@ -35,19 +35,19 @@
<kp.compile.useIncrementalKotlinCompiler>false</kp.compile.useIncrementalKotlinCompiler>

<!-- LANGUAGE VERSIONS -->
<kotlin.version>1.9.20</kotlin.version>
<kotlin.version>1.9.22</kotlin.version>
<kotlin.compiler.languageVersion>1.9</kotlin.compiler.languageVersion>
<kotlin.compiler.apiVersion>1.9</kotlin.compiler.apiVersion>
<kotlin.compiler.incremental>${kp.compile.useIncrementalKotlinCompiler}</kotlin.compiler.incremental>
<kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
<java.version>11</java.version>
<jdk.version>11</jdk.version>
<java.version>17</java.version>
<jdk.version>17</jdk.version>

<kotlinx-serialization.version>1.6.0</kotlinx-serialization.version>
<kotlin-logging.version>3.0.5</kotlin-logging.version>

<!-- TEST -->
<junit5.version>5.10.0</junit5.version>
<junit5.version>5.10.1</junit5.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -303,7 +303,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.12.1</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<source>${java.version}</source>
Expand Down Expand Up @@ -342,7 +342,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -441,7 +441,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.2.1</version>
<version>3.2.5</version>
<executions>
<execution>
<id>integration-tests</id>
Expand Down Expand Up @@ -495,7 +495,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.1</version>
<version>3.2.5</version>

<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
Expand All @@ -515,14 +515,14 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
</plugin>

<!-- [RELEASE] GITFLOW (version, config) -->
<plugin>
<groupId>com.amashchenko.maven.plugin</groupId>
<artifactId>gitflow-maven-plugin</artifactId>
<version>1.20.0</version>
<version>1.21.0</version>
<configuration>
<gitFlowConfig>
<productionBranch>master</productionBranch>
Expand Down Expand Up @@ -595,7 +595,7 @@
<plugin>
<groupId>com.tngtech.jgiven</groupId>
<artifactId>jgiven-maven-plugin</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
<executions>
<execution>
<id>generate-report</id>
Expand All @@ -614,7 +614,7 @@
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>7.0.1</version>
<version>7.2.0</version>
</plugin>

<!-- [GENERATOR]: PROPERTIES (writes maven properties to src) (version,execution) -->
Expand All @@ -639,7 +639,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.16.1</version>
<version>2.16.2</version>
<configuration>
<generateBackupPoms>${kp.plugin.generateBackupPoms}</generateBackupPoms>
</configuration>
Expand Down

0 comments on commit 6cc0012

Please sign in to comment.