From 7decfd65ce950c0b706bae2a3f20e7bdd74c72bf Mon Sep 17 00:00:00 2001 From: mopemope Date: Sat, 1 Jan 2022 14:04:44 +0900 Subject: [PATCH] Bump up --- CHANGELOG.md | 8 +++++++- server/build.gradle.kts | 8 ++++---- server/src/main/java/meghanada/Main.java | 2 +- .../java/meghanada/completion/JavaCompletionTest.java | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c43f618fd..e79614520 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,18 @@ # Next Release +# 1.3.2 (2021-01-01) + +## Fixed + +- Fix CVE-2021-44228 + # 1.3.1 (2020-08-15) ## Added - Add the function of sending an error report. -## Changed +## changed - Update gradle to 6.6. - Fix to use the latest library. diff --git a/server/build.gradle.kts b/server/build.gradle.kts index fe9bb2b59..dc92e76e1 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } val group = "io.github.mopemope" -var serverVersion = "1.3.1" +var serverVersion = "1.3.2" var buildVersion = "release" val gitFile = File("../.git") @@ -35,7 +35,7 @@ val junitVersion = "5.8.2" val gradleVersion = "7.3.3" val log4jVersion = "2.17.1" val xodusVersion = "1.3.232" -val opencensusVersion = "0.29.0" +val opencensusVersion = "0.30.0" base { archivesBaseName = applicationName @@ -61,8 +61,8 @@ dependencies { implementation("org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion") implementation("commons-cli:commons-cli:1.4") implementation("org.gradle:gradle-tooling-api:$gradleVersion") - implementation("com.google.guava:guava:30.1.1-jre") - implementation("org.ow2.asm:asm:9.1") + implementation("com.google.guava:guava:31.0.1-jre") + implementation("org.ow2.asm:asm:9.2") implementation("com.typesafe:config:1.4.1") implementation("org.atteo:evo-inflector:1.3") diff --git a/server/src/main/java/meghanada/Main.java b/server/src/main/java/meghanada/Main.java index 8993d4416..081d48a31 100644 --- a/server/src/main/java/meghanada/Main.java +++ b/server/src/main/java/meghanada/Main.java @@ -33,7 +33,7 @@ public class Main { - public static final String VERSION = "1.3.1"; + public static final String VERSION = "1.3.2"; private static final Logger log = LogManager.getLogger(Main.class); private static String version; diff --git a/server/src/test/java/meghanada/completion/JavaCompletionTest.java b/server/src/test/java/meghanada/completion/JavaCompletionTest.java index 508306aa5..895b09689 100644 --- a/server/src/test/java/meghanada/completion/JavaCompletionTest.java +++ b/server/src/test/java/meghanada/completion/JavaCompletionTest.java @@ -89,7 +89,7 @@ public void testCompletion04() throws Exception { final Collection units = timeIt(() -> completion.completionAt(file, 8, 9, "@Test")); units.forEach(a -> log.info(a.getDeclaration())); - assertEquals(9, units.size()); + assertEquals(10, units.size()); // assertEquals(6, units.size()); }