Skip to content

Commit

Permalink
[type:refeactor] refeactor 2.6.1 (#4995)
Browse files Browse the repository at this point in the history 
* [maven-release-plugin] prepare release v2.6.0

* [maven-release-plugin] prepare for next development iteration

* change pom

* Update Dockerfile
  • Loading branch information
@moremind
moremind authored Aug 11, 2023
1 parent 7711d77 commit a6a56cf
Show file tree
Hide file tree
Showing 291 changed files with 314 additions and 349 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<packaging>pom</packaging>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
<name>shenyu</name>
<modules>
<module>shenyu-admin</module>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-admin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-alert/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-alert</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-bootstrap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-bootstrap</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-api-docs-annotations/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
6 changes: 2 additions & 4 deletions shenyu-client/shenyu-client-autoconfig/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>shenyu-client</artifactId>
<groupId>org.apache.shenyu</groupId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-brpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-dubbo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-dubbo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-dubbo</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-alibaba-dubbo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-dubbo</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-apache-dubbo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-dubbo/shenyu-client-dubbo-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-dubbo</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-dubbo-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-grpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-grpc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-http/shenyu-client-springcloud/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-http</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-springcloud</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-http/shenyu-client-springmvc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-http</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-springmvc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-motan/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-sofa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-sofa</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-tars/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-tars</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-websocket/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-websocket</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-websocket/shenyu-client-spring-websocket/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-websocket</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-spring-websocket</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-common</artifactId>
Expand Down
6 changes: 2 additions & 4 deletions shenyu-discovery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-discovery</artifactId>
Expand Down
6 changes: 2 additions & 4 deletions shenyu-discovery/shenyu-discovery-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-discovery</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-discovery-api</artifactId>
Expand Down
6 changes: 2 additions & 4 deletions shenyu-discovery/shenyu-discovery-zookeeper/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-discovery</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-discovery-zookeeper</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-disruptor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-disruptor</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-dist</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-dist/shenyu-admin-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-dist</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-admin-dist</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-dist/shenyu-bootstrap-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-dist</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-bootstrap-dist</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-dist/shenyu-docker-compose-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-dist</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>shenyu-docker-compose-dist</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-dist/shenyu-src-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-dist</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>shenyu-src-dist</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-examples</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-examples/shenyu-examples-brpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-examples</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-examples-brpc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-examples/shenyu-examples-brpc/shenyu-examples-brpc-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-examples-brpc</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-examples-brpc-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-examples/shenyu-examples-brpc/shenyu-examples-brpc-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-examples-brpc</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-examples-brpc-service</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-examples/shenyu-examples-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-examples</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion shenyu-examples/shenyu-examples-dubbo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-examples</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-examples-dubbo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...u-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service-annotation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>shenyu-examples-dubbo</artifactId>
<groupId>org.apache.shenyu</groupId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-examples-dubbo</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ...yu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>shenyu-examples-dubbo</artifactId>
<groupId>org.apache.shenyu</groupId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading

0 comments on commit a6a56cf

Please sign in to comment.