Merge branch 'apache-3.2' into apache-3.3

# Conflicts:
#	dubbo-dependencies-bom/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
#	pom.xml
This commit is contained in:
Albumen Kevin 2023-11-13 10:07:57 +08:00
commit c3b0c2eefa
2 changed files with 2 additions and 2 deletions

View File

@ -26,7 +26,7 @@ jobs:
uses: apache/skywalking-eyes@e1a02359b239bd28de3f6d35fdc870250fa513d5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "Set up JDK 17"
- name: "Set up JDK 21"
uses: actions/setup-java@v3
with:
distribution: 'zulu'

View File

@ -173,7 +173,7 @@
<eureka.version>1.10.18</eureka.version>
<!-- Fabric8 for Kubernetes -->
<fabric8_kubernetes_version>6.9.1</fabric8_kubernetes_version>
<fabric8_kubernetes_version>6.9.2</fabric8_kubernetes_version>
<!-- Alibaba -->
<alibaba_spring_context_support_version>1.0.11</alibaba_spring_context_support_version>