Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 11 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: dorny/paths-filter@v2
id: filter
with:
filters: '.github/filters.yml'
list-files: json
# - 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'
# if: steps.filter.outputs.changed == 'true'
id: restore-maven-cache
uses: actions/cache/restore@v3
with:
Expand All @@ -51,18 +51,19 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/setup-java@v1
if: steps.filter.outputs.changed == 'true'
# if: steps.filter.outputs.changed == 'true'
with:
java-version: ${{ matrix.java }}
- name: Build with Maven
if: steps.filter.outputs.changed == 'true'
# 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'
# 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'
# if: steps.filter.outputs.changed == 'true' && steps.restore-maven-cache.outputs.cache-hit != 'true'
if: steps.restore-maven-cache.outputs.cache-hit != 'true'
uses: actions/cache/save@v3
with:
path: ~/.m2/repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
if: (github.repository == 'apache/shenyu')
if: (github.repository == 'apache/shenyu-client-java')

strategy:
fail-fast: false
Expand Down
139 changes: 122 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,9 @@
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-java</artifactId>
<packaging>pom</packaging>
<version>2.7.1-SNAPSHOT</version>
<version>2.7.0.1-jdk8-SNAPSHOT</version>
<modules>
<module>shenyu-java-common</module>
<module>shenyu-client-java-core</module>
<module>shenyu-client-java-http</module>
<module>shenyu-client-java-dubbo</module>
<module>shenyu-client-java-sofa</module>
<module>shenyu-client-java-tars</module>
<module>shenyu-client-java-grpc</module>
<module>shenyu-client-java-motan</module>
<module>shenyu-client-java-websocket</module>
<module>shenyu-client-java-api-docs-annotations</module>
<module>shenyu-client-java-autoconfig</module>
<module>shenyu-register-java-common</module>
<module>shenyu-register-java-client</module>
<module>shenyu-spring-boot-starter-java-client</module>
<module>shenyu-java-examples</module>
<module>shenyu-client</module>
</modules>

<properties>
Expand Down Expand Up @@ -79,13 +65,20 @@
<gson.version>2.9.0</gson.version>
<okhttp.version>4.9.3</okhttp.version>
<javatuples.version>1.2</javatuples.version>
<protobuf-java.version>3.25.5</protobuf-java.version>
<protobuf-java.version>3.21.12</protobuf-java.version>
<apache.dubbo.version>3.2.14</apache.dubbo.version>
<spring-boot.version>2.7.18</spring-boot.version>
<sofa.rpc.version>5.7.6</sofa.rpc.version>
<sofa-common-tools.version>2.1.1</sofa-common-tools.version>
<tars.version>1.7.2</tars.version>
<motan.version>1.2.1</motan.version>
<sofa-rpc-all.version>5.7.6</sofa-rpc-all.version>
<jaxb.api.version>2.3.1</jaxb.api.version>
<guava.version>32.0.0-jre</guava.version>
<okhttp.version>4.9.3</okhttp.version>
<bcprov-jdk18on.version>1.78</bcprov-jdk18on.version>
<mockito.version>3.5.15</mockito.version>
<awaitility.version>4.0.3</awaitility.version>
</properties>

<dependencyManagement>
Expand All @@ -98,6 +91,74 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>${commons-collections4.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-all</artifactId>
<version>${sofa.rpc.version}</version>
<exclusions>
<exclusion>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</exclusion>
<exclusion>
<artifactId>grpc-api</artifactId>
<groupId>io.grpc</groupId>
</exclusion>
<exclusion>
<artifactId>grpc-protobuf</artifactId>
<groupId>io.grpc</groupId>
</exclusion>
<exclusion>
<artifactId>grpc-stub</artifactId>
<groupId>io.grpc</groupId>
</exclusion>
<exclusion>
<artifactId>grpc-netty-shaded</artifactId>
<groupId>io.grpc</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring-boot-starter</artifactId>
<version>${tars.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.36</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>${bcprov-jdk18on.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -122,6 +183,50 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${awaitility.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.api.version}</version>
</dependency>
</dependencies>

<build>
Expand Down

This file was deleted.

Loading
Loading