Skip to content

Commit 40dc779

Browse files
committed
Bump several versions of dependencies in maven
1 parent 3034645 commit 40dc779

File tree

4 files changed

+101
-88
lines changed

4 files changed

+101
-88
lines changed

pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
<!-- Apache 2.0 -->
229229
<groupId>org.xerial</groupId>
230230
<artifactId>sqlite-jdbc</artifactId>
231-
<version>3.7.15-M1</version>
231+
<version>3.21.0.1</version>
232232
<scope>compile</scope>
233233
</dependency>
234234

@@ -237,7 +237,7 @@
237237
<!-- MIT -->
238238
<groupId>redis.clients</groupId>
239239
<artifactId>jedis</artifactId>
240-
<version>2.5.1</version>
240+
<version>2.9.0</version>
241241
<type>jar</type>
242242
<scope>compile</scope>
243243
</dependency>
@@ -247,7 +247,7 @@
247247
<!-- GPL -->
248248
<groupId>mysql</groupId>
249249
<artifactId>mysql-connector-java</artifactId>
250-
<version>5.1.30</version>
250+
<version>8.0.9-rc</version>
251251
<type>jar</type>
252252
<scope>compile</scope>
253253
</dependency>
@@ -265,7 +265,7 @@
265265
<!-- Apache 2.0 -->
266266
<groupId>org.yaml</groupId>
267267
<artifactId>snakeyaml</artifactId>
268-
<version>1.13</version>
268+
<version>1.20</version>
269269
</dependency>
270270

271271
<!-- Apache commons IO -->
@@ -295,7 +295,7 @@
295295
<!-- BSD -->
296296
<groupId>com.jcraft</groupId>
297297
<artifactId>jsch</artifactId>
298-
<version>0.1.51</version>
298+
<version>0.1.54</version>
299299
</dependency>
300300

301301
<!-- Charset detection library -->
@@ -324,13 +324,13 @@
324324
<dependency>
325325
<groupId>junit</groupId>
326326
<artifactId>junit</artifactId>
327-
<version>4.11</version>
327+
<version>4.12</version>
328328
<scope>test</scope>
329329
</dependency>
330330
<dependency>
331331
<groupId>org.mockito</groupId>
332332
<artifactId>mockito-core</artifactId>
333-
<version>1.9.5</version>
333+
<version>2.15.0</version>
334334
<scope>test</scope>
335335
</dependency>
336336
<!--<dependency>
@@ -373,17 +373,17 @@
373373
<groupId>commons-codec</groupId>
374374
<artifactId>commons-codec</artifactId>
375375
<type>jar</type>
376-
<version>1.9</version>
376+
<version>1.11</version>
377377
</dependency>
378378
<dependency>
379379
<groupId>org.ow2.asm</groupId>
380380
<artifactId>asm-all</artifactId>
381-
<version>5.0.4</version>
381+
<version>6.0_BETA</version>
382382
</dependency>
383383
<dependency>
384384
<groupId>jline</groupId>
385385
<artifactId>jline</artifactId>
386-
<version>2.11</version>
386+
<version>2.14.5</version>
387387
</dependency>
388388
<!-- Java Mail -->
389389
<dependency>
@@ -454,7 +454,7 @@
454454
<plugin>
455455
<groupId>org.apache.maven.plugins</groupId>
456456
<artifactId>maven-compiler-plugin</artifactId>
457-
<version>3.3</version>
457+
<version>3.7.0</version>
458458
<configuration>
459459
<showDeprecation>true</showDeprecation>
460460
<source>1.8</source>
@@ -493,7 +493,7 @@
493493
<plugin>
494494
<groupId>org.apache.maven.plugins</groupId>
495495
<artifactId>maven-shade-plugin</artifactId>
496-
<version>2.3</version>
496+
<version>3.1.0</version>
497497
<executions>
498498
<execution>
499499
<id>ShadedBundle</id>
@@ -802,7 +802,7 @@
802802
<plugin>
803803
<groupId>org.apache.maven.plugins</groupId>
804804
<artifactId>maven-source-plugin</artifactId>
805-
<version>2.1.2</version>
805+
<version>3.0.1</version>
806806
</plugin>
807807
<plugin>
808808
<groupId>org.apache.maven.plugins</groupId>

src/main/java/com/laytonsmith/core/compiler/Keyword.java

