Skip to content

Commit cdeb3a8

Browse files
Bump guava from 25.1-jre to 31.0.1-jre
Bumps [guava](https://github.com/google/guava) from 25.1-jre to 31.0.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent cb29c5e commit cdeb3a8

1 file changed

Lines changed: 55 additions & 8 deletions

File tree

core/pom.xml

Lines changed: 55 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,28 @@
6868
<groupId>com.zaxxer</groupId>
6969
<artifactId>HikariCP</artifactId>
7070
<version>4.0.3</version>
71+
<exclusions>
72+
<!-- HikariCP uses an old version of this API that has a typo in the service interface -->
73+
<!-- We will use the api provided by the jdk14 dependency -->
74+
<exclusion>
75+
<groupId>org.slf4j</groupId>
76+
<artifactId>slf4j-api</artifactId>
77+
</exclusion>
78+
</exclusions>
7179
</dependency>
7280

7381
<!--Logging framework implements slf4j which is required by hikari-->
7482
<dependency>
7583
<groupId>org.slf4j</groupId>
7684
<artifactId>slf4j-jdk14</artifactId>
77-
<version>1.7.32</version>
85+
<version>2.0.0-alpha5</version>
7886
</dependency>
7987

8088
<!-- snakeyaml is present in Bungee, Spigot, Cauldron and so we could use this independent implementation -->
8189
<dependency>
8290
<groupId>net.md-5</groupId>
8391
<artifactId>bungeecord-config</artifactId>
84-
<version>1.12-SNAPSHOT</version>
92+
<version>1.16-R0.4</version>
8593
<exclusions>
8694
<exclusion>
8795
<groupId>*</groupId>
@@ -94,16 +102,32 @@
94102
<dependency>
95103
<groupId>org.geysermc.floodgate</groupId>
96104
<artifactId>api</artifactId>
97-
<version>2.0-SNAPSHOT</version>
105+
<version>${floodgate.version}</version>
98106
<scope>provided</scope>
107+
<exclusions>
108+
<exclusion>
109+
<groupId>io.netty</groupId>
110+
<artifactId>*</artifactId>
111+
</exclusion>
112+
<exclusion>
113+
<groupId>org.geysermc.cumulus</groupId>
114+
<artifactId>*</artifactId>
115+
</exclusion>
116+
</exclusions>
99117
</dependency>
100118

101119
<!-- Bedrock player bridge -->
102120
<dependency>
103121
<groupId>org.geysermc</groupId>
104122
<artifactId>connector</artifactId>
105-
<version>1.4.3-SNAPSHOT</version>
123+
<version>${geyser.version}</version>
106124
<scope>provided</scope>
125+
<exclusions>
126+
<exclusion>
127+
<groupId>*</groupId>
128+
<artifactId>*</artifactId>
129+
</exclusion>
130+
</exclusions>
107131
</dependency>
108132

109133
<!--Common component for contacting the Mojang API-->
@@ -113,18 +137,41 @@
113137
<version>0.4</version>
114138
</dependency>
115139

116-
<!-- APIs we can use because they are available in all platforms (Spigot, Bungee) -->
140+
<!-- APIs we can use because they are available in all platforms (Spigot, Bungee, Velocity) -->
117141
<dependency>
118142
<groupId>com.google.guava</groupId>
119143
<artifactId>guava</artifactId>
120-
<version>17.0</version>
121-
<scope>provided</scope>
144+
<!-- Old version for velocity -->
145+
<version>31.0.1-jre</version>
146+
<!-- Exclude compile time deps not marked as such on upstream -->
147+
<exclusions>
148+
<exclusion>
149+
<groupId>com.google.code.findbugs</groupId>
150+
<artifactId>jsr305</artifactId>
151+
</exclusion>
152+
<exclusion>
153+
<groupId>org.checkerframework</groupId>
154+
<artifactId>checker-qual</artifactId>
155+
</exclusion>
156+
<exclusion>
157+
<groupId>com.google.errorprone</groupId>
158+
<artifactId>error_prone_annotations</artifactId>
159+
</exclusion>
160+
<exclusion>
161+
<groupId>com.google.j2objc</groupId>
162+
<artifactId>j2objc-annotations</artifactId>
163+
</exclusion>
164+
<exclusion>
165+
<groupId>org.codehaus.mojo</groupId>
166+
<artifactId>animal-sniffer-annotations</artifactId>
167+
</exclusion>
168+
</exclusions>
122169
</dependency>
123170

124171
<dependency>
125172
<groupId>com.google.code.gson</groupId>
126173
<artifactId>gson</artifactId>
127-
<version>2.2.4</version>
174+
<version>2.8.9</version>
128175
</dependency>
129176
</dependencies>
130177
</project>

0 commit comments

Comments
 (0)