Skip to content

Commit 280ef1b

Browse files
Aias00Aias00
authored
[feat] shenyu java client (#5)
* [feat] shenyu java client * [feat] shenyu java client * [feat] shenyu java client * [feat] shenyu java client * [feat] shenyu java client * [feat] shenyu java client * [feat] shenyu java client
1 parent ac84990 commit 280ef1b

File tree

824 files changed

+2121
-58899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

824 files changed

+2121
-58899
lines changed

‎.github/workflows/ci.yml

+11-10
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ jobs:
3636
- uses: actions/checkout@v3
3737
with:
3838
submodules: true
39-
- uses: dorny/paths-filter@v2
40-
id: filter
41-
with:
42-
filters: '.github/filters.yml'
43-
list-files: json
39+
# - uses: dorny/paths-filter@v2
40+
# id: filter
41+
# with:
42+
# filters: '.github/filters.yml'
43+
# list-files: json
4444
- name: Restore ShenYu Maven Repos
45-
if: steps.filter.outputs.changed == 'true'
45+
# if: steps.filter.outputs.changed == 'true'
4646
id: restore-maven-cache
4747
uses: actions/cache/restore@v3
4848
with:
@@ -51,18 +51,19 @@ jobs:
5151
restore-keys: |
5252
${{ runner.os }}-maven-
5353
- uses: actions/setup-java@v1
54-
if: steps.filter.outputs.changed == 'true'
54+
# if: steps.filter.outputs.changed == 'true'
5555
with:
5656
java-version: ${{ matrix.java }}
5757
- name: Build with Maven
58-
if: steps.filter.outputs.changed == 'true'
58+
# if: steps.filter.outputs.changed == 'true'
5959
run: ./mvnw -B clean test -Prelease
6060
- uses: codecov/codecov-action@v1
6161
with:
6262
token: 2760af6a-3405-4882-9e61-04c5176fecfa
63-
if: steps.filter.outputs.changed == 'true'
63+
# if: steps.filter.outputs.changed == 'true'
6464
- name: Save ShenYu Maven Repos
65-
if: steps.filter.outputs.changed == 'true' && steps.restore-maven-cache.outputs.cache-hit != 'true'
65+
# if: steps.filter.outputs.changed == 'true' && steps.restore-maven-cache.outputs.cache-hit != 'true'
66+
if: steps.restore-maven-cache.outputs.cache-hit != 'true'
6667
uses: actions/cache/save@v3
6768
with:
6869
path: ~/.m2/repository

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
analyze:
3030
name: Analyze
3131
runs-on: ubuntu-latest
32-
if: (github.repository == 'apache/shenyu')
32+
if: (github.repository == 'apache/shenyu-client-java')
3333

3434
strategy:
3535
fail-fast: false

‎pom.xml

+122-17
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,9 @@
2727
<groupId>org.apache.shenyu</groupId>
2828
<artifactId>shenyu-client-java</artifactId>
2929
<packaging>pom</packaging>
30-
<version>2.7.1-SNAPSHOT</version>
30+
<version>2.7.0.1-jdk8-SNAPSHOT</version>
3131
<modules>
32-
<module>shenyu-java-common</module>
33-
<module>shenyu-client-java-core</module>
34-
<module>shenyu-client-java-http</module>
35-
<module>shenyu-client-java-dubbo</module>
36-
<module>shenyu-client-java-sofa</module>
37-
<module>shenyu-client-java-tars</module>
38-
<module>shenyu-client-java-grpc</module>
39-
<module>shenyu-client-java-motan</module>
40-
<module>shenyu-client-java-websocket</module>
41-
<module>shenyu-client-java-api-docs-annotations</module>
42-
<module>shenyu-client-java-autoconfig</module>
43-
<module>shenyu-register-java-common</module>
44-
<module>shenyu-register-java-client</module>
45-
<module>shenyu-spring-boot-starter-java-client</module>
46-
<module>shenyu-java-examples</module>
32+
<module>shenyu-client</module>
4733
</modules>
4834

4935
<properties>
@@ -79,13 +65,20 @@
7965
<gson.version>2.9.0</gson.version>
8066
<okhttp.version>4.9.3</okhttp.version>
8167
<javatuples.version>1.2</javatuples.version>
82-
<protobuf-java.version>3.25.5</protobuf-java.version>
68+
<protobuf-java.version>3.21.12</protobuf-java.version>
8369
<apache.dubbo.version>3.2.14</apache.dubbo.version>
8470
<spring-boot.version>2.7.18</spring-boot.version>
8571
<sofa.rpc.version>5.7.6</sofa.rpc.version>
8672
<sofa-common-tools.version>2.1.1</sofa-common-tools.version>
8773
<tars.version>1.7.2</tars.version>
8874
<motan.version>1.2.1</motan.version>
75+
<sofa-rpc-all.version>5.7.6</sofa-rpc-all.version>
76+
<jaxb.api.version>2.3.1</jaxb.api.version>
77+
<guava.version>32.0.0-jre</guava.version>
78+
<okhttp.version>4.9.3</okhttp.version>
79+
<bcprov-jdk18on.version>1.78</bcprov-jdk18on.version>
80+
<mockito.version>3.5.15</mockito.version>
81+
<awaitility.version>4.0.3</awaitility.version>
8982
</properties>
9083

9184
<dependencyManagement>
@@ -98,6 +91,74 @@
9891
<type>pom</type>
9992
<scope>import</scope>
10093
</dependency>
94+
<dependency>
95+
<groupId>org.apache.commons</groupId>
96+
<artifactId>commons-collections4</artifactId>
97+
<version>${commons-collections4.version}</version>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.ow2.asm</groupId>
101+
<artifactId>asm-tree</artifactId>
102+
<version>${asm.version}</version>
103+
</dependency>
104+
<dependency>
105+
<groupId>com.alipay.sofa</groupId>
106+
<artifactId>sofa-rpc-all</artifactId>
107+
<version>${sofa.rpc.version}</version>
108+
<exclusions>
109+
<exclusion>
110+
<groupId>net.jcip</groupId>
111+
<artifactId>jcip-annotations</artifactId>
112+
</exclusion>
113+
<exclusion>
114+
<groupId>io.grpc</groupId>
115+
<artifactId>grpc-core</artifactId>
116+
</exclusion>
117+
<exclusion>
118+
<artifactId>grpc-api</artifactId>
119+
<groupId>io.grpc</groupId>
120+
</exclusion>
121+
<exclusion>
122+
<artifactId>grpc-protobuf</artifactId>
123+
<groupId>io.grpc</groupId>
124+
</exclusion>
125+
<exclusion>
126+
<artifactId>grpc-stub</artifactId>
127+
<groupId>io.grpc</groupId>
128+
</exclusion>
129+
<exclusion>
130+
<artifactId>grpc-netty-shaded</artifactId>
131+
<groupId>io.grpc</groupId>
132+
</exclusion>
133+
</exclusions>
134+
</dependency>
135+
<dependency>
136+
<groupId>com.tencent.tars</groupId>
137+
<artifactId>tars-spring-boot-starter</artifactId>
138+
<version>${tars.version}</version>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.slf4j</groupId>
142+
<artifactId>slf4j-api</artifactId>
143+
<version>1.7.36</version>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.slf4j</groupId>
147+
<artifactId>jcl-over-slf4j</artifactId>
148+
<version>1.7.36</version>
149+
</dependency>
150+
151+
<dependency>
152+
<groupId>com.google.guava</groupId>
153+
<artifactId>guava</artifactId>
154+
<version>${guava.version}</version>
155+
</dependency>
156+
157+
<dependency>
158+
<groupId>org.bouncycastle</groupId>
159+
<artifactId>bcprov-jdk18on</artifactId>
160+
<version>${bcprov-jdk18on.version}</version>
161+
</dependency>
101162
</dependencies>
102163
</dependencyManagement>
103164

@@ -122,6 +183,50 @@
122183
<artifactId>spring-test</artifactId>
123184
<scope>test</scope>
124185
</dependency>
186+
<dependency>
187+
<groupId>org.junit.jupiter</groupId>
188+
<artifactId>junit-jupiter</artifactId>
189+
<scope>test</scope>
190+
</dependency>
191+
<dependency>
192+
<groupId>org.junit.vintage</groupId>
193+
<artifactId>junit-vintage-engine</artifactId>
194+
<scope>test</scope>
195+
</dependency>
196+
<dependency>
197+
<groupId>org.hamcrest</groupId>
198+
<artifactId>hamcrest-library</artifactId>
199+
<scope>test</scope>
200+
</dependency>
201+
<dependency>
202+
<groupId>org.mockito</groupId>
203+
<artifactId>mockito-junit-jupiter</artifactId>
204+
<version>${mockito.version}</version>
205+
<scope>test</scope>
206+
</dependency>
207+
<dependency>
208+
<groupId>org.mockito</groupId>
209+
<artifactId>mockito-core</artifactId>
210+
<version>${mockito.version}</version>
211+
<scope>test</scope>
212+
</dependency>
213+
<dependency>
214+
<groupId>org.mockito</groupId>
215+
<artifactId>mockito-inline</artifactId>
216+
<version>${mockito.version}</version>
217+
<scope>test</scope>
218+
</dependency>
219+
<dependency>
220+
<groupId>org.awaitility</groupId>
221+
<artifactId>awaitility</artifactId>
222+
<version>${awaitility.version}</version>
223+
<scope>test</scope>
224+
</dependency>
225+
<dependency>
226+
<groupId>javax.xml.bind</groupId>
227+
<artifactId>jaxb-api</artifactId>
228+
<version>${jaxb.api.version}</version>
229+
</dependency>
125230
</dependencies>
126231

127232
<build>

‎shenyu-client-java-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java

-93
This file was deleted.

0 commit comments

Comments
 (0)