Skip to content

Commit 4f13e12

Browse files
authored
Merge branch 'master' into dependabot/maven/org.ow2.asm-asm-all-6.0_BETA
2 parents 161a6aa + 49b2887 commit 4f13e12

File tree

5 files changed

+29
-3
lines changed

5 files changed

+29
-3
lines changed

Apply spotless.launch

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
3+
<intAttribute key="M2_COLORS" value="0"/>
4+
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
5+
<stringAttribute key="M2_GOALS" value="spotless:apply"/>
6+
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
7+
<booleanAttribute key="M2_OFFLINE" value="true"/>
8+
<stringAttribute key="M2_PROFILES" value=""/>
9+
<listAttribute key="M2_PROPERTIES"/>
10+
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
11+
<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
12+
<intAttribute key="M2_THREADS" value="1"/>
13+
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
14+
<stringAttribute key="M2_USER_SETTINGS" value=""/>
15+
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>
16+
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
17+
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
18+
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
19+
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
20+
</listAttribute>
21+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
22+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
23+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
24+
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/ml}"/>
25+
</launchConfiguration>

com.ibm.wala.cast.python.ml/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<plugin>
6767
<groupId>org.apache.maven.plugins</groupId>
6868
<artifactId>maven-shade-plugin</artifactId>
69-
<version>3.4.1</version>
69+
<version>3.6.0</version>
7070
<configuration>
7171
<filters>
7272
<filter>

com.ibm.wala.cast.python.ml/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
ME=`realpath $0`
44
DIR=`dirname $ME`
55

6-
cat -u | tee -a /tmp/lsp.in.log | $JAVA_HOME/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,address=127.0.0.1:6660,server=y,suspend=n -jar $DIR/target/com.ibm.wala.cast.python.ml-0.6.0-SNAPSHOT.jar --mode stdio | tee -a /tmp/lsp.out.log
6+
cat -u | tee -a /tmp/lsp.in.log | $JAVA_HOME/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,address=127.0.0.1:6660,server=y,suspend=n -jar $DIR/target/com.ibm.wala.cast.python.ml-0.38.0-SNAPSHOT.jar --mode stdio | tee -a /tmp/lsp.out.log

com.ibm.wala.cast.python/source/com/ibm/wala/cast/python/util/Util.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public static String removeFileProtocolFromPath(String path) {
107107
* presented in the CAst.
108108
*/
109109
public static Collection<String> getNames(Collection<CAstAnnotation> annotations) {
110+
if (annotations == null) return emptyList();
110111
return annotations.stream().map(Util::getName).flatMap(Optional::stream).toList();
111112
}
112113

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
black==24.8.0
1+
black==24.10.0

0 commit comments

Comments
 (0)