Skip to content

Commit 04f61c2

Browse files
onobconobc
committed
Handling failed 2025.0.1 release
The stream-application-release-train pom was missing name. This adjusts that and temporarily sets the version back to the release version to re-deploy the fixed version and send to Maven Central. Signed-off-by: Chris Bono <[email protected]>
1 parent 25636d9 commit 04f61c2

File tree

5 files changed

+124
-7
lines changed

5 files changed

+124
-7
lines changed

‎.github/workflows/ci-main-adhoc.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: 'CI - Main AdHoc 2025.0.1'
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
verbose:
7+
default: 'false'
8+
description: 'Verbose output'
9+
required: false
10+
push:
11+
paths-ignore:
12+
- '.github/**'
13+
- 'spring-cloud-dataflow-apps-plugin/**'
14+
branches:
15+
- 'main'
16+
17+
jobs:
18+
build:
19+
uses: ./.github/workflows/common-adhoc.yml
20+
secrets:
21+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
22+
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
23+
TMC_API_TOKEN: ${{ secrets.TMC_API_TOKEN }}
24+
GCP_CRED_JSON: ${{ secrets.GCP_CRED_JSON }}
25+
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
26+
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
27+
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
28+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
29+
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}

‎.github/workflows/common-adhoc.yml‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: 'Stream Applications - Common'
2+
3+
on:
4+
workflow_call:
5+
secrets:
6+
DOCKERHUB_USERNAME:
7+
DOCKERHUB_TOKEN:
8+
TMC_API_TOKEN:
9+
GCP_CRED_JSON:
10+
ARTIFACTORY_USERNAME:
11+
ARTIFACTORY_PASSWORD:
12+
GH_ARC_APP_ID:
13+
GH_ARC_INSTALLATION_ID:
14+
GH_ARC_PRIVATE_KEY:
15+
GH_ARC_PAT:
16+
JF_ARTIFACTORY_SPRING:
17+
GPG_PASSPHRASE:
18+
GPG_PRIVATE_KEY:
19+
20+
env:
21+
VERBOSE: false
22+
BRANCH: main
23+
MAVEN_THREADS: 1
24+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
25+
MAVEN_GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
26+
27+
jobs:
28+
release-train:
29+
if: ${{ github.repository == 'spring-cloud/stream-applications' }}
30+
runs-on: ubuntu-latest
31+
steps:
32+
- name: 'Configure: checkout stream-applications'
33+
uses: actions/checkout@v3
34+
with:
35+
ref: ${{ inputs.branch }}
36+
- name: Ensure scripts are executable
37+
shell: bash
38+
run: find . -type f -name "*.sh" -exec chmod a+x '{}' \;
39+
- name: 'Configure: Install GraalVM'
40+
uses: graalvm/setup-graalvm@v1
41+
with:
42+
version: 'latest'
43+
java-version: 17
44+
components: 'js'
45+
github-token: ${{ secrets.GITHUB_TOKEN }}
46+
- name: 'Configure: Install Pack'
47+
uses: ./.github/actions/install-pack
48+
- uses: jfrog/setup-jfrog-cli@v3
49+
env:
50+
JF_URL: 'https://repo.spring.io'
51+
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
52+
- name: Configure JFrog Cli
53+
shell: bash
54+
env:
55+
JF_SERVER_ID: ${{ vars.JF_SERVER_ID }}
56+
run: |
57+
./configure-jfrog.sh ga
58+
echo JFROG_CLI_BUILD_NAME=cloud-stream-applications-main >> $GITHUB_ENV
59+
echo JFROG_CLI_BUILD_NUMBER=493 >> $GITHUB_ENV
60+
- name: Print Build Info
61+
run: |
62+
echo "::notice ::JFROG_CLI_BUILD_NAME=$JFROG_CLI_BUILD_NAME"
63+
echo "::notice ::JFROG_CLI_BUILD_NUMBER=$JFROG_CLI_BUILD_NUMBER"
64+
- name: 'Build: stream-applications-release-train'
65+
shell: bash
66+
timeout-minutes: 30
67+
env:
68+
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
69+
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
70+
BUILD_NAME: cloud-stream-applications-main
71+
BUILD_NUMBER: 493
72+
DEFAULT_JDK: 17
73+
BUILD_VERSION_TYPE: ga
74+
run: |
75+
ROOT_DIR=$(realpath $PWD)
76+
echo "::notice ::building - stream-applications-release-train"
77+
set -e
78+
VERSION=5.1.1 $ROOT_DIR/build-folder.sh stream-applications-release-train "install deploy"
79+
80+
- name: 'Configure: Install libxml2-utils'
81+
uses: ./.github/actions/install-libxml2-utils
82+
83+
- name: Set Stream Applications Docs Properties for ${{ needs.parameters.outputs.release_train_version }}
84+
run: |
85+
./set-doc-properties.sh "2025.0.1"
86+
echo "::notice ::stream-applications-release-train build completed"

‎stream-applications-release-train/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>stream-applications-release-train</artifactId>
6-
<version>2025.0.2-SNAPSHOT</version>
6+
<version>2025.0.1</version>
7+
<name>stream-applications-release-train</name>
8+
<description>Stream Applications Release Train</description>
79
<packaging>pom</packaging>
810
<parent>
911
<groupId>org.springframework.cloud.stream.app</groupId>
1012
<artifactId>stream-applications-core</artifactId>
11-
<version>5.1.2-SNAPSHOT</version>
13+
<version>5.1.1</version>
1214
<relativePath>../applications/stream-applications-core/pom.xml</relativePath>
1315
</parent>
1416

@@ -18,7 +20,7 @@
1820
</modules>
1921

2022
<properties>
21-
<apps.version>5.1.2-SNAPSHOT</apps.version>
23+
<apps.version>5.1.1</apps.version>
2224
<apps.harbor.version>${apps.version}</apps.harbor.version>
2325
<apps.docker.tag>${apps.version}</apps.docker.tag>
2426
</properties>

‎stream-applications-release-train/stream-applications-descriptor/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<parent>
55
<artifactId>stream-applications-release-train</artifactId>
66
<groupId>org.springframework.cloud.stream.app</groupId>
7-
<version>2025.0.2-SNAPSHOT</version>
7+
<version>2025.0.1</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>stream-applications-descriptor</artifactId>
1313
<name>stream-applications-descriptor</name>
14-
<version>2025.0.2-SNAPSHOT</version>
14+
<version>2025.0.1</version>
1515
<packaging>jar</packaging>
1616
<properties>
1717
<uniqueVersion>false</uniqueVersion>

‎stream-applications-release-train/stream-applications-docs/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>org.springframework.cloud.stream.app</groupId>
88
<artifactId>stream-applications-release-train</artifactId>
9-
<version>2025.0.2-SNAPSHOT</version>
9+
<version>2025.0.1</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<artifactId>stream-applications-docs</artifactId>
1313
<name>stream-applications-docs</name>
1414
<description>Stream Apps Docs</description>
15-
<version>2025.0.2-SNAPSHOT</version>
15+
<version>2025.0.1</version>
1616
<properties>
1717
<docs.resources.version>0.2.5</docs.resources.version>
1818
<rootDir>${basedir}/../..</rootDir>

0 commit comments

Comments
 (0)