diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 0000000..17ad637
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,61 @@
+name: 🐛 Bug Report
+description: Problems and issues with code of Apache ShenYu 🤔.
+title: "[BUG]
"
+labels: ["type: bug"]
+body:
+- type: checkboxes
+ attributes:
+ label: Is there an existing issue for this?
+ description: Please search to see if an issue already exists for the bug you encountered.
+ options:
+ - label: I have searched the existing issues
+ required: true
+- type: textarea
+ attributes:
+ label: Current Behavior
+ description: A concise description of what you're experiencing.
+ validations:
+ required: false
+- type: textarea
+ attributes:
+ label: Expected Behavior
+ description: A concise description of what you expected to happen.
+ validations:
+ required: false
+- type: textarea
+ attributes:
+ label: Steps To Reproduce
+ description: Steps to reproduce the behavior.
+ placeholder: |
+ 1. In this environment...
+ 2. With this config...
+ 3. Run '...'
+ 4. See error...
+ validations:
+ required: false
+- type: textarea
+ attributes:
+ label: Environment
+ description: |
+ examples:
+ - **ShenYu version(s)**: 2.4.0
+ value: "ShenYu version(s):"
+ render: markdown
+ validations:
+ required: false
+- type: textarea
+ attributes:
+ label: Debug logs
+ description: |
+ Add your debug logs here.
+ validations:
+ required: false
+- type: textarea
+ attributes:
+ label: Anything else?
+ description: |
+ Links? References? Anything that will give us more context about the issue you are encountering!
+
+ Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+ validations:
+ required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..78a032f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 0000000..81e9a17
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,39 @@
+name: 🚀 Feature Request
+description: I have a suggestion (and may want to implement it 🙂)!
+title: "[Feature] "
+labels: ["type: new feature"]
+body:
+- type: textarea
+ attributes:
+ label: Feature Request
+ description: >
+ Tip: Have you checked the docs https://shenyu.apache.org/docs/index/, GitHub issues whether someone else has already reported your issue? Maybe the feature already exists?
+ placeholder: >
+ A concise description of what you're experiencing.
+ validations:
+ required: false
+- type: textarea
+ attributes:
+ label: Is your feature request related to a problem? Please describe
+ description: A clear and concise description of what the problem is. Ex. I have an issue when [...]
+ validations:
+ required: false
+- type: textarea
+ attributes:
+ label: Describe the solution you'd like
+ description: A clear and concise description of what you want to happen. Add any considered drawbacks.
+ validations:
+ required: false
+- type: textarea
+ attributes:
+ label: Describe alternatives you've considered
+ description: A clear and concise description of any alternative solutions or features you've considered.
+ validations:
+ required: false
+- type: textarea
+ attributes:
+ label: Additional context
+ validations:
+ required: false
+- type: markdown
+ value: "Please read the [Contribution Guideline](https://shenyu.apache.org/community/contributor) before submitting the PR"
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
new file mode 100644
index 0000000..2e5584e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -0,0 +1,18 @@
+name: 🤔 Question
+description: Usage question that isn't answered in docs or discussion
+title: "[Question] "
+labels: ["type: question"]
+body:
+- type: textarea
+ attributes:
+ label: Question
+ placeholder: >
+ your question here;
+ validations:
+ required: true
+- type: markdown
+ attributes:
+ value: |
+ Please pay attention on issues you submitted, because we maybe need more details.
+ If no response anymore and we cannot reproduce it on current information, we will **close it**.
+
diff --git a/.github/ISSUE_TEMPLATE/task.yml b/.github/ISSUE_TEMPLATE/task.yml
new file mode 100644
index 0000000..c492c00
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/task.yml
@@ -0,0 +1,25 @@
+name: 🚀 Task
+description: Used to create tasks for the community.
+title: "[Task] "
+labels: ["status: volunteer wanted"]
+body:
+- type: textarea
+ attributes:
+ label: Description
+ placeholder: A clear and concise description of Task
+ validations:
+ required: true
+- type: textarea
+ attributes:
+ label: Task List
+ placeholder: |
+ 1. Task1...
+ 2. Task2...
+ 3. Task3...
+ 4. Task4...
+ validations:
+ required: false
+- type: markdown
+ attributes:
+ value: |
+ Please read the [Contribution Guideline](https://shenyu.apache.org/community/contributor) before submitting the PR
diff --git a/.github/ISSUE_TEMPLATE/volunteer.yml b/.github/ISSUE_TEMPLATE/volunteer.yml
new file mode 100644
index 0000000..3b09b4c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/volunteer.yml
@@ -0,0 +1,17 @@
+name: 🤔 Volunteer
+description: Some volunteer help
+title: "[Volunteer] "
+labels: ["status: volunteer wanted"]
+body:
+- type: textarea
+ attributes:
+ label: Volunteer help
+ placeholder: >
+ your need volunteer help here;
+ validations:
+ required: true
+- type: markdown
+ attributes:
+ value: |
+ Please read the [Contribution Guideline](https://shenyu.apache.org/community/contributor) before submitting the PR
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..7062523
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,10 @@
+
+
+
+Make sure that:
+
+- [ ] You have read the [contribution guidelines](https://shenyu.apache.org/community/contributor-guide).
+- [ ] You submit test cases (unit or integration tests) that back your changes.
+- [ ] Your local test passed `./mvnw clean install -Dmaven.javadoc.skip=true`.
diff --git a/.github/filters.yml b/.github/filters.yml
new file mode 100644
index 0000000..e84cb86
--- /dev/null
+++ b/.github/filters.yml
@@ -0,0 +1,21 @@
+changed:
+ - "!**/{\
+ *.md,*.txt,\
+ resources/static/**,\
+ .asf.yaml,.gitignore,.licenserc.yaml,\
+ LICENSE,NOTICE,\
+ Makefile,\
+ shenyu-e2e/**, \
+ .github/(ISSUE_TEMPLATE/**|PULL_REQUEST_TEMPLATE)\
+ }"
+pom:
+ - "**/pom.xml"
+e2e:
+ - "!**/{\
+ *.md,*.txt,\
+ resources/static/**,\
+ .asf.yaml,.gitignore,.licenserc.yaml,\
+ LICENSE,NOTICE,\
+ Makefile,\
+ .github/(ISSUE_TEMPLATE/**|PULL_REQUEST_TEMPLATE)\
+ }"
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..afe8311
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,94 @@
+# 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.
+
+name: ci
+
+on:
+ pull_request:
+ push:
+ branches:
+ - main
+
+jobs:
+ build:
+ strategy:
+ matrix:
+ java: [ 8, 11, 17 ]
+ os: [ ubuntu-latest ]
+ runs-on: ${{ matrix.os }}
+ if: (github.repository == 'apache/shenyu-client-java')
+ steps:
+ - name: Support longpaths
+ if: ${{ matrix.os == 'windows-latest'}}
+ run: git config --system core.longpaths true
+ - uses: actions/checkout@v3
+ with:
+ submodules: true
+ - uses: dorny/paths-filter@v2
+ id: filter
+ with:
+ filters: '.github/filters.yml'
+ list-files: json
+ - name: Restore ShenYu Maven Repos
+ if: steps.filter.outputs.changed == 'true'
+ id: restore-maven-cache
+ uses: actions/cache/restore@v3
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+ - uses: actions/setup-java@v1
+ if: steps.filter.outputs.changed == 'true'
+ with:
+ java-version: ${{ matrix.java }}
+ - name: Build with Maven
+ if: steps.filter.outputs.changed == 'true'
+ run: ./mvnw -B clean test -Prelease
+ - uses: codecov/codecov-action@v1
+ with:
+ token: 2760af6a-3405-4882-9e61-04c5176fecfa
+ if: steps.filter.outputs.changed == 'true'
+ - name: Save ShenYu Maven Repos
+ if: steps.filter.outputs.changed == 'true' && steps.restore-maven-cache.outputs.cache-hit != 'true'
+ uses: actions/cache/save@v3
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+
+ check-license-header:
+ name: check-license-header
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: true
+ - name: Check License Header
+ uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ requirement:
+ name: build
+ if: always()
+ needs:
+ - build
+ runs-on: ubuntu-latest
+ steps:
+ - name: checking job status
+ run: |
+ [[ "${{ needs.build.result }}" == "success" ]] || exit -1
+
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000..f4ae8e7
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,68 @@
+# 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.
+
+name: "CodeQL"
+
+on:
+ push:
+ branches:
+ - main
+ paths:
+ - '**/*.java'
+ pull_request:
+ paths:
+ - '**/*.java'
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-latest
+ if: (github.repository == 'apache/shenyu')
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: ['java']
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+ with:
+ submodules: true
+ - name: Set up JDK 8
+ uses: actions/setup-java@v3
+ with:
+ java-version: 8
+ distribution: 'temurin'
+
+ - name: Restore ShenYu Maven Repos
+ id: restore-maven-cache
+ uses: actions/cache/restore@v3
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v2
+ with:
+ languages: ${{ matrix.language }}
+
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v2
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v2
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..0bc246c
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +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
+#
+# 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.
+
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/mvnw b/mvnw
new file mode 100755
index 0000000..b7f0646
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,287 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# 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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.1.1
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /usr/local/etc/mavenrc ] ; then
+ . /usr/local/etc/mavenrc
+ fi
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME
+ else
+ JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`\\unset -f command; \\command -v java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ printf '%s' "$(cd "$basedir"; pwd)"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(dirname $0)")
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+ else
+ wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $wrapperUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ QUIET="--quiet"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ QUIET=""
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget $QUIET "$wrapperUrl" -O "$wrapperJarPath"
+ else
+ wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath"
+ fi
+ [ $? -eq 0 ] || rm -f "$wrapperJarPath"
+ elif command -v curl > /dev/null; then
+ QUIET="--silent"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ QUIET=""
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L
+ else
+ curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L
+ fi
+ [ $? -eq 0 ] || rm -f "$wrapperJarPath"
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaSource=`cygpath --path --windows "$javaSource"`
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaSource" ]; then
+ if [ ! -e "$javaClass" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaSource")
+ fi
+ if [ -e "$javaClass" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ $MAVEN_DEBUG_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 0000000..474c9d6
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,187 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.1.1
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %WRAPPER_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+ %JVM_CONFIG_MAVEN_PROPS% ^
+ %MAVEN_OPTS% ^
+ %MAVEN_DEBUG_OPTS% ^
+ -classpath %WRAPPER_JAR% ^
+ "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+ %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%
diff --git a/shenyu-java-common/pom.xml b/shenyu-java-common/pom.xml
index 5f077bd..2541b20 100644
--- a/shenyu-java-common/pom.xml
+++ b/shenyu-java-common/pom.xml
@@ -130,7 +130,7 @@
org.mockito
mockito-inline
- 3.3.3
+ 3.5.15
test
diff --git a/shenyu-java-examples/shenyu-java-examples-grpc/Dockerfile b/shenyu-java-examples/shenyu-java-examples-grpc/Dockerfile
index 3e9a36a..6120552 100644
--- a/shenyu-java-examples/shenyu-java-examples-grpc/Dockerfile
+++ b/shenyu-java-examples/shenyu-java-examples-grpc/Dockerfile
@@ -16,7 +16,7 @@
FROM eclipse-temurin:17-centos7
-ENV APP_NAME shenyu-examples-grpc
+ENV APP_NAME shenyu-java-examples-grpc
ENV LOCAL_PATH /opt/${APP_NAME}
RUN mkdir -p ${LOCAL_PATH}
diff --git a/shenyu-java-examples/shenyu-java-examples-grpc/k8s/shenyu-examples-grpc.yml b/shenyu-java-examples/shenyu-java-examples-grpc/k8s/shenyu-examples-grpc.yml
index 04ec664..bdfb960 100644
--- a/shenyu-java-examples/shenyu-java-examples-grpc/k8s/shenyu-examples-grpc.yml
+++ b/shenyu-java-examples/shenyu-java-examples-grpc/k8s/shenyu-examples-grpc.yml
@@ -23,27 +23,27 @@ metadata:
apiVersion: apps/v1
kind: Deployment
metadata:
- name: shenyu-examples-grpc-deployment
+ name: shenyu-java-examples-grpc-deployment
namespace: shenyu-ingress
labels:
- app: shenyu-examples-grpc
- all: shenyu-examples-grpc
+ app: shenyu-java-examples-grpc
+ all: shenyu-java-examples-grpc
spec:
replicas: 1
selector:
matchLabels:
- app: shenyu-examples-grpc
- all: shenyu-examples-grpc
+ app: shenyu-java-examples-grpc
+ all: shenyu-java-examples-grpc
strategy: {}
template:
metadata:
namespace: shenyu-ingress
labels:
- app: shenyu-examples-grpc
- all: shenyu-examples-grpc
+ app: shenyu-java-examples-grpc
+ all: shenyu-java-examples-grpc
spec:
containers:
- - image: shenyu-examples-grpc
+ - image: shenyu-java-examples-grpc
name: shenyu-java-examples-grpc
livenessProbe:
initialDelaySeconds: 30
@@ -70,15 +70,15 @@ status: {}
apiVersion: v1
kind: Service
metadata:
- name: shenyu-examples-grpc-service
+ name: shenyu-java-examples-grpc-service
namespace: shenyu-ingress
labels:
- app: shenyu-examples-grpc
- all: shenyu-examples-grpc
+ app: shenyu-java-examples-grpc
+ all: shenyu-java-examples-grpc
spec:
selector:
- app: shenyu-examples-grpc
- all: shenyu-examples-grpc
+ app: shenyu-java-examples-grpc
+ all: shenyu-java-examples-grpc
type: NodePort
ports:
- name: "55290"
diff --git a/shenyu-java-examples/shenyu-java-examples-grpc/pom.xml b/shenyu-java-examples/shenyu-java-examples-grpc/pom.xml
index d95bdae..ee04c38 100644
--- a/shenyu-java-examples/shenyu-java-examples-grpc/pom.xml
+++ b/shenyu-java-examples/shenyu-java-examples-grpc/pom.xml
@@ -64,7 +64,7 @@
org.apache.shenyu
shenyu-discovery-zookeeper
- ${project.version}
+ 2.6.1
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/README.md b/shenyu-java-examples/shenyu-java-examples-sofa/README.md
index 9342cf4..080d096 100644
--- a/shenyu-java-examples/shenyu-java-examples-sofa/README.md
+++ b/shenyu-java-examples/shenyu-java-examples-sofa/README.md
@@ -24,7 +24,7 @@ shenyu:
serverLists : http://localhost:2379
```
-#### shenyu-examples-sofa-service config
+#### shenyu-java-examples-sofa-service config
set etcd register config:
```yaml
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/pom.xml b/shenyu-java-examples/shenyu-java-examples-sofa/pom.xml
index 6a1ff60..2b36da2 100644
--- a/shenyu-java-examples/shenyu-java-examples-sofa/pom.xml
+++ b/shenyu-java-examples/shenyu-java-examples-sofa/pom.xml
@@ -29,15 +29,15 @@
pom
- shenyu-examples-sofa-api
- shenyu-examples-sofa-service
+ shenyu-java-examples-sofa-api
+ shenyu-java-examples-sofa-service
org.apache.shenyu
- shenyu-examples-sofa-api
+ shenyu-java-examples-sofa-api
${project.version}
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/pom.xml b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/pom.xml
similarity index 91%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/pom.xml
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/pom.xml
index a5eb905..eaa9d30 100644
--- a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/pom.xml
+++ b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/pom.xml
@@ -25,9 +25,9 @@
2.7.1-SNAPSHOT
4.0.0
- shenyu-examples-sofa-api
+ shenyu-java-examples-sofa-api
- shenyu-examples-sofa-api
+ shenyu-java-examples-sofa-api
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/entity/SofaComplexTypeBean.java b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/entity/SofaComplexTypeBean.java
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/entity/SofaComplexTypeBean.java
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/entity/SofaComplexTypeBean.java
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/entity/SofaSimpleTypeBean.java b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/entity/SofaSimpleTypeBean.java
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/entity/SofaSimpleTypeBean.java
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/entity/SofaSimpleTypeBean.java
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaClientMultiParamService.java b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaClientMultiParamService.java
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaClientMultiParamService.java
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaClientMultiParamService.java
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaClientSingleParamService.java b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaClientSingleParamService.java
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaClientSingleParamService.java
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaClientSingleParamService.java
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaMultiParamService.java b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaMultiParamService.java
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaMultiParamService.java
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaMultiParamService.java
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaSingleParamService.java b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaSingleParamService.java
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaSingleParamService.java
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaSingleParamService.java
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/Dockerfile b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/Dockerfile
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/Dockerfile
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/Dockerfile
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/k8s/ingress.yml b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/k8s/ingress.yml
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/k8s/ingress.yml
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/k8s/ingress.yml
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/k8s/shenyu-examples-sofa.yml b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/k8s/shenyu-examples-sofa.yml
similarity index 98%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/k8s/shenyu-examples-sofa.yml
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/k8s/shenyu-examples-sofa.yml
index fc929d5..ed3d7cc 100644
--- a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/k8s/shenyu-examples-sofa.yml
+++ b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/k8s/shenyu-examples-sofa.yml
@@ -65,7 +65,7 @@ status: {}
apiVersion: v1
kind: Service
metadata:
- name: shenyu-examples-sofa-service
+ name: shenyu-java-examples-sofa-service
namespace: shenyu-ingress
labels:
app: shenyu-examples-sofa
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/k8s/shenyu-zookeeper.yml b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/k8s/shenyu-zookeeper.yml
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/k8s/shenyu-zookeeper.yml
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/k8s/shenyu-zookeeper.yml
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/pom.xml b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/pom.xml
similarity index 92%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/pom.xml
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/pom.xml
index 6caefc8..68b5534 100644
--- a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/pom.xml
+++ b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/pom.xml
@@ -25,7 +25,7 @@
2.7.1-SNAPSHOT
4.0.0
- shenyu-examples-sofa-service
+ shenyu-java-examples-sofa-service
3.22.0
@@ -87,13 +87,13 @@
org.apache.shenyu
- shenyu-examples-sofa-api
+ shenyu-java-examples-sofa-api
${project.version}
org.apache.shenyu
- shenyu-spring-boot-starter-client-sofa
+ shenyu-spring-boot-starter-java-client-sofa
${project.version}
@@ -130,7 +130,7 @@
- shenyu-examples-sofa
+ shenyu-java-examples-sofa
org.springframework.boot
@@ -147,8 +147,8 @@
example
- shenyu-examples-sofa
- shenyu-examples-sofa
+ shenyu-java-examples-sofa
+ shenyu-java-examples-sofa
latest
@@ -163,7 +163,7 @@
- shenyu-examples-sofa
+ shenyu-java-examples-sofa
${project.basedir}
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/http/sofa-test-api.http b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/http/sofa-test-api.http
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/http/sofa-test-api.http
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/http/sofa-test-api.http
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/TestSofaApplication.java b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/TestSofaApplication.java
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/TestSofaApplication.java
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/TestSofaApplication.java
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaClientMultiParamServiceImpl.java b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaClientMultiParamServiceImpl.java
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaClientMultiParamServiceImpl.java
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaClientMultiParamServiceImpl.java
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaClientSingleParamServiceImpl.java b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaClientSingleParamServiceImpl.java
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaClientSingleParamServiceImpl.java
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaClientSingleParamServiceImpl.java
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaMultiParamServiceImpl.java b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaMultiParamServiceImpl.java
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaMultiParamServiceImpl.java
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaMultiParamServiceImpl.java
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaSingleParamServiceImpl.java b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaSingleParamServiceImpl.java
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaSingleParamServiceImpl.java
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaSingleParamServiceImpl.java
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/resources/application.yml b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/resources/application.yml
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/resources/application.yml
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/resources/application.yml
diff --git a/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/resources/invoke-server-example.xml b/shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/resources/invoke-server-example.xml
similarity index 100%
rename from shenyu-java-examples/shenyu-java-examples-sofa/shenyu-examples-sofa-service/src/main/resources/invoke-server-example.xml
rename to shenyu-java-examples/shenyu-java-examples-sofa/shenyu-java-examples-sofa-service/src/main/resources/invoke-server-example.xml
diff --git a/shenyu-java-examples/shenyu-java-examples-springcloud/pom.xml b/shenyu-java-examples/shenyu-java-examples-springcloud/pom.xml
index 28bdc4f..086aac0 100644
--- a/shenyu-java-examples/shenyu-java-examples-springcloud/pom.xml
+++ b/shenyu-java-examples/shenyu-java-examples-springcloud/pom.xml
@@ -36,7 +36,7 @@
org.apache.shenyu
- shenyu-spring-boot-starter-client-springcloud
+ shenyu-spring-boot-starter-java-client-springcloud
${project.version}
diff --git a/shenyu-java-examples/shenyu-java-examples-springmvc-tomcat/pom.xml b/shenyu-java-examples/shenyu-java-examples-springmvc-tomcat/pom.xml
index 4e68aea..32474da 100644
--- a/shenyu-java-examples/shenyu-java-examples-springmvc-tomcat/pom.xml
+++ b/shenyu-java-examples/shenyu-java-examples-springmvc-tomcat/pom.xml
@@ -36,7 +36,7 @@
org.apache.shenyu
- shenyu-client-springmvc
+ shenyu-client-java-springmvc
${project.version}
diff --git a/shenyu-java-examples/shenyu-java-examples-springmvc/pom.xml b/shenyu-java-examples/shenyu-java-examples-springmvc/pom.xml
index 6f2ce4f..bb4d442 100644
--- a/shenyu-java-examples/shenyu-java-examples-springmvc/pom.xml
+++ b/shenyu-java-examples/shenyu-java-examples-springmvc/pom.xml
@@ -36,7 +36,7 @@
org.apache.shenyu
- shenyu-client-springmvc
+ shenyu-client-java-springmvc
${project.version}
diff --git a/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-annotation-websocket/pom.xml b/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-annotation-websocket/pom.xml
index ff4e68f..248757e 100644
--- a/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-annotation-websocket/pom.xml
+++ b/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-annotation-websocket/pom.xml
@@ -29,7 +29,7 @@
org.apache.shenyu
- shenyu-spring-boot-starter-client-spring-websocket
+ shenyu-spring-boot-starter-java-client-spring-websocket
${project.version}
diff --git a/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-native-websocket/pom.xml b/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-native-websocket/pom.xml
index e7d1138..e5f8e64 100644
--- a/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-native-websocket/pom.xml
+++ b/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-native-websocket/pom.xml
@@ -30,13 +30,13 @@
org.apache.shenyu
- shenyu-spring-boot-starter-client-spring-websocket
+ shenyu-spring-boot-starter-java-client-spring-websocket
${project.version}
org.apache.shenyu
- shenyu-spring-boot-starter-client-springmvc
+ shenyu-spring-boot-starter-java-client-springmvc
${project.version}
@@ -78,7 +78,7 @@
org.apache.shenyu
shenyu-discovery-zookeeper
- ${project.version}
+ 2.6.1
diff --git a/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-reactive-websocket/pom.xml b/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-reactive-websocket/pom.xml
index c6a522b..5764ad2 100644
--- a/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-reactive-websocket/pom.xml
+++ b/shenyu-java-examples/shenyu-java-examples-websocket/shenyu-example-spring-reactive-websocket/pom.xml
@@ -31,7 +31,7 @@
org.apache.shenyu
- shenyu-spring-boot-starter-client-spring-websocket
+ shenyu-spring-boot-starter-java-client-spring-websocket
${project.version}