This is an automated email from the ASF dual-hosted git repository.
chaokunyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fory.git
The following commit(s) were added to refs/heads/main by this push:
new 1d3cca0d6 chore: fix release error (#2796)
1d3cca0d6 is described below
commit 1d3cca0d6e7be1f4159f33820ba5ac7c676f5a59
Author: Shawn Yang <[email protected]>
AuthorDate: Tue Oct 21 21:32:47 2025 +0800
chore: fix release error (#2796)
## Why?
<!-- Describe the purpose of this PR. -->
## What does this PR do?
fix release error
## Related issues
<!--
Is there any related issue? If this PR closes them you say say
fix/closes:
- #xxxx0
- #xxxx1
- Fixes #xxxx2
-->
## Does this PR introduce any user-facing change?
<!--
If any user-facing interface changes, please [open an
issue](https://github.com/apache/fory/issues/new/choose) describing the
need to do so and update the document if necessary.
Delete section if not applicable.
-->
- [ ] Does this PR introduce any public API change?
- [ ] Does this PR introduce any binary protocol compatibility change?
## Benchmark
<!--
When the PR has an impact on performance (if you don't know whether the
PR will have an impact on performance, you can submit the PR first, and
if it will have impact on performance, the code reviewer will explain
it), be sure to attach a benchmark data here.
Delete section if not applicable.
-->
---
ci/release.py | 14 +++++++++++++-
integration_tests/graalvm_tests/pom.xml | 2 +-
integration_tests/jdk_compatibility_tests/pom.xml | 2 +-
integration_tests/jpms_tests/pom.xml | 2 +-
integration_tests/latest_jdk_tests/pom.xml | 2 +-
java/benchmark/pom.xml | 2 +-
java/fory-core/pom.xml | 2 +-
java/fory-extensions/pom.xml | 2 +-
java/fory-format/pom.xml | 2 +-
java/fory-simd/pom.xml | 12 +++++++++++-
java/fory-test-core/pom.xml | 2 +-
java/fory-testsuite/pom.xml | 2 +-
java/pom.xml | 2 +-
javascript/packages/fory/package.json | 2 +-
javascript/packages/hps/package.json | 2 +-
kotlin/pom.xml | 2 +-
python/pyfory/__init__.py | 2 +-
scala/build.sbt | 4 ++--
scala/project/build.properties | 2 +-
.../fory/serializer/scala/CollectionSerializer.scala | 16 +---------------
20 files changed, 43 insertions(+), 35 deletions(-)
diff --git a/ci/release.py b/ci/release.py
index 90c7136b3..bd0560bf5 100644
--- a/ci/release.py
+++ b/ci/release.py
@@ -54,8 +54,19 @@ def build(v: str):
if os.path.exists("dist"):
shutil.rmtree("dist")
os.mkdir("dist")
- subprocess.check_call(f"git checkout releases-{v}", shell=True)
branch = f"releases-{v}"
+ # Check if branch exists, if not create it
+ result = subprocess.run(
+ f"git show-ref --verify --quiet refs/heads/{branch}",
+ shell=True,
+ capture_output=True,
+ )
+ if result.returncode == 0:
+ # Branch exists, checkout
+ subprocess.check_call(f"git checkout {branch}", shell=True)
+ else:
+ # Branch doesn't exist, create it
+ subprocess.check_call(f"git checkout -b {branch}", shell=True)
src_tar = f"apache-fory-{v}-src.tar.gz"
_check_all_committed()
_strip_unnecessary_license()
@@ -180,6 +191,7 @@ def bump_java_version(new_version):
"java/benchmark",
"java/fory-core",
"java/fory-format",
+ "java/fory-simd",
"java/fory-extensions",
"java/fory-test-core",
"java/fory-testsuite",
diff --git a/integration_tests/graalvm_tests/pom.xml
b/integration_tests/graalvm_tests/pom.xml
index 94a0d83d3..1957253d2 100644
--- a/integration_tests/graalvm_tests/pom.xml
+++ b/integration_tests/graalvm_tests/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.fory</groupId>
<artifactId>fory-parent</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
<relativePath>../../java</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/integration_tests/jdk_compatibility_tests/pom.xml
b/integration_tests/jdk_compatibility_tests/pom.xml
index 2464b080e..b0ef69de2 100644
--- a/integration_tests/jdk_compatibility_tests/pom.xml
+++ b/integration_tests/jdk_compatibility_tests/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.fory</groupId>
<artifactId>fory-parent</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
<relativePath>../../java</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/integration_tests/jpms_tests/pom.xml
b/integration_tests/jpms_tests/pom.xml
index 00e5a6b94..b8722ff08 100644
--- a/integration_tests/jpms_tests/pom.xml
+++ b/integration_tests/jpms_tests/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.fory</groupId>
<artifactId>fory-parent</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
<relativePath>../../java</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/integration_tests/latest_jdk_tests/pom.xml
b/integration_tests/latest_jdk_tests/pom.xml
index e0bc17022..71fe92d83 100644
--- a/integration_tests/latest_jdk_tests/pom.xml
+++ b/integration_tests/latest_jdk_tests/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.fory</groupId>
<artifactId>fory-parent</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
<relativePath>../../java</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java/benchmark/pom.xml b/java/benchmark/pom.xml
index 8a0f00be5..47729f944 100644
--- a/java/benchmark/pom.xml
+++ b/java/benchmark/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>fory-parent</artifactId>
<groupId>org.apache.fory</groupId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
</parent>
<artifactId>benchmark</artifactId>
diff --git a/java/fory-core/pom.xml b/java/fory-core/pom.xml
index 3b8a084db..10fd8138a 100644
--- a/java/fory-core/pom.xml
+++ b/java/fory-core/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.fory</groupId>
<artifactId>fory-parent</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java/fory-extensions/pom.xml b/java/fory-extensions/pom.xml
index 28677ec42..6643ce819 100644
--- a/java/fory-extensions/pom.xml
+++ b/java/fory-extensions/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.fory</groupId>
<artifactId>fory-parent</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java/fory-format/pom.xml b/java/fory-format/pom.xml
index 42f27a310..17cfa1da3 100644
--- a/java/fory-format/pom.xml
+++ b/java/fory-format/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.fory</groupId>
<artifactId>fory-parent</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java/fory-simd/pom.xml b/java/fory-simd/pom.xml
index 6769afbc1..4f90782d4 100644
--- a/java/fory-simd/pom.xml
+++ b/java/fory-simd/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.fory</groupId>
<artifactId>fory-parent</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -78,6 +78,16 @@
<argLine>--add-modules=jdk.incubator.vector</argLine>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalOptions>
+
<additionalOption>--add-modules=jdk.incubator.vector</additionalOption>
+ </additionalOptions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/java/fory-test-core/pom.xml b/java/fory-test-core/pom.xml
index 069721903..69f397a42 100644
--- a/java/fory-test-core/pom.xml
+++ b/java/fory-test-core/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>fory-parent</artifactId>
<groupId>org.apache.fory</groupId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java/fory-testsuite/pom.xml b/java/fory-testsuite/pom.xml
index 53c88f8d5..383c6fb79 100644
--- a/java/fory-testsuite/pom.xml
+++ b/java/fory-testsuite/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>fory-parent</artifactId>
<groupId>org.apache.fory</groupId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java/pom.xml b/java/pom.xml
index f31ca9324..c05b20c55 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.apache.fory</groupId>
<artifactId>fory-parent</artifactId>
<packaging>pom</packaging>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
<name>Fory Project Parent POM</name>
<description>
Apache Fory™ is a blazingly fast multi-language serialization framework
powered by jit and zero-copy.
diff --git a/javascript/packages/fory/package.json
b/javascript/packages/fory/package.json
index 48e567e12..7b7370f34 100644
--- a/javascript/packages/fory/package.json
+++ b/javascript/packages/fory/package.json
@@ -1,6 +1,6 @@
{
"name": "@apache-fory/fory",
- "version": "0.13.0.dev",
+ "version": "0.13.0",
"description": "Apache Fory™ is a blazingly fast multi-language
serialization framework powered by jit and zero-copy",
"main": "dist/index.js",
"scripts": {
diff --git a/javascript/packages/hps/package.json
b/javascript/packages/hps/package.json
index b4161e3b5..1fcc79bc3 100644
--- a/javascript/packages/hps/package.json
+++ b/javascript/packages/hps/package.json
@@ -1,6 +1,6 @@
{
"name": "@apache-fory/hps",
- "version": "0.13.0.dev",
+ "version": "0.13.0",
"description": "Apache Fory™ nodejs high-performance suite",
"main": "dist/index.js",
"files": [
diff --git a/kotlin/pom.xml b/kotlin/pom.xml
index 4c7f7601b..f27f46b3c 100644
--- a/kotlin/pom.xml
+++ b/kotlin/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.fory</groupId>
<artifactId>fory-kotlin</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.13.0</version>
<modelVersion>4.0.0</modelVersion>
<properties>
diff --git a/python/pyfory/__init__.py b/python/pyfory/__init__.py
index 2abeda2a7..c904717ff 100644
--- a/python/pyfory/__init__.py
+++ b/python/pyfory/__init__.py
@@ -65,4 +65,4 @@ try:
except (AttributeError, ImportError):
pass
-__version__ = "0.13.0.dev"
+__version__ = "0.13.0"
diff --git a/scala/build.sbt b/scala/build.sbt
index 7a9ca006b..ad350e8a1 100644
--- a/scala/build.sbt
+++ b/scala/build.sbt
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-val foryVersion = "0.13.0-SNAPSHOT"
+val foryVersion = "0.13.0"
val scala213Version = "2.13.15"
ThisBuild / apacheSonatypeProjectProfile := "fory"
version := foryVersion
scalaVersion := scala213Version
-crossScalaVersions := Seq(scala213Version, "3.3.4")
+crossScalaVersions := Seq(scala213Version, "3.3.1")
lazy val root = Project(id = "fory-scala", base = file("."))
.settings(
diff --git a/scala/project/build.properties b/scala/project/build.properties
index ab2e727d9..c12725b41 100644
--- a/scala/project/build.properties
+++ b/scala/project/build.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-sbt.version=1.11.2
+sbt.version=1.9.9
diff --git
a/scala/src/main/scala/org/apache/fory/serializer/scala/CollectionSerializer.scala
b/scala/src/main/scala/org/apache/fory/serializer/scala/CollectionSerializer.scala
index b9274a1ec..707eba5c5 100644
---
a/scala/src/main/scala/org/apache/fory/serializer/scala/CollectionSerializer.scala
+++
b/scala/src/main/scala/org/apache/fory/serializer/scala/CollectionSerializer.scala
@@ -70,8 +70,6 @@ abstract class AbstractScalaCollectionSerializer[A, T <:
Iterable[A]](fory: Fory
/**
* A Iterable adapter to wrap scala iterable into a [[java.lang.Iterable]].
- *
- *
*/
private trait JavaIterable[A] extends java.lang.Iterable[A] {
override def iterator(): util.Iterator[A] = new util.Iterator[A] {
@@ -87,8 +85,6 @@ private trait JavaIterable[A] extends java.lang.Iterable[A] {
/**
* A Collection adapter which wrap scala iterable into a
[[java.util.Collection]].
- *
- *
*/
private class CollectionAdapter[A, T](coll: scala.collection.Iterable[A])
extends util.AbstractCollection[A] with JavaIterable[A] {
@@ -108,8 +104,6 @@ private class CollectionAdapter[A, T](coll:
scala.collection.Iterable[A])
/**
* A List adapter which wrap scala Seq into a [[java.util.List]].
- *
- *
*/
private class ListAdapter[A](coll: scala.collection.Seq[A])
extends util.AbstractList[A] with JavaIterable[A] {
@@ -124,8 +118,6 @@ private class ListAdapter[A](coll: scala.collection.Seq[A])
/**
* A Collection adapter which build scala collection from elements.
- *
- *
*/
private class JavaCollectionBuilder[A, T](val builder: mutable.Builder[A, T])
extends util.AbstractCollection[A] {
@@ -141,8 +133,6 @@ private class JavaCollectionBuilder[A, T](val builder:
mutable.Builder[A, T])
/**
* Serializer for scala iterables.
- *
- *
*/
class ScalaCollectionSerializer[A, T <: Iterable[A]] (fory: Fory, cls:
Class[T])
extends AbstractScalaCollectionSerializer[A, T](fory, cls) {
@@ -157,8 +147,6 @@ class ScalaCollectionSerializer[A, T <: Iterable[A]] (fory:
Fory, cls: Class[T])
/**
* Serializer for scala sorted set.
- *
- *
*/
class ScalaSortedSetSerializer[A, T <: scala.collection.SortedSet[A]](fory:
Fory, cls: Class[T])
extends AbstractScalaCollectionSerializer[A, T](fory, cls) {
@@ -172,9 +160,7 @@ class ScalaSortedSetSerializer[A, T <:
scala.collection.SortedSet[A]](fory: Fory
}
/**
- * Serializer for scala [[Seq]].
- *
- *
+ * Serializer for scala Seq.
*/
class ScalaSeqSerializer[A, T <: scala.collection.Seq[A]](fory: Fory, cls:
Class[T])
extends AbstractScalaCollectionSerializer[A, T](fory, cls) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
