Skip to content

Commit c56b698

Browse files
csviricsviri
authored
Merge branch 'main' into ssa-issue-showcase
2 parents cd1434d + b0663ee commit c56b698

File tree

8 files changed

+84
-71
lines changed

8 files changed

+84
-71
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ jobs:
1111
strategy:
1212
matrix:
1313
java: [ 17, 21, 24 ]
14-
kubernetes: [ '1.30.12', '1.31.8', '1.32.4','1.33.0' ]
14+
# Use the latest versions supported by minikube, otherwise GitHub it will
15+
# end up in a throttling requests from minikube and workflow will fail.
16+
# Minikube does such requests only if a version is not officially supported.
17+
kubernetes: [ '1.30.12', '1.31.8', '1.32.4','1.33.1' ]
1518
uses: ./.github/workflows/integration-tests.yml
1619
with:
1720
java-version: ${{ matrix.java }}

‎.github/workflows/e2e-test.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Integration and end to end tests which runs locally and deploys the Operator to a Kubernetes
22
# (Minikube) cluster and creates custom resources to verify the operator's functionality
3-
name: Integration & End to End tests
3+
name: End to End tests
44
on:
55
pull_request:
66
paths-ignore:
@@ -32,8 +32,11 @@ jobs:
3232
- name: Setup Minikube-Kubernetes
3333
uses: manusa/[email protected]
3434
with:
35-
minikube version: v1.34.0
36-
kubernetes version: v1.33.0
35+
minikube version: v1.36.0
36+
# Use the latest versions supported by minikube, otherwise GitHub it will
37+
# end up in a throttling requests from minikube and workflow will fail.
38+
# Minikube does such requests only if a version is not officially supported.
39+
kubernetes version: v1.33.1
3740
github token: ${{ secrets.GITHUB_TOKEN }}
3841
driver: docker
3942

‎.github/workflows/integration-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ jobs:
4141
- name: Set up Minikube
4242
uses: manusa/[email protected]
4343
with:
44-
minikube version: 'v1.34.0'
44+
minikube version: 'v1.36.0'
4545
kubernetes version: '${{ inputs.kube-version }}'
46-
driver: 'docker'
47-
github token: ${{ secrets.GITHUB_TOKEN }}
46+
github token: ${{ github.token }}
47+
4848
- name: "${{inputs.it-category}} integration tests (kube: ${{ inputs.kube-version }} / java: ${{ inputs.java-version }} / client: ${{ inputs.http-client }})"
4949
run: |
5050
if [ -z "${{inputs.it-category}}" ]; then

‎.github/workflows/release-project-in-dir.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ jobs:
2929
java-version: 17
3030
distribution: temurin
3131
cache: 'maven'
32+
server-id: central
33+
server-username: MAVEN_USERNAME
34+
server-password: MAVEN_CENTRAL_TOKEN
35+
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
36+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
3237

3338
- name: Change version to release version
3439
# Assume that RELEASE_VERSION will have form like: "v1.0.1". So we cut the "v"
@@ -37,15 +42,12 @@ jobs:
3742
env:
3843
RELEASE_VERSION: ${{ github.event.release.tag_name }}
3944

40-
- name: Release Maven package
41-
uses: samuelmeuli/action-maven-publish@v1
42-
with:
43-
maven_profiles: "release"
44-
maven_args: ${{ env.MAVEN_ARGS }}
45-
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
46-
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
47-
nexus_username: ${{ secrets.OSSRH_USERNAME }}
48-
nexus_password: ${{ secrets.OSSRH_TOKEN }}
45+
- name: Publish to Apache Maven Central
46+
run: mvn package deploy -Prelease
47+
env:
48+
MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
49+
MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_PASSWORD }}
50+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
4951

5052
# This is separate job because there were issues with git after release step, was not able to commit changes.
5153
update-working-version:

