Skip to content

Commit 40e9e8b

Browse files
authored
Merge pull request #1016 from ctripcorp/bugfix/guice
fix gufice version
2 parents 9c04373 + b4637aa commit 40e9e8b

File tree

3 files changed

+35
-1
lines changed

3 files changed

+35
-1
lines changed

pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<javassist.version>3.20.0-GA</javassist.version>
9090
<joda-time.version>2.9</joda-time.version>
9191
<guava-version>31.0.1-jre</guava-version>
92+
<guice.version>5.1.0</guice.version>
9293
</properties>
9394

9495
<modules>
@@ -753,6 +754,18 @@
753754
<version>${guava-version}</version>
754755
</dependency>
755756

757+
<!-- Google Guice for cdubbo -->
758+
<dependency>
759+
<groupId>com.google.inject</groupId>
760+
<artifactId>guice</artifactId>
761+
<version>${guice.version}</version>
762+
<exclusions>
763+
<exclusion>
764+
<groupId>aopalliance</groupId>
765+
<artifactId>aopalliance</artifactId>
766+
</exclusion>
767+
</exclusions>
768+
</dependency>
756769
<!-- unit test -->
757770
<dependency>
758771
<groupId>com.squareup.okhttp3</groupId>

redis/redis-meta/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,17 @@
3535
<groupId>org.aspectj</groupId>
3636
<artifactId>aspectjweaver</artifactId>
3737
</dependency>
38-
38+
<!-- Google Guice for cdubbo -->
39+
<dependency>
40+
<groupId>com.google.inject</groupId>
41+
<artifactId>guice</artifactId>
42+
<exclusions>
43+
<exclusion>
44+
<groupId>aopalliance</groupId>
45+
<artifactId>aopalliance</artifactId>
46+
</exclusion>
47+
</exclusions>
48+
</dependency>
3949

4050
<!-- test -->
4151
<dependency>

redis/redis-proxy/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,17 @@
129129
<scope>test</scope>
130130
</dependency>
131131

132+
<!-- Google Guice for cdubbo -->
133+
<dependency>
134+
<groupId>com.google.inject</groupId>
135+
<artifactId>guice</artifactId>
136+
<exclusions>
137+
<exclusion>
138+
<groupId>aopalliance</groupId>
139+
<artifactId>aopalliance</artifactId>
140+
</exclusion>
141+
</exclusions>
142+
</dependency>
132143

133144
</dependencies>
134145

0 commit comments

Comments
 (0)