Merge branch 'pr/draftcode/207'

Author: georgewfraser

dist/launch_linux.sh

@@ -9,5 +9,5 @@ JLINK_VM_OPTIONS="\
 --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
 --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
 DIR=`dirname $0`
-CLASSPATH_OPTIONS="-classpath $DIR/classpath/gson-2.8.5.jar:$DIR/classpath/protobuf-java-3.9.1.jar:$DIR/classpath/java-language-server.jar"
+CLASSPATH_OPTIONS="-classpath $DIR/classpath/gson-2.8.5.jar:$DIR/classpath/protobuf-java-3.19.3.jar:$DIR/classpath/java-language-server.jar"
 $DIR/linux/bin/java $JLINK_VM_OPTIONS $CLASSPATH_OPTIONS $@

dist/launch_mac.sh

@@ -9,5 +9,5 @@ JLINK_VM_OPTIONS="\
 --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
 --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
 DIR=`dirname $0`
-CLASSPATH_OPTIONS="-classpath $DIR/classpath/gson-2.8.5.jar:$DIR/classpath/protobuf-java-3.9.1.jar:$DIR/classpath/java-language-server.jar"
+CLASSPATH_OPTIONS="-classpath $DIR/classpath/gson-2.8.5.jar:$DIR/classpath/protobuf-java-3.19.3.jar:$DIR/classpath/java-language-server.jar"
 $DIR/mac/bin/java $JLINK_VM_OPTIONS $CLASSPATH_OPTIONS $@

dist/launch_windows.cmd

@@ -8,6 +8,6 @@ set JLINK_VM_OPTIONS=^
 --add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED ^
 --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED ^
 --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
-set CLASSPATH_OPTIONS=-classpath %~dp0/classpath/gson-2.8.5.jar;%~dp0/classpath/protobuf-java-3.9.1.jar;%~dp0/classpath/java-language-server.jar
+set CLASSPATH_OPTIONS=-classpath %~dp0/classpath/gson-2.8.5.jar;%~dp0/classpath/protobuf-java-3.19.3.jar;%~dp0/classpath/java-language-server.jar
 java %JLINK_VM_OPTIONS% %CLASSPATH_OPTIONS% %*
 

dist/launch_windows.sh

@@ -9,5 +9,5 @@ JLINK_VM_OPTIONS="\
 --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
 --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
 DIR=`dirname $0`
-CLASSPATH_OPTIONS="-classpath $DIR/classpath/gson-2.8.5.jar;$DIR/classpath/protobuf-java-3.9.1.jar;$DIR/classpath/java-language-server.jar"
+CLASSPATH_OPTIONS="-classpath $DIR/classpath/gson-2.8.5.jar;$DIR/classpath/protobuf-java-3.19.3.jar;$DIR/classpath/java-language-server.jar"
 $DIR/windows/bin/java $JLINK_VM_OPTIONS $CLASSPATH_OPTIONS $@

lib/extension.ts

@@ -349,7 +349,7 @@ function visualVmConfig(context: ExtensionContext): ServerOptions {
     const jars = [
         'gson-2.8.5.jar',
         'java-language-server.jar',
-        'protobuf-java-3.9.1.jar',
+        'protobuf-java-3.19.3.jar',
     ];
     const classpath = jars.map(jar => Path.resolve(context.extensionPath, "dist", "classpath", jar)).join(':');
     let args = [
@@ -484,4 +484,4 @@ function enableJavadocSymbols() {
 			}
 		]
 	});
-}
+}

pom.xml

@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>3.9.1</version>
+            <version>3.19.3</version>
         </dependency>
         <!-- Testing framework -->
         <dependency>

scripts/gen_proto.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 protoc -I=src/main/protobuf --java_out=src/main/java src/main/protobuf/build.proto
 protoc -I=src/main/protobuf --java_out=src/main/java src/main/protobuf/analysis.proto
+protoc -I=src/main/protobuf --java_out=src/main/java src/main/protobuf/analysis_v2.proto