diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF index 9ff16a34..d17c452f 100644 --- a/plugin/META-INF/MANIFEST.MF +++ b/plugin/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", org.apache.commons.logging;bundle-version="1.2.0", slf4j.api;bundle-version="2.0.13", org.apache.commons.lang3;bundle-version="3.14.0" -Bundle-Classpath: target/classes/, +Bundle-Classpath: ., target/dependency/annotations.jar, target/dependency/apache-client.jar, target/dependency/auth.jar, diff --git a/plugin/build.properties b/plugin/build.properties index 0668b00f..cb3ad8c7 100644 --- a/plugin/build.properties +++ b/plugin/build.properties @@ -3,7 +3,6 @@ output.. = target/classes bin.includes = plugin.xml,\ META-INF/,\ icons/,\ - target/classes/,\ webview/build/,\ target/dependency/,\ codegen-resources/ diff --git a/plugin/build/syncDependencies.sh b/plugin/build/syncDependencies.sh index d9a46cc4..2e6ce98a 100755 --- a/plugin/build/syncDependencies.sh +++ b/plugin/build/syncDependencies.sh @@ -19,7 +19,7 @@ if [ ! -f "$manifest_file" ]; then fi # Initialize the Bundle-Classpath entry -bundle_classpath="Bundle-Classpath: target/classes/,\n" +bundle_classpath="Bundle-Classpath: .,\n" # Loop through the JAR files in the dependency directory for jar in "$dependency_dir"/*.jar; do diff --git a/plugin/pom.xml b/plugin/pom.xml index 5ec2d85a..846c3f36 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -17,7 +17,7 @@ 2.28.26 v20.9.0 10.1.0 - 2.17.2 + 2.17.3 17 5.11.3 @@ -137,6 +137,21 @@ consider + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + + ${project.build.directory}/classes/ + + **/* + + + + + maven-dependency-plugin 3.8.0 diff --git a/pom.xml b/pom.xml index 0190ac67..c1ac2fe7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom - 4.0.8 + 4.0.11 3.3.1 @@ -27,7 +27,6 @@ p2 https://download.eclipse.org/releases/2024-06 -