Skip to content

Commit

Permalink
[RELEASE] Prepare for next development iteration
Browse files Browse the repository at this point in the history
Signed-off-by: Marc Nuri <marc@marcnuri.com>
  • Loading branch information
manusa committed Jun 1, 2023
1 parent ed04abd commit 231aafb
Show file tree
Hide file tree
Showing 149 changed files with 165 additions and 155 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/release-snapshots.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ on:
env:
MAVEN_ARGS: -B -C -V -ntp -Dhttp.keepAlive=false -e ${{ github.event.inputs.additional_args }}
RELEASE_MAVEN_ARGS: -Prelease -Denforcer.skip=true
ALT_DEPLOYMENT_REPOSITORY: -DaltDeploymentRepository=ossrh::default::https://oss.sonatype.org/content/repositories/snapshots/
OSSRHUSERNAME: ${{ secrets.OSSRHUSERNAME }}
OSSRHPASSWORD: ${{ secrets.OSSRHPASSWORD }}
SIGNINGPASSWORD: ${{ secrets.SIGNINGPASSWORD }}
Expand Down Expand Up @@ -93,6 +92,6 @@ jobs:
run: ./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} -pl "httpclient-jdk" -pl "httpclient-jetty" clean deploy
- name: Build and release BOM
run: |
./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} clean sundr:generate-bom &&
./mvnw -f "target/classes/kubernetes-client-bom/pom.xml" clean deploy ${ALT_DEPLOYMENT_REPOSITORY} &&
./mvnw -f "target/classes/kubernetes-client-bom-with-deps/pom.xml" clean deploy ${ALT_DEPLOYMENT_REPOSITORY}
./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} clean sundr:generate-bom &&
./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} gpg:sign-and-deploy-file -Prelease -Dgpg.passphrase=${{ secrets.SIGNINGPASSWORD }} -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -DpomFile="target/classes/kubernetes-client-bom/pom.xml" -Dfile="target/classes/kubernetes-client-bom/pom.xml" &&
./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} gpg:sign-and-deploy-file -Prelease -Dgpg.passphrase=${{ secrets.SIGNINGPASSWORD }} -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -DpomFile="target/classes/kubernetes-client-bom-with-deps/pom.xml" -Dfile="target/classes/kubernetes-client-bom-with-deps/pom.xml"
7 changes: 3 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ on:
env:
MAVEN_ARGS: -B -C -V -ntp -Dhttp.keepAlive=false -e ${{ github.event.inputs.additional_args }}
RELEASE_MAVEN_ARGS: -Prelease -DstagingProgressTimeoutMinutes=20
ALT_DEPLOYMENT_REPOSITORY: -DaltDeploymentRepository=ossrh::default::https://oss.sonatype.org/service/local/staging/deploy/maven2/
OSSRHUSERNAME: ${{ secrets.OSSRHUSERNAME }}
OSSRHPASSWORD: ${{ secrets.OSSRHPASSWORD }}
SIGNINGPASSWORD: ${{ secrets.SIGNINGPASSWORD }}
Expand Down Expand Up @@ -102,6 +101,6 @@ jobs:
run: ./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} -pl "httpclient-jdk" -pl "httpclient-jetty" clean deploy
- name: Build and release BOM
run: |
./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} clean sundr:generate-bom &&
./mvnw -f "target/classes/kubernetes-client-bom/pom.xml" clean deploy ${ALT_DEPLOYMENT_REPOSITORY} &&
./mvnw -f "target/classes/kubernetes-client-bom-with-deps/pom.xml" clean deploy ${ALT_DEPLOYMENT_REPOSITORY}
./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} clean sundr:generate-bom &&
./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} gpg:sign-and-deploy-file -Prelease -Dgpg.passphrase=${{ secrets.SIGNINGPASSWORD }} -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DpomFile="target/classes/kubernetes-client-bom/pom.xml" -Dfile="target/classes/kubernetes-client-bom/pom.xml" &&
./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} gpg:sign-and-deploy-file -Prelease -Dgpg.passphrase=${{ secrets.SIGNINGPASSWORD }} -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DpomFile="target/classes/kubernetes-client-bom-with-deps/pom.xml" -Dfile="target/classes/kubernetes-client-bom-with-deps/pom.xml"
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
## CHANGELOG

### 6.8-SNAPSHOT

#### Bugs

#### Improvements

#### Dependency Upgrade

#### New Features

#### _**Note**_: Breaking changes

### 6.7.0 (2023-06-01)

#### Bugs
Expand Down
2 changes: 1 addition & 1 deletion crd-generator/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>crd-generator-parent</artifactId>
<groupId>io.fabric8</groupId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion crd-generator/apt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>crd-generator-parent</artifactId>
<groupId>io.fabric8</groupId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion crd-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client-project</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>crd-generator-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion crd-generator/test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>crd-generator-parent</artifactId>
<groupId>io.fabric8</groupId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion extensions/camel-k/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>camel-k-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>camel-k-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/camel-k/model-v1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>camel-k-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>camel-k-model-v1</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/camel-k/model-v1alpha1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>camel-k-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>camel-k-model-v1alpha1</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/camel-k/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-extensions</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>camel-k-extension-pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/camel-k/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>camel-k-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>camel-k-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>certmanager-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>certmanager-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>certmanager-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>certmanager-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/model-v1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>certmanager-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>certmanager-model-v1</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/model-v1alpha2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>certmanager-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>certmanager-model-v1alpha2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/model-v1alpha3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>certmanager-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>certmanager-model-v1alpha3</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/model-v1beta1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>certmanager-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>certmanager-model-v1beta1</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-extensions</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>certmanager-extension-pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>certmanager-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>certmanager-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/chaosmesh/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>chaosmesh</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>chaosmesh-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/chaosmesh/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>chaosmesh</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>chaosmesh-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/chaosmesh/model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>chaosmesh</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>chaosmesh-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/chaosmesh/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>kubernetes-extensions</artifactId>
<groupId>io.fabric8</groupId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>chaosmesh</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/chaosmesh/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>chaosmesh</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>chaosmesh-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>istio-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>istio-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>istio-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>istio-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/model-v1alpha3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>istio-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>istio-model-v1alpha3</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/model-v1beta1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>istio-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>istio-model-v1beta1</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-extensions</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>istio-extension-pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>istio-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>istio-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/knative/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>knative-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>knative-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/knative/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>knative-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>knative-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/knative/model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>knative-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>knative-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/knative/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-extensions</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>knative-extension-pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/knative/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>knative-extension-pom</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>knative-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/open-cluster-management/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>open-cluster-management</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>open-cluster-management-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/open-cluster-management/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>open-cluster-management</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>openclustermanagement-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/open-cluster-management/model-agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>open-cluster-management</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>open-cluster-management-agent-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/open-cluster-management/model-apps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>open-cluster-management</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>open-cluster-management-apps-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/open-cluster-management/model-cluster/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.fabric8</groupId>
<artifactId>open-cluster-management</artifactId>
<version>6.7.0</version>
<version>6.8-SNAPSHOT</version>
</parent>

<artifactId>open-cluster-management-cluster-model</artifactId>
Expand Down
Loading

0 comments on commit 231aafb

Please sign in to comment.