‎.github/workflows/snapshot-releases.yml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,18 @@ jobs:
3333
- name: Set up Java and Maven
3434
uses: actions/setup-java@v4
3535
with:
36-
distribution: temurin
3736
java-version: 17
37+
distribution: temurin
3838
cache: 'maven'
39-
- name: Release Maven package
40-
uses: samuelmeuli/action-maven-publish@v1
41-
with:
42-
maven_profiles: "release"
43-
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
44-
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
45-
nexus_username: ${{ secrets.OSSRH_USERNAME }}
46-
nexus_password: ${{ secrets.OSSRH_TOKEN }}
39+
server-id: central
40+
server-username: MAVEN_USERNAME
41+
server-password: MAVEN_CENTRAL_TOKEN
42+
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
43+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
44+
45+
- name: Publish to Apache Maven Central
46+
run: mvn package deploy -Prelease
47+
env:
48+
MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
49+
MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_PASSWORD }}
50+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

‎bootstrapper-maven-plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<properties>
1717
<maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
18-
<maven-plugin-api.version>3.9.9</maven-plugin-api.version>
18+
<maven-plugin-api.version>3.9.11</maven-plugin-api.version>
1919
<templating-maven-plugin.version>3.0.0</templating-maven-plugin.version>
2020
<maven-plugin-plugin.version>3.15.1</maven-plugin-plugin.version>
2121
</properties>

‎operator-framework-bom/pom.xml‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,12 @@
3333
<url>https://github.com/operator-framework/java-operator-sdk/tree/master</url>
3434
</scm>
3535

36-
<distributionManagement>
37-
<snapshotRepository>
38-
<id>ossrh</id>
39-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
40-
</snapshotRepository>
41-
</distributionManagement>
42-
4336
<properties>
44-
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
45-
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
37+
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
4638
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
4739
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
4840
<spotless.version>2.44.3</spotless.version>
41+
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
4942
</properties>
5043

5144
<dependencyManagement>
@@ -115,6 +108,17 @@
115108
<id>release</id>
116109
<build>
117110
<plugins>
111+
<plugin>
112+
<groupId>org.apache.maven.plugins</groupId>
113+
<artifactId>maven-surefire-plugin</artifactId>
114+
<configuration>
115+
<excludes>
116+
<exclude>**/*IT.java</exclude>
117+
<exclude>**/*E2E.java</exclude>
118+
<exclude>**/InformerRelatedBehaviorTest.java</exclude>
119+
</excludes>
120+
</configuration>
121+
</plugin>
118122
<plugin>
119123
<groupId>org.apache.maven.plugins</groupId>
120124
<artifactId>maven-javadoc-plugin</artifactId>
@@ -138,13 +142,13 @@
138142
<goals>
139143
<goal>jar</goal>
140144
</goals>
145+
<phase>verify</phase>
141146
</execution>
142147
</executions>
143148
</plugin>
144149
<plugin>
145150
<groupId>org.apache.maven.plugins</groupId>
146151
<artifactId>maven-gpg-plugin</artifactId>
147-
<version>${maven-gpg-plugin.version}</version>
148152
<executions>
149153
<execution>
150154
<id>sign-artifacts</id>
@@ -162,14 +166,15 @@
162166
</executions>
163167
</plugin>
164168
<plugin>
165-
<groupId>org.sonatype.plugins</groupId>
166-
<artifactId>nexus-staging-maven-plugin</artifactId>
167-
<version>${nexus-staging-maven-plugin.version}</version>
169+
<groupId>org.sonatype.central</groupId>
170+
<artifactId>central-publishing-maven-plugin</artifactId>
171+
<version>${central-publishing-maven-plugin.version}</version>
168172
<extensions>true</extensions>
169173
<configuration>
170-
<serverId>ossrh</serverId>
171-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
172-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
174+
<publishingServerId>central</publishingServerId>
175+
<tokenAuth>true</tokenAuth>
176+
<autoPublish>true</autoPublish>
177+
<waitUntil>published</waitUntil>
173178
</configuration>
174179
</plugin>
175180
</plugins>

‎pom.xml‎

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,6 @@
4444
<url>https://github.com/operator-framework/java-operator-sdk/tree/main</url>
4545
</scm>
4646

