You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ga...@apache.org on 2021/12/28 02:32:00 UTC
[flink-ml] branch master updated (b9a56db -> 33af592)
This is an automated email from the ASF dual-hosted git repository.
gaoyunhaii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink-ml.git.
from b9a56db [hotfix] Add the NOTICE file
new 6f1998a [hotfix] Remove scala target and fix script errors
new 33af592 [release] Update version to 2.1-SNAPSHOT
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
flink-ml-core/pom.xml | 2 +-
flink-ml-iteration/pom.xml | 2 +-
flink-ml-lib/pom.xml | 2 +-
flink-ml-python/pyflink/ml/version.py | 2 +-
flink-ml-tests/pom.xml | 2 +-
flink-ml-uber/pom.xml | 2 +-
pom.xml | 6 +++---
tools/releasing/create_python_sdk_release.sh | 4 ----
tools/releasing/deploy_staging_jars.sh | 2 +-
9 files changed, 10 insertions(+), 14 deletions(-)
[flink-ml] 01/02: [hotfix] Remove scala target and fix script errors
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaoyunhaii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-ml.git
commit 6f1998a877584a1f34989fad2d5f7338a60df10d
Author: Yun Gao <ga...@gmail.com>
AuthorDate: Tue Dec 28 00:59:52 2021 +0800
[hotfix] Remove scala target and fix script errors
1. The release profile must be called apache-release to also deploy
source and javadoc jars.
2. Remove the command related to python whl package.
3. Always relies on scala 2.12.
---
pom.xml | 4 ++--
tools/releasing/create_python_sdk_release.sh | 4 ----
tools/releasing/deploy_staging_jars.sh | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 26807b4..d5eb522 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@ under the License.
<properties>
<flink.shaded.version>12.0</flink.shaded.version>
- <scala.binary.version>2.11</scala.binary.version>
+ <scala.binary.version>2.12</scala.binary.version>
<jackson.version>2.10.1</jackson.version>
<target.java.version>1.8</target.java.version>
<spotless.version>2.4.2</spotless.version>
@@ -219,7 +219,7 @@ under the License.
The script can be found under tools/releasing/create_source_release.sh.
-->
<profile>
- <id>release</id>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
diff --git a/tools/releasing/create_python_sdk_release.sh b/tools/releasing/create_python_sdk_release.sh
index 937cc4d..7b51476 100755
--- a/tools/releasing/create_python_sdk_release.sh
+++ b/tools/releasing/create_python_sdk_release.sh
@@ -63,17 +63,13 @@ cd ${PROJECT_ROOT}/flink-ml-python/
mv dist/* ${RELEASE_DIR}
SOURCE_DIST="apache-flink-ml-$RELEASE_VERSION.tar.gz"
-WHL_VERSION=`echo "$RELEASE_VERSION" | tr - _`
-WHL_DIST="apache_flink_ml-$WHL_VERSION-py3-none-any.whl"
cd ${RELEASE_DIR}
# Sign sha the files
if [ "$SKIP_GPG" == "false" ] ; then
gpg --armor --detach-sig ${SOURCE_DIST}
- gpg --armor --detach-sig ${WHL_DIST}
fi
${SHASUM} "${SOURCE_DIST}" > "${SOURCE_DIST}.sha512"
-${SHASUM} "${WHL_DIST}" > "${WHL_DIST}.sha512"
echo "Created Python SDK distribution files at $RELEASE_DIR."
diff --git a/tools/releasing/deploy_staging_jars.sh b/tools/releasing/deploy_staging_jars.sh
index 7c26f63..6f34068 100755
--- a/tools/releasing/deploy_staging_jars.sh
+++ b/tools/releasing/deploy_staging_jars.sh
@@ -42,6 +42,6 @@ fi
cd ${PROJECT_ROOT}
echo "Deploying to repository.apache.org"
-${MVN} clean deploy -Prelease -DskipTests -DretryFailedDeploymentCount=10 $CUSTOM_OPTIONS -Dscala-2.12
+${MVN} clean deploy -Papache-release -DskipTests -DretryFailedDeploymentCount=10 $CUSTOM_OPTIONS
cd ${CURR_DIR}
[flink-ml] 02/02: [release] Update version to 2.1-SNAPSHOT
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaoyunhaii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-ml.git
commit 33af5924f1b01e9f656b2ea832489f7ed2d1dc9d
Author: Yun Gao <ga...@gmail.com>
AuthorDate: Tue Dec 28 10:16:41 2021 +0800
[release] Update version to 2.1-SNAPSHOT
---
flink-ml-core/pom.xml | 2 +-
flink-ml-iteration/pom.xml | 2 +-
flink-ml-lib/pom.xml | 2 +-
flink-ml-python/pyflink/ml/version.py | 2 +-
flink-ml-tests/pom.xml | 2 +-
flink-ml-uber/pom.xml | 2 +-
pom.xml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/flink-ml-core/pom.xml b/flink-ml-core/pom.xml
index 3d8a045..648c895 100644
--- a/flink-ml-core/pom.xml
+++ b/flink-ml-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-ml-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>flink-ml-core</artifactId>
diff --git a/flink-ml-iteration/pom.xml b/flink-ml-iteration/pom.xml
index 03b049d..396be8b 100644
--- a/flink-ml-iteration/pom.xml
+++ b/flink-ml-iteration/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-ml-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>flink-ml-iteration</artifactId>
diff --git a/flink-ml-lib/pom.xml b/flink-ml-lib/pom.xml
index 8f22a3d..63683df 100644
--- a/flink-ml-lib/pom.xml
+++ b/flink-ml-lib/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-ml-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>flink-ml-lib_${scala.binary.version}</artifactId>
diff --git a/flink-ml-python/pyflink/ml/version.py b/flink-ml-python/pyflink/ml/version.py
index a48cb35..60b55f8 100644
--- a/flink-ml-python/pyflink/ml/version.py
+++ b/flink-ml-python/pyflink/ml/version.py
@@ -20,4 +20,4 @@
The version will be consistent with the flink ml version and follow the PEP440.
.. seealso:: https://www.python.org/dev/peps/pep-0440
"""
-__version__ = "2.0.dev0"
+__version__ = "2.1.dev0"
diff --git a/flink-ml-tests/pom.xml b/flink-ml-tests/pom.xml
index 78d5e94..63170be 100644
--- a/flink-ml-tests/pom.xml
+++ b/flink-ml-tests/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-ml-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>flink-ml-tests</artifactId>
diff --git a/flink-ml-uber/pom.xml b/flink-ml-uber/pom.xml
index c76d8a1..1a179ab 100644
--- a/flink-ml-uber/pom.xml
+++ b/flink-ml-uber/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-ml-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>flink-ml-uber_${scala.binary.version}</artifactId>
diff --git a/pom.xml b/pom.xml
index d5eb522..04ff4b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@ under the License.
<artifactId>flink-ml-parent</artifactId>
<groupId>org.apache.flink</groupId>
<name>Flink ML</name>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<url>http://flink.apache.org</url>