fix compatibility with 2024-03

nbauma109 · Apr 13, 2024 · 7f1342c · 7f1342c
1 parent 63ae5bb
commit 7f1342c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/org.sf.feeling.decompiler.feature/feature.xml b/org.sf.feeling.decompiler.feature/feature.xml
@@ -36,14 +36,13 @@
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.search"/>
       <import plugin="org.eclipse.help.base"/>
-      <import plugin="org.eclipse.core.runtime" version="3.14.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.13.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.workbench" version="3.111.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.core" version="3.14.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.debug" version="3.11.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.expressions" version="3.6.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.7.100" match="greaterOrEqual"/>
-      <import plugin="org.apache.commons.codec" version="1.9.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.31.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.20.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.workbench" version="3.131.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.core" version="3.37.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.debug" version="3.21.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.expressions" version="3.9.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.10.300" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/org.sf.feeling.decompiler.source.attach/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.source.attach/META-INF/MANIFEST.MF
@@ -18,8 +18,7 @@ Require-Bundle: org.eclipse.ui,
  org.apache.ant,
  org.eclipse.jgit;resolution:=optional,
  com.jcraft.jsch;resolution:=optional,
- org.eclipse.m2e.jdt;resolution:=optional,
- org.apache.commons.io
+ org.eclipse.m2e.jdt;resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: ECD Project Team
@@ -52,6 +51,7 @@ Bundle-ClassPath: lib/cvsclient-20060125.jar,
  lib/jaxb-impl-2.3.8.jar,
  lib/jaxb-runtime-2.3.3.jar,
  lib/activation-1.1.1.jar,
+ lib/commons-io-2.16.0.jar,
  .
 Export-Package: org.sf.feeling.decompiler.source.attach,
  org.sf.feeling.decompiler.source.attach.attacher,

diff --git a/org.sf.feeling.decompiler.source.attach/build.properties b/org.sf.feeling.decompiler.source.attach/build.properties
@@ -5,6 +5,7 @@ bin.includes = META-INF/,\
                plugin.xml,\
                lib/,\
                plugin.properties,\
+               lib/commons-io-2.16.0.jar,\
                lib/nexus-indexer-lucene-model-2.14.20-02.jar,\
                lib/jaxb-api-2.3.1.jar,\
                lib/activation-1.1.1.jar,\

diff --git a/org.sf.feeling.decompiler.source.attach/pom.xml b/org.sf.feeling.decompiler.source.attach/pom.xml
@@ -200,6 +200,12 @@
 									<overWrite>true</overWrite>
 									<outputDirectory>lib</outputDirectory>
 								</artifactItem>
+								<artifactItem>
+									<groupId>commons-io</groupId>
+									<artifactId>commons-io</artifactId>
+									<overWrite>true</overWrite>
+									<outputDirectory>lib</outputDirectory>
+								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>
@@ -326,6 +332,10 @@
 			<groupId>org.sonatype.nexus.plugins</groupId>
 			<artifactId>nexus-restlet1x-model</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/org.sf.feeling.decompiler/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler/META-INF/MANIFEST.MF
@@ -31,8 +31,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.search,
  org.eclipse.core.filesystem,
  org.eclipse.equinox.p2.metadata;resolution:=optional,
- org.eclipse.help.base,
- org.apache.commons.codec
+ org.eclipse.help.base
 Bundle-Vendor: ECD Project Team
 Bundle-Version: 2024.3.0
 Bundle-ManifestVersion: 2

diff --git a/org.sf.feeling.decompiler/src/org/sf/feeling/decompiler/editor/DecompilerSourceMapper.java b/org.sf.feeling.decompiler/src/org/sf/feeling/decompiler/editor/DecompilerSourceMapper.java
@@ -42,7 +42,7 @@ public abstract class DecompilerSourceMapper extends SourceMapper {
 
 	protected boolean isAttachedSource;
 
-	public DecompilerSourceMapper(IPath sourcePath, String rootPath, Map options) {
+	protected DecompilerSourceMapper(IPath sourcePath, String rootPath, Map options) {
 		super(sourcePath, rootPath, options);
 	}
 
@@ -58,7 +58,7 @@ public char[] findSource(IType type) throws JavaModelException {
 		}
 		IBinaryType info = null;
 
-		info = (IBinaryType) declType.getElementInfo();
+		info = (IBinaryType) declType.getElementInfo(null);
 
 		if (info == null) {
 			return null;