You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@seata.apache.org by ji...@apache.org on 2026/09/20 02:39:43 UTC
(incubator-seata) branch 2.7.0 updated: optimize: restore Snap.svg header and stop RC Docker publish (#8227)
This is an automated email from the ASF dual-hosted git repository.
funky-eyes pushed a commit to branch 2.7.0
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.7.0 by this push:
new ed7276af59 optimize: restore Snap.svg header and stop RC Docker publish (#8227)
ed7276af59 is described below
commit ed7276af5982f87a6fe79ebb655ed47708fa6b87
Author: justabug <Bu...@users.noreply.github.com>
AuthorDate: Sun Sep 20 10:39:36 2026 +0800
optimize: restore Snap.svg header and stop RC Docker publish (#8227)
---
.github/workflows/publish-docker.yml | 50 +++++++++++-----------
.licenserc.yaml | 1 +
LICENSE | 5 +++
NOTICE | 8 ++++
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
distribution/LICENSE | 2 +-
distribution/LICENSE-namingserver | 2 +-
distribution/NOTICE | 46 ++++----------------
distribution/NOTICE-namingserver | 22 ----------
distribution/NOTICE-server | 16 +------
.../src/render/PathMap.js | 32 +++++++-------
12 files changed, 70 insertions(+), 116 deletions(-)
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index cc794298d2..ab36b9084d 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -16,12 +16,13 @@
#
name: "Publish Docker Image"
+# Voting stays on x.x.x (e.g. 2.7.0). That branch must not publish official
+# tags or retarget latest — that is how unreleased 2.7.0 hit Docker Hub.
+# Snapshot images stay on snapshot / 2.x (+ the daily schedule).
+# After the vote passes, push x.x.x-release (e.g. 2.7.0-release) to publish.
on:
push:
- branches: [ snapshot, "*.*.*" ]
- #tags: [ "*" ]
-
- #This schedule only takes effect in the default branch
+ branches: [ snapshot, 2.x, "*.*.*-release" ]
schedule:
- cron: '0 16 * * *' #GMT+0
@@ -47,39 +48,40 @@ jobs:
# step 3
- name: "Print maven version"
run: ./mvnw -version
- # step 4 based on java8
- - name: "Publish images to DockerHub based on java8"
- if: matrix.java == 8
+ # step 4 snapshot/dev java8 (never release-image)
+ - name: "Publish snapshot images to DockerHub based on java8"
+ if: ${{ matrix.java == 8 && (github.ref_name == 'snapshot' || github.ref_name == '2.x' || github.event_name == 'schedule') }}
+ env:
+ REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }}
+ REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+ run: |
+ ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:8u422-b05-jdk -Pimage -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+ # official tags: only x.x.x-release after the vote
+ - name: "Publish official images to DockerHub based on java8"
+ if: ${{ matrix.java == 8 && endsWith(github.ref_name, '-release') }}
env:
REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }}
REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
run: |
- if [ "${{ github.ref_name }}" == "develop" ] || [ "${{ github.ref_name }}" == "snapshot" || [ "${{ github.ref_name }}" == "2.x" ]; then
- ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:8u422-b05-jdk -Pimage -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
- else
- ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:8u422-b05-jdk -Pimage,release-image-based-on-java8 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
- fi
- # step 4 based on java17
- - name: "Publish images to DockerHub based on java17"
- if: ${{ matrix.java == 17 && github.ref_name != 'develop' && github.ref_name != 'snapshot' && github.ref_name != '2.x' }}
+ ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:8u422-b05-jdk -Pimage,release-image-based-on-java8 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+ - name: "Publish official images to DockerHub based on java17"
+ if: ${{ matrix.java == 17 && endsWith(github.ref_name, '-release') }}
env:
REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }}
REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
run: |
- ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:17.0.12_7-jdk -Pimage,release-image-based-on-java17 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
- # step 5 based on java21
- - name: "Publish images to DockerHub based on java21"
- if: ${{ matrix.java == 21 && github.ref_name != 'develop' && github.ref_name != 'snapshot' && github.ref_name != '2.x' }}
+ ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:17.0.12_7-jdk -Pimage,release-image-based-on-java17 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+ - name: "Publish official images to DockerHub based on java21"
+ if: ${{ matrix.java == 21 && endsWith(github.ref_name, '-release') }}
env:
REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }}
REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
run: |
- ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:21.0.4_7-jdk -Pimage,release-image-based-on-java21 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
- # step 6 based on java25
- - name: "Publish images to DockerHub based on java25"
- if: ${{ matrix.java == 25 && github.ref_name != 'develop' && github.ref_name != 'snapshot' && github.ref_name != '2.x' }}
+ ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:21.0.4_7-jdk -Pimage,release-image-based-on-java21 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+ - name: "Publish official images to DockerHub based on java25"
+ if: ${{ matrix.java == 25 && endsWith(github.ref_name, '-release') }}
env:
REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }}
REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
run: |
- ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:25-jdk -Pimage,release-image-based-on-java25 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:25-jdk -Pimage,release-image-based-on-java25 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 3fdf75da68..4acb5916f4 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -42,6 +42,7 @@ header:
- '**/org/apache/seata/sqlparser/antlr/**/*.g4'
- 'console/src/main/resources/static/console-fe/public/css/bootstrap.css'
- 'console/src/main/resources/static/console-fe/public/css/font-awesome.css'
+ - 'saga/seata-saga-statemachine-designer/src/render/PathMap.js'
- 'distribution/licenses/**'
- 'distribution/LICENSE'
- 'distribution/LICENSE-*'
diff --git a/LICENSE b/LICENSE
index fb164ee017..4d1c0beed1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -251,6 +251,11 @@
Copyright 2013 Twitter, Inc., is licensed under the Apache License 2.0.
Its bundled normalize.css v2.1.3 code is licensed under the MIT License.
+ PathMap.js in saga/seata-saga-statemachine-designer/src/render/PathMap.js
+ contains helper functions copied and adjusted from Snap.svg
+ (https://github.com/adobe-webplatform/Snap.svg/blob/master/src/svg.js),
+ Copyright 2013-2017 Adobe Systems Incorporated, Apache License 2.0.
+
Font Awesome 4.5.0 (https://github.com/FortAwesome/Font-Awesome/tree/v4.5.0)
CSS is licensed under the MIT License.
diff --git a/NOTICE b/NOTICE
index d46d94e23f..ddadcfbc78 100644
--- a/NOTICE
+++ b/NOTICE
@@ -13,3 +13,11 @@ The Apache Software Foundation (http://www.apache.org/).
The original idea and initial implementation of the maven-wrapper module is derived
from the Gradle Wrapper which was written originally by Hans Dockter and Adam Murdoch.
Copyright 2007 the original author or authors.
+-----------------------------------------------------------------------
+Snap.svg
+Snap.svg is licensed under the Apache license version 2.0, January 2004 (see LICENSE file).
+Copyright (c) 2013 - 2017 Adobe Systems Incorporated. All rights reserved.
+
+This product contains a modified portion of Snap.svg
+(https://github.com/adobe-webplatform/Snap.svg/blob/master/src/svg.js)
+in saga/seata-saga-statemachine-designer/src/render/PathMap.js.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index fae3ef11bb..05fc44fee6 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -89,6 +89,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#8112](https://github.com/apache/incubator-seata/pull/8112)] optimize seata-server test performance
- [[#8116](https://github.com/apache/incubator-seata/pull/8116)] fix incompatible dependencies
- [[#8125](https://github.com/apache/incubator-seata/pull/8125)] optimize: renew table meta cache entries during refresh
+- [[#8227](https://github.com/apache/incubator-seata/pull/8227)] restore Snap.svg header on PathMap.js, fix NOTICE/LICENSE IPMC findings, and publish official Docker images only from x.x.x-release branches
### security:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 08af1db06b..c9bf302990 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -90,6 +90,7 @@
- [[#8112](https://github.com/apache/incubator-seata/pull/8112)] 优化 seata-server 测试性能
- [[#8116](https://github.com/apache/incubator-seata/pull/8116)] 修复不兼容的依赖
- [[#8125](https://github.com/apache/incubator-seata/pull/8125)] 优化：在刷新期间更新表元数据缓存
+- [[#8227](https://github.com/apache/incubator-seata/pull/8227)] 恢复 PathMap.js 的 Snap.svg 版权头，修正 NOTICE/LICENSE 中的 IPMC 项，正式 Docker 镜像仅从 x.x.x-release 分支发布
### security:
diff --git a/distribution/LICENSE b/distribution/LICENSE
index 7e40a03c80..e6fd463466 100644
--- a/distribution/LICENSE
+++ b/distribution/LICENSE
@@ -784,7 +784,7 @@ MIT licenses
asynckit 0.4.0 MIT see:licenses/asynckit-MIT
axios 1.12.2 MIT see:licenses/axios-MIT
babel-plugin-emotion 10.2.2 MIT see:licenses/babel-plugin-emotion-MIT
- babel-plugin-emotion/node_modules/babel-plugin-macros 2.8.0 MIT see:licenses/babel-plugin-emotion-MIT
+ babel-plugin-emotion/node_modules/babel-plugin-macros 2.8.0 MIT see:licenses/babel-plugin-macros-MIT
babel-plugin-emotion/node_modules/convert-source-map 1.9.0 MIT see:licenses/convert-source-map-MIT
babel-plugin-emotion/node_modules/cosmiconfig 6.0.0 MIT see:licenses/cosmiconfig-MIT
babel-plugin-styled-components 2.1.4 MIT see:licenses/babel-plugin-styled-components-MIT
diff --git a/distribution/LICENSE-namingserver b/distribution/LICENSE-namingserver
index 1bd698681c..ccec33deb3 100644
--- a/distribution/LICENSE-namingserver
+++ b/distribution/LICENSE-namingserver
@@ -544,7 +544,7 @@ MIT licenses
asynckit 0.4.0 MIT see:licenses/asynckit-MIT
axios 1.12.2 MIT see:licenses/axios-MIT
babel-plugin-emotion 10.2.2 MIT see:licenses/babel-plugin-emotion-MIT
- babel-plugin-emotion/node_modules/babel-plugin-macros 2.8.0 MIT see:licenses/babel-plugin-emotion-MIT
+ babel-plugin-emotion/node_modules/babel-plugin-macros 2.8.0 MIT see:licenses/babel-plugin-macros-MIT
babel-plugin-emotion/node_modules/convert-source-map 1.9.0 MIT see:licenses/convert-source-map-MIT
babel-plugin-emotion/node_modules/cosmiconfig 6.0.0 MIT see:licenses/cosmiconfig-MIT
babel-plugin-styled-components 2.1.4 MIT see:licenses/babel-plugin-styled-components-MIT
diff --git a/distribution/NOTICE b/distribution/NOTICE
index fe2db6b7bc..981befd891 100644
--- a/distribution/NOTICE
+++ b/distribution/NOTICE
@@ -4,6 +4,14 @@ Copyright 2023-2026 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Snap.svg
+Snap.svg is licensed under the Apache license version 2.0, January 2004 (see LICENSE file).
+Copyright (c) 2013 - 2017 Adobe Systems Incorporated. All rights reserved.
+
+This product contains a modified portion of Snap.svg
+(https://github.com/adobe-webplatform/Snap.svg/blob/master/src/svg.js)
+in saga/seata-saga-statemachine-designer/src/render/PathMap.js.
+
Component: seata-server
========================================================================
ant-1.10.12.jar, ant-launcher-1.10.12.jar
@@ -233,21 +241,7 @@ The Apache Software Foundation (http://www.apache.org/).
========================================================================
fastjson-1.2.83.jar
========================================================================
-/*
- * Copyright 1999-2017 Alibaba Group.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+Copyright 1999-2017 Alibaba Group.
========================================================================
fory-core-0.12.3.jar
@@ -509,17 +503,6 @@ Micrometer Context Propagation
Copyright (c) 2017-Present VMware, Inc. All Rights Reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-------------------------------------------------------------------------------
@@ -707,17 +690,6 @@ Micrometer
Copyright (c) 2017-Present VMware, Inc. All Rights Reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-------------------------------------------------------------------------------
diff --git a/distribution/NOTICE-namingserver b/distribution/NOTICE-namingserver
index dfd26b4cfa..61c345d50c 100644
--- a/distribution/NOTICE-namingserver
+++ b/distribution/NOTICE-namingserver
@@ -42,17 +42,6 @@ Micrometer Context Propagation
Copyright (c) 2017-Present VMware, Inc. All Rights Reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-------------------------------------------------------------------------------
@@ -240,17 +229,6 @@ Micrometer
Copyright (c) 2017-Present VMware, Inc. All Rights Reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-------------------------------------------------------------------------------
diff --git a/distribution/NOTICE-server b/distribution/NOTICE-server
index 5badf4316f..6b4ce3e0e4 100644
--- a/distribution/NOTICE-server
+++ b/distribution/NOTICE-server
@@ -232,21 +232,7 @@ The Apache Software Foundation (http://www.apache.org/).
========================================================================
fastjson-1.2.83.jar
========================================================================
-/*
- * Copyright 1999-2017 Alibaba Group.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+Copyright 1999-2017 Alibaba Group.
========================================================================
fory-core-0.12.3.jar
diff --git a/saga/seata-saga-statemachine-designer/src/render/PathMap.js b/saga/seata-saga-statemachine-designer/src/render/PathMap.js
index b5ba96ca9c..042ba80d89 100644
--- a/saga/seata-saga-statemachine-designer/src/render/PathMap.js
+++ b/saga/seata-saga-statemachine-designer/src/render/PathMap.js
@@ -1,19 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright (c) 2013 - 2017 Adobe Systems Incorporated. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// copied and adjusted from
+// https://github.com/adobe-webplatform/Snap.svg/blob/master/src/svg.js
/* eslint-disable max-len */
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@seata.apache.org
For additional commands, e-mail: notifications-help@seata.apache.org