Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build path issues due to conflict with Tycho and OSGI builds #384

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix build path issues due to conflict with Tycho and OSGI builds #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
921c8e8
Fix build path issues due to conflict with Tycho and OSGI builds
breedloj Feb 25, 2025
e4313f5
Add tst to sources
breedloj Feb 26, 2025
f5d7c09
Remove explicit src mapping to tst directory
breedloj Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugin/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion plugin/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ output.. = target/classes
bin.includes = plugin.xml,\
META-INF/,\
icons/,\
target/classes/,\
webview/build/,\
target/dependency/,\
codegen-resources/
Expand Down
2 changes: 1 addition & 1 deletion plugin/build/syncDependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 16 additions & 1 deletion plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<aws.java.sdk.version>2.28.26</aws.java.sdk.version>
<node.version>v20.9.0</node.version>
<npm.version>10.1.0</npm.version>
<jackson.version>2.17.2</jackson.version>
<jackson.version>2.17.3</jackson.version>
<maven.compiler.release>17</maven.compiler.release>
<junit.version>5.11.3</junit.version>
</properties>
Expand Down Expand Up @@ -137,6 +137,21 @@
<pomDependencies>consider</pomDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<additionalFileSets>
<fileSet>
<directory>${project.build.directory}/classes/</directory>
<includes>
<include>**/*</include>
</includes>
</fileSet>
</additionalFileSets>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.8.0</version>
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<packaging>pom</packaging>

<properties>
<tycho.version>4.0.8</tycho.version>
<tycho.version>4.0.11</tycho.version>
<maven.resource.version>3.3.1</maven.resource.version>
</properties>

Expand All @@ -27,7 +27,6 @@
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2024-06</url>
</repository>

</repositories>

<build>
Expand Down
Loading