Skip to content

[release] Main branch updates after release cut #947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 21, 2025
Merged

[release] Main branch updates after release cut #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f26415
[release] Update version to 1.12-SNAPSHOT
gyfora Feb 21, 2025
0d5944d
[release] Docs, ci and config updates after release cut
gyfora Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .asf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ github:
release-1.8: {}
release-1.9: {}
release-1.10: {}
release-1.11: {}

notifications:
commits: [email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
matrix:
branch:
- main
- release-1.9
- release-1.10
- release-1.11
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -41,8 +41,8 @@ jobs:
echo "flink_branch=${currentBranch}"
echo "flink_branch=${currentBranch}" >> ${GITHUB_ENV}
if [ "${currentBranch}" = "main" ]; then
echo "flink_alias=release-1.11" >> ${GITHUB_ENV}
elif [ "${currentBranch}" = "release-1.10" ]; then
echo "flink_alias=release-1.12" >> ${GITHUB_ENV}
elif [ "${currentBranch}" = "release-1.11" ]; then
echo "flink_alias=stable" >> ${GITHUB_ENV}
else
echo "flink_alias=${currentBranch}" >> ${GITHUB_ENV}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN cd /app/tools/license; mkdir jars; cd jars; \
FROM eclipse-temurin:${JAVA_VERSION}-jre-jammy
ENV FLINK_HOME=/opt/flink
ENV FLINK_PLUGINS_DIR=$FLINK_HOME/plugins
ENV OPERATOR_VERSION=1.11-SNAPSHOT
ENV OPERATOR_VERSION=1.12-SNAPSHOT
ENV OPERATOR_JAR=flink-kubernetes-operator-$OPERATOR_VERSION-shaded.jar
ENV WEBHOOK_JAR=flink-kubernetes-webhook-$OPERATOR_VERSION-shaded.jar
ENV KUBERNETES_STANDALONE_JAR=flink-kubernetes-standalone-$OPERATOR_VERSION.jar
Expand Down
6 changes: 3 additions & 3 deletions docs/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ pygmentsUseClasses = true
# we change the version for the complete docs when forking of a release branch
# etc.
# The full version string as referenced in Maven (e.g. 1.2.1)
Version = "1.11-SNAPSHOT"
Version = "1.12-SNAPSHOT"

# For stable releases, leave the bugfix version out (e.g. 1.2). For snapshot
# release this should be the same as the regular version
VersionTitle = "1.11-SNAPSHOT"
VersionTitle = "1.12-SNAPSHOT"

# The branch for this version of the Apache Flink Kubernetes Operator
Branch = "main"
Expand All @@ -63,8 +63,8 @@ pygmentsUseClasses = true
]

PreviousDocs = [
["1.11", "https://nightlies.apache.org/flink/flink-kubernetes-operator-docs-release-1.11"],
["1.10", "https://nightlies.apache.org/flink/flink-kubernetes-operator-docs-release-1.10"],
["1.9", "https://nightlies.apache.org/flink/flink-kubernetes-operator-docs-release-1.9"],
]

[markup]
Expand Down
2 changes: 1 addition & 1 deletion examples/autoscaling/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/flink-beam-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/flink-sql-runner-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions examples/kubernetes-client-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flink-autoscaler-plugin-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<groupId>org.apache.flink</groupId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-autoscaler-standalone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-autoscaler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-kubernetes-docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-kubernetes-operator-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-kubernetes-operator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-kubernetes-standalone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ under the License.
<parent>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<groupId>org.apache.flink</groupId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-kubernetes-webhook/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions helm/flink-kubernetes-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ apiVersion: v2
name: flink-kubernetes-operator
description: A Helm chart for the Apache Flink Kubernetes Operator
type: application
version: 1.11-SNAPSHOT
appVersion: 1.11-SNAPSHOT
version: 1.12-SNAPSHOT
appVersion: 1.12-SNAPSHOT
icon: https://flink.apache.org/img/logo/png/50/color_50.png
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ under the License.

<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes-operator-parent</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>

<name>Flink Kubernetes: </name>
<packaging>pom</packaging>
Expand Down
Loading