Lines changed: 73 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,36 @@
2222
*/
2323
public abstract class Keyword implements Documentation {
2424

25-
private static final String __CBRACE__ = new com.laytonsmith.core.functions.Compiler.__cbrace__().getName();
26-
27-
protected Keyword() {
28-
//
29-
}
30-
31-
/**
32-
* Sent upon reaching a keyword in the parse tree. The full list of arguments at the current stack depth, as well as
33-
* the keyword position will be sent, and the keyword is allowed to make any necessary changes, including throwing a
34-
* {@link ConfigCompileException} if necessary.
35-
*
36-
* @param list The argument list at the current depth as it currently exists. Note that the list will have already
37-
* been lightly processed.
38-
* @param keywordPosition The keyword position
39-
* @return The position at which the compiler should continue processing from. Often times this will just be
40-
* {@code keywordPosition}, but may be different if need be.
41-
* @throws ConfigCompileException If the tree is in an invalid state, and the keyword needs to cause an exception to
42-
* be thrown.
43-
*/
44-
public abstract int process(List<ParseTree> list, int keywordPosition) throws ConfigCompileException;
45-
46-
/**
47-
* Returns the keyword name, or null, if this class isn't tagged with the @keyword annotation.
48-
*
49-
* @return
50-
*/
51-
public final String getKeywordName() {
52-
keyword k = this.getClass().getAnnotation(keyword.class);
53-
return k == null ? null : k.value();
54-
}
25+
private static final String __CBRACE__ = new com.laytonsmith.core.functions.Compiler.__cbrace__().getName();
26+
27+
protected Keyword() {
28+
//
29+
}
30+
31+
/**
32+
* Sent upon reaching a keyword in the parse tree. The full list of arguments at the current stack depth, as well as
33+
* the keyword position will be sent, and the keyword is allowed to make any necessary changes, including throwing a
34+
* {@link ConfigCompileException} if necessary.
35+
*
36+
* @param list The argument list at the current depth as it currently exists. Note that the list will have already
37+
* been lightly processed.
38+
* @param keywordPosition The keyword position
39+
* @return The position at which the compiler should continue processing from. Often times this will just be
40+
* {@code keywordPosition}, but may be different if need be.
41+
* @throws ConfigCompileException If the tree is in an invalid state, and the keyword needs to cause an exception to
42+
* be thrown.
43+
*/
44+
public abstract int process(List<ParseTree> list, int keywordPosition) throws ConfigCompileException;
45+
46+
/**
47+
* Returns the keyword name, or null, if this class isn't tagged with the @keyword annotation.
48+
*
49+
* @return
50+
*/
51+
public final String getKeywordName() {
52+
keyword k = this.getClass().getAnnotation(keyword.class);
53+
return k == null ? null : k.value();
54+
}
5555

5656
/**
5757
* Convenience function to allow keywords to more easily check if this is a valid code block. If not, a
@@ -66,10 +66,10 @@ public final String getKeywordName() {
6666
protected void validateCodeBlock(ParseTree node, String message) throws ConfigCompileException {
6767
// Note: If any of these checks are changed, the isValidCodeBlock(ParseTree node) method has to be updated too
6868
// to keep it in sync.
69-
if(node.getChildren().size() > 1) {
69+
if (node.getChildren().size() > 1) {
7070
throw new ConfigCompileException("Unexpected number of arguments in code block", node.getTarget());
7171
}
72-
if(!isCodeBlock(node)) {
72+
if (!isCodeBlock(node)) {
7373
throw new ConfigCompileException(message, node.getTarget());
7474
}
7575
}
@@ -86,57 +86,56 @@ protected boolean isValidCodeBlock(ParseTree node) {
8686
return node.getChildren().size() <= 1 && isCodeBlock(node);
8787
}
8888

89-
/**
90-
* Returns true if the node is a code block or not. The argument count to the block is not considered.
91-
*
92-
* @param node
93-
* @return
94-
*/
95-
protected static boolean isCodeBlock(ParseTree node) {
96-
return node.getData() instanceof CFunction && node.getData().val().equals(__CBRACE__);
97-
}
98-
99-
/**
100-
* Returns a CNull, if the node is empty, or the first argument to the node
101-
*
102-
* @param node
103-
* @return
104-
*/
105-
protected static ParseTree getArgumentOrNull(ParseTree node) {
106-
if (node.getChildren().isEmpty()) {
107-
return new ParseTree(CNull.NULL, node.getFileOptions());
108-
} else {
109-
return node.getChildAt(0);
89+
/**
90+
* Returns true if the node is a code block or not. The argument count to the block is not considered.
91+
*
92+
* @param node
93+
* @return
94+
*/
95+
protected static boolean isCodeBlock(ParseTree node) {
96+
return node.getData() instanceof CFunction && node.getData().val().equals(__CBRACE__);
11097
}
111-
}
112-
113-
@Target(ElementType.TYPE)
114-
@Retention(RetentionPolicy.RUNTIME)
115-
public static @interface keyword {
11698

11799
/**
118-
* The name of the keyword.
100+
* Returns a CNull, if the node is empty, or the first argument to the node
119101
*
102+
* @param node
120103
* @return
121104
*/
122-
String value();
123-
}
105+
protected static ParseTree getArgumentOrNull(ParseTree node) {
106+
if (node.getChildren().isEmpty()) {
107+
return new ParseTree(CNull.NULL, node.getFileOptions());
108+
} else {
109+
return node.getChildAt(0);
110+
}
111+
}
112+
113+
@Target(ElementType.TYPE)
114+
@Retention(RetentionPolicy.RUNTIME)
115+
public static @interface keyword {
124116

125-
@Override
126-
@SuppressWarnings("unchecked")
127-
public Class<? extends Documentation>[] seeAlso() {
128-
return new Class[]{};
129-
}
117+
/**
118+
* The name of the keyword.
119+
*
120+
* @return
121+
*/
122+
String value();
123+
}
130124

131-
@Override
132-
public URL getSourceJar() {
133-
return ClassDiscovery.GetClassContainer(this.getClass());
134-
}
125+
@Override
126+
@SuppressWarnings("unchecked")
127+
public Class<? extends Documentation>[] seeAlso() {
128+
return new Class[]{};
129+
}
135130

136-
@Override
137-
public String getName() {
138-
return this.getClass().getAnnotation(keyword.class).value();
139-
}
131+
@Override
132+
public URL getSourceJar() {
133+
return ClassDiscovery.GetClassContainer(this.getClass());
134+
}
140135

136+
@Override
137+
public String getName() {
138+
return this.getClass().getAnnotation(keyword.class).value();
139+
}
141140

142141
}

src/main/java/com/laytonsmith/persistence/RedisDataSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public RedisDataSource(URI uri, ConnectionMixinFactory.ConnectionMixinOptions op
4949
}
5050
if(queryString.containsKey("timeout")){
5151
timeout = Integer.parseInt(queryString.get("timeout"));
52-
shardInfo.setTimeout(timeout);
52+
shardInfo.setSoTimeout(timeout);
5353
}
5454
if(queryString.containsKey("password")){
5555
password = queryString.get("password");

src/main/resources/docs/Compatibility

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@ Also note that CommandHelper may still be backwards and forward compatible to a
1313
! scope="col" width="40%" | Milestone
1414
! scope="col" width="50%" | Compatibility
1515
|-
16+
| ??
17+
| ??
18+
| Updated several dependencies
19+
* com.jcraft:jsch ..................................... 0.1.51 -> 0.1.54
20+
* commons-codec:commons-codec .............................. 1.9 -> 1.11
21+
* jline:jline ........................................... 2.11 -> 2.14.5
22+
* junit:junit ............................................. 4.11 -> 4.12
23+
* mysql:mysql-connector-java ........................ 5.1.30 -> 8.0.9-rc
24+
* org.mockito:mockito-core ............................. 1.9.5 -> 2.15.0
25+
* org.ow2.asm:asm-all ................................ 5.0.4 -> 6.0_BETA
26+
* org.xerial:sqlite-jdbc ......................... 3.7.15-M1 -> 3.21.0.1
27+
* org.yaml:snakeyaml ...................................... 1.13 -> 1.20
28+
* redis.clients:jedis ................................... 2.5.1 -> 2.9.0
29+
|-
1630
| [http://builds.enginehub.org/job/commandhelper/9876 #3219-]
1731
| [https://github.com/EngineHub/CommandHelper/commit/4d970d0dc2edb1a7a648904df01af148bba761e1 4d970d0]
1832
| Updated for Spigot 1.12.1

0 commit comments

Comments
 (0)