Skip to content

Commit

Permalink
Update to JSoup 1.16.2
Browse files Browse the repository at this point in the history
Main part of the patch is making JSoup being used as OSGi bundle rather
than bundled in jdt.ls.core bundle as this is more straightforward and
observable way to declare and inspect dependencies compared to opening a
jar and look into its lib subfolder.
Version 1.14.2 used till now is vulnerable to
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-36033 .
  • Loading branch information
akurtakov committed Nov 15, 2023
1 parent a802ab5 commit e0ba1fc
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
1 change: 0 additions & 1 deletion org.eclipse.jdt.ls.core/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/jsoup-1.14.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/remark-1.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/java-decompiler-engine-231.9011.34.jar"/>
<classpathentry kind="src" path="src/"/>
Expand Down
6 changes: 3 additions & 3 deletions org.eclipse.jdt.ls.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.xtext.xbase.lib,
org.eclipse.core.filesystem;bundle-version="1.7.0",
org.eclipse.jdt.apt.pluggable.core;bundle-version="1.2.0";resolution:=optional,
org.eclipse.m2e.apt.core;bundle-version="1.3.0";resolution:=optional
org.eclipse.m2e.apt.core;bundle-version="1.3.0";resolution:=optional,
org.jsoup
Export-Package: org.eclipse.jdt.ls.core.contentassist;x-friends:="org.eclipse.jdt.ls.tests",
org.eclipse.jdt.ls.core.internal;x-friends:="org.eclipse.jdt.ls.tests,org.eclipse.jdt.ls.tests.syntaxserver",
org.eclipse.jdt.ls.core.internal.cleanup;x-friends:="org.eclipse.jdt.ls.tests",
Expand Down Expand Up @@ -60,8 +61,7 @@ Export-Package: org.eclipse.jdt.ls.core.contentassist;x-friends:="org.eclipse.jd
org.eclipse.jdt.ls.internal.gradle.checksums;x-friends:="org.eclipse.jdt.ls.tests",
org.eclipse.lsp4j.extended;x-friends:="org.eclipse.jdt.ls.tests",
org.eclipse.lsp4j.legacy.typeHierarchy;x-friends:="org.eclipse.jdt.ls.tests"
Bundle-ClassPath: lib/jsoup-1.14.2.jar,
lib/remark-1.2.0.jar,
Bundle-ClassPath: lib/remark-1.2.0.jar,
lib/java-decompiler-engine-231.9011.34.jar,
.
Bundle-Vendor: %Bundle-Vendor
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.jdt.ls.core/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ output.. = target/classes
bin.includes = META-INF/,\
.,\
plugin.xml,\
lib/jsoup-1.14.2.jar,\
lib/remark-1.2.0.jar,\
lib/java-decompiler-engine-231.9011.34.jar,\
lifecycle-mapping-metadata.xml,\
Expand Down
5 changes: 0 additions & 5 deletions org.eclipse.jdt.ls.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
<artifactId>remark</artifactId>
<version>1.2.0</version>
</artifactItem>
<artifactItem>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.14.2</version>
</artifactItem>
<artifactItem>
<groupId>com.jetbrains.intellij.java</groupId>
<artifactId>java-decompiler-engine</artifactId>
Expand Down
8 changes: 7 additions & 1 deletion org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target includeMode="feature" name="Java Language Server Target Definition" sequenceNumber="113">
<target includeMode="feature" name="Java Language Server Target Definition" sequenceNumber="114">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.buildship.feature.group" version="0.0.0"/>
Expand Down Expand Up @@ -47,6 +47,12 @@
<version>3.8.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.16.2</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" label="Logging" missingManifest="generate" type="Maven">
Expand Down

0 comments on commit e0ba1fc

Please sign in to comment.