47-
<distributionManagement>
48-
<snapshotRepository>
49-
<id>ossrh</id>
50-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
51-
</snapshotRepository>
52-
</distributionManagement>
53-
5447
<properties>
5548
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5649
<java.version>17</java.version>
@@ -59,38 +52,39 @@
5952
<sonar.organization>java-operator-sdk</sonar.organization>
6053
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
6154
<fabric8-httpclient-impl.name>jdk</fabric8-httpclient-impl.name>
62-
<junit.version>5.13.2</junit.version>
55+
<junit.version>5.13.3</junit.version>
6356
<fabric8-client.version>7.3.1</fabric8-client.version>
6457
<slf4j.version>2.0.17</slf4j.version>
65-
<log4j.version>2.25.0</log4j.version>
58+
<log4j.version>2.25.1</log4j.version>
6659
<mokito.version>5.18.0</mokito.version>
67-
<commons-lang3.version>3.17.0</commons-lang3.version>
60+
<commons-lang3.version>3.18.0</commons-lang3.version>
6861
<compile-testing.version>0.21.0</compile-testing.version>
6962
<javapoet.version>1.13.0</javapoet.version>
7063
<assertj.version>3.27.3</assertj.version>
7164
<awaitility.version>4.3.0</awaitility.version>
7265
<spring-boot.version>2.7.3</spring-boot.version>
73-
<micrometer-core.version>1.15.1</micrometer-core.version>
74-
<caffeine.version>3.2.1</caffeine.version>
66+
<micrometer-core.version>1.15.2</micrometer-core.version>
67+
<caffeine.version>3.2.2</caffeine.version>
7568
<mustache.version>0.9.14</mustache.version>
7669
<commons.io.version>2.19.0</commons.io.version>
77-
<java.diff.version>4.15</java.diff.version>
70+
<java.diff.version>4.16</java.diff.version>
7871

7972
<fmt-maven-plugin.version>2.11</fmt-maven-plugin.version>
8073
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
8174
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
75+
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
8276
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
8377
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
8478
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
8579
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
8680
<maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
87-
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
81+
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
8882
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
8983
<maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
9084
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
9185
<git-commit-id-maven-plugin.version>9.0.2</git-commit-id-maven-plugin.version>
9286
<jib-maven-plugin.version>3.4.6</jib-maven-plugin.version>
93-
<spotless.version>2.44.5</spotless.version>
87+
<spotless.version>2.46.0</spotless.version>
9488
</properties>
9589

9690
<dependencyManagement>
@@ -293,6 +287,15 @@
293287
<groupId>org.apache.maven.plugins</groupId>
294288
<artifactId>maven-source-plugin</artifactId>
295289
<version>${maven-source-plugin.version}</version>
290+
<executions>
291+
<execution>
292+
<id>attach-sources</id>
293+
<goals>
294+
<goal>jar</goal>
295+
</goals>
296+
<phase>verify</phase>
297+
</execution>
298+
</executions>
296299
</plugin>
297300
<plugin>
298301
<groupId>org.apache.maven.plugins</groupId>
@@ -515,14 +518,6 @@
515518
<plugin>
516519
<groupId>org.apache.maven.plugins</groupId>
517520
<artifactId>maven-source-plugin</artifactId>
518-
<executions>
519-
<execution>
520-
<id>attach-sources</id>
521-
<goals>
522-
<goal>jar</goal>
523-
</goals>
524-
</execution>
525-
</executions>
526521
</plugin>
527522
<plugin>
528523
<groupId>org.apache.maven.plugins</groupId>
@@ -544,14 +539,15 @@
544539
</executions>
545540
</plugin>
546541
<plugin>
547-
<groupId>org.sonatype.plugins</groupId>
548-
<artifactId>nexus-staging-maven-plugin</artifactId>
549-
<version>${nexus-staging-maven-plugin.version}</version>
542+
<groupId>org.sonatype.central</groupId>
543+
<artifactId>central-publishing-maven-plugin</artifactId>
544+
<version>${central-publishing-maven-plugin.version}</version>
550545
<extensions>true</extensions>
551546
<configuration>
552-
<serverId>ossrh</serverId>
553-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
554-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
547+
<publishingServerId>central</publishingServerId>
548+
<tokenAuth>true</tokenAuth>
549+
<autoPublish>true</autoPublish>
550+
<waitUntil>published</waitUntil>
555551
</configuration>
556552
</plugin>
557553
</plugins>

0 commit comments

Comments
 (0)