Skip to content

Commit

Permalink
update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
zambrovski committed Nov 14, 2023
1 parent a351677 commit 99dafed
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 33 deletions.
7 changes: 4 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 @@ -17,11 +17,11 @@ jobs:
run: echo ${{ github.ref }}

# Setup JDK and Maven
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
java-version: 17
cache: maven
server-id: ossrh
server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
Expand All @@ -39,6 +39,7 @@ jobs:
- name: Run itest
run: ./mvnw integration-test failsafe:verify -Pitest -U -B -T4 -ntp


- name: Upload coverage to Codecov
if: github.event_name == 'push' && github.actor != 'dependabot[bot]'
uses: codecov/codecov-action@v3
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,18 @@ on:
jobs:
build:
runs-on: ubuntu-latest
name: Build and run tests on JDK ${{ matrix.java }}
name: Build and run tests
steps:
- name: Checkout code
uses: actions/checkout@v3

# Get GPG private key into GPG
- name: Import GPG Owner Trust
run: echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --import-ownertrust

- name: Import GPG key
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@v3
with:
distribution: zulu
cache: maven
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 All @@ -39,6 +32,13 @@ jobs:
- name: Build with Maven
run: ./mvnw clean verify -U -B -T4 -ntp

# Get GPG private key into GPG
- name: Import GPG Owner Trust
run: echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --import-ownertrust

- name: Import GPG key
run: echo ${{ secrets.GPG_SECRET_KEYS }} | base64 --decode | gpg --import --no-tty --batch --yes

# Publish release
- name: Deploy a new release version to Maven Central
run: ./mvnw clean deploy -B -ntp -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{ secrets.GPG_KEYNAME }}" -Dgpg.passphrase="${{ secrets.GPG_PASSPHRASE }}"
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
2 changes: 1 addition & 1 deletion extension/cockpit-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.12.1</version>
<version>1.14.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
36 changes: 18 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version>
<kotlin.version>1.8.22</kotlin.version>
<java.version>17</java.version>
<kotlin.version>1.9.20</kotlin.version>
</properties>

<modules>
Expand Down Expand Up @@ -143,14 +143,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.2</version>
</plugin>

<!-- Coverage metering -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<version>0.8.11</version>
<executions>
<execution>
<id>pre-unit-test</id>
Expand Down Expand Up @@ -179,7 +179,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.3.0</version>
<version>1.5.0</version>
<executions>
<execution>
<id>flatten</id>
Expand All @@ -198,7 +198,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
<configuration>
<encoding>UTF-8</encoding>
<release>${java.version}</release>
Expand Down Expand Up @@ -238,8 +238,8 @@
<version>${kotlin.version}</version>
<configuration>
<jvmTarget>${java.version}</jvmTarget>
<languageVersion>1.5</languageVersion>
<apiVersion>1.5</apiVersion>
<languageVersion>1.9</languageVersion>
<apiVersion>1.9</apiVersion>
<compilerPlugins>
<plugin>spring</plugin>
<!--plugin>jpa</plugin-->
Expand Down Expand Up @@ -295,7 +295,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
Expand All @@ -304,12 +304,12 @@
<!-- Unit Tests -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<version>3.2.1</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
<shutdown>kill</shutdown>
<runOrder>random</runOrder>
<argLine>--illegal-access=permit ${surefireArgLine} -Djava.awt.headless=true -XX:+StartAttachListener</argLine>
<argLine>${surefireArgLine} -XX:+StartAttachListener</argLine>
<systemPropertyVariables>
<jgiven.report.dir>${project.build.directory}/jgiven-reports</jgiven.report.dir>
</systemPropertyVariables>
Expand All @@ -320,7 +320,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
<version>3.2.1</version>
<executions>
<execution>
<phase>integration-test</phase>
Expand All @@ -331,7 +331,7 @@
</execution>
</executions>
<configuration>
<argLine>--illegal-access=permit ${failsafeArgLine}</argLine>
<argLine>${failsafeArgLine}</argLine>
<systemPropertyVariables>
<jgiven.report.dir>${project.build.directory}/jgiven-reports</jgiven.report.dir>
</systemPropertyVariables>
Expand All @@ -352,7 +352,7 @@
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>1.7.20</version>
<version>1.9.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -488,7 +488,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.6.13</version>
<configuration>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<serverId>ossrh</serverId>
Expand All @@ -508,14 +508,14 @@
<!-- Install -->
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<version>3.1.1</version>
</plugin>

<!-- Enforce -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand All @@ -525,7 +525,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>11</version>
<version>17</version>
</requireJavaVersion>
<requireMavenVersion>
<version>3.9.0</version>
Expand Down

0 comments on commit 99dafed

Please sign in to comment.