fix bundle classpath and export packages

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'distribution'
 
 // Common configuration //
 allprojects {
- version='2.1.3'
+ version='2.1.5'
 }
 
 subprojects.each { subproject ->

org.jd.ide.eclipse.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
  id="org.jd.ide.eclipse.feature"
  label="JD-Eclipse Plug-in"
- version="2.1.3"
+ version="2.1.5"
  provider-name="Java Decompiler"
  plugin="org.jd.ide.eclipse.plugin">
 
@@ -84,7 +84,7 @@ Public License instead of this License. But first, please read
  id="org.jd.ide.eclipse.plugin"
  download-size="0"
  install-size="0"
- version="2.1.3"
+ version="2.1.5"
  unpack="false"/>
 
 </feature>

org.jd.ide.eclipse.plugin/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JD-Eclipse Plug-in
 Bundle-SymbolicName: org.jd.ide.eclipse.plugin;singleton:=true
-Bundle-Version: 2.1.3
+Bundle-Version: 2.1.5
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.editors,
@@ -15,12 +15,81 @@ Require-Bundle: org.eclipse.ui,
 Bundle-Vendor: Java Decompiler
 Bundle-Activator: org.jd.ide.eclipse.JavaDecompilerPlugin
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: /lib/jd-core-1.2.8.jar,
+Bundle-ClassPath: /lib/commons-io-2.11.0.jar,
+ /lib/bcel-6.5.0.jar,
  /lib/jd-util-1.1.6.jar,
+ /lib/jd-core-1.2.8.jar,
  .
-Export-Package: org.jd.core.v1,
+Export-Package: jd.core,
+ jd.core.model.instruction.bytecode,
+ jd.core.preferences,
+ jd.core.process.analyzer.instruction.bytecode.util,
+ jd.core.process.deserializer,
+ org.apache.bcel,
+ org.apache.bcel.classfile,
+ org.apache.bcel.generic,
+ org.apache.bcel.util,
+ org.apache.bcel.verifier,
+ org.apache.bcel.verifier.exc,
+ org.apache.bcel.verifier.statics,
+ org.apache.bcel.verifier.structurals,
+ org.apache.commons.io,
+ org.apache.commons.io.comparator,
+ org.apache.commons.io.file,
+ org.apache.commons.io.file.spi,
+ org.apache.commons.io.filefilter,
+ org.apache.commons.io.function,
+ org.apache.commons.io.input,
+ org.apache.commons.io.input.buffer,
+ org.apache.commons.io.monitor,
+ org.apache.commons.io.output,
+ org.apache.commons.io.serialization,
+ org.jd.core.v1,
+ org.jd.core.v1.api,
  org.jd.core.v1.api.loader,
  org.jd.core.v1.api.printer,
+ org.jd.core.v1.cfg,
+ org.jd.core.v1.loader,
+ org.jd.core.v1.model.classfile,
+ org.jd.core.v1.model.classfile.attribute,
+ org.jd.core.v1.model.classfile.constant,
+ org.jd.core.v1.model.fragment,
+ org.jd.core.v1.model.javafragment,
+ org.jd.core.v1.model.javasyntax,
+ org.jd.core.v1.model.javasyntax.declaration,
+ org.jd.core.v1.model.javasyntax.expression,
+ org.jd.core.v1.model.javasyntax.reference,
+ org.jd.core.v1.model.javasyntax.statement,
+ org.jd.core.v1.model.javasyntax.type,
+ org.jd.core.v1.model.message,
+ org.jd.core.v1.model.token,
+ org.jd.core.v1.printer,
+ org.jd.core.v1.service.converter.classfiletojavasyntax,
+ org.jd.core.v1.service.converter.classfiletojavasyntax.model.cfg,
+ org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration,
+ org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression,
+ org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.statement,
+ org.jd.core.v1.service.converter.classfiletojavasyntax.model.localvariable,
+ org.jd.core.v1.service.converter.classfiletojavasyntax.processor,
+ org.jd.core.v1.service.converter.classfiletojavasyntax.processor.block.api,
+ org.jd.core.v1.service.converter.classfiletojavasyntax.processor.block.impl,
+ org.jd.core.v1.service.converter.classfiletojavasyntax.util,
+ org.jd.core.v1.service.converter.classfiletojavasyntax.util.cfg,
+ org.jd.core.v1.service.converter.classfiletojavasyntax.visitor,
+ org.jd.core.v1.service.deserializer.classfile,
+ org.jd.core.v1.service.deserializer.classfile.attribute,
+ org.jd.core.v1.service.fragmenter.javasyntaxtojavafragment,
+ org.jd.core.v1.service.fragmenter.javasyntaxtojavafragment.util,
+ org.jd.core.v1.service.fragmenter.javasyntaxtojavafragment.visitor,
+ org.jd.core.v1.service.layouter,
+ org.jd.core.v1.service.layouter.model,
+ org.jd.core.v1.service.layouter.util,
+ org.jd.core.v1.service.layouter.visitor,
+ org.jd.core.v1.service.tokenizer.javafragmenttotoken,
+ org.jd.core.v1.service.tokenizer.javafragmenttotoken.visitor,
+ org.jd.core.v1.service.writer,
+ org.jd.core.v1.service.writer.visitor,
+ org.jd.core.v1.util,
  org.jd.ide.eclipse,
  org.jd.ide.eclipse.editors,
  org.jd.ide.eclipse.preferences,

org.jd.ide.eclipse.plugin/build.properties

@@ -2,8 +2,8 @@ bin.includes = META-INF/,\
  plugin.xml,\
  icons/,\
  about.ini,\
- lib/jd-core-1.2.8.jar,\
  lib/jd-util-1.1.6.jar,\
+ lib/jd-core-1.2.8.jar,\
  .
 source.. = src/
 jars.compile.order = .

org.jd.ide.eclipse.plugin/src/org/jd/ide/eclipse/JavaDecompilerPlugin.java

@@ -31,7 +31,7 @@ public class JavaDecompilerPlugin extends AbstractUIPlugin {
  private static final String EDITOR_ID = PLUGIN_ID + ".editors.JDClassFileEditor"; 
 
  // Versions
- public static final String VERSION_JD_ECLIPSE = "2.1.3";
+ public static final String VERSION_JD_ECLIPSE = "2.1.5";
  public static final String VERSION_JD_CORE = "1.2.8";
 
  // Preferences

org.jd.ide.eclipse.site/site.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
- <feature url="features/org.jd.ide.eclipse.feature_2.1.3.jar" id="org.jd.ide.eclipse.feature" version="2.1.3">
+ <feature url="features/org.jd.ide.eclipse.feature_2.1.5.jar" id="org.jd.ide.eclipse.feature" version="2.1.5">
  <category name="JD-Eclipse"/>
  </feature>
  <category-def name="JD-Eclipse" label="Java Decompiler Eclipse Plug-in"/>