Skip to content

Commit

Permalink
trying to fix dependency related warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jan committed Dec 10, 2024
1 parent 158797c commit c8b6c95
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 74 deletions.
1 change: 0 additions & 1 deletion io.sloeber.autoBuild.test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Require-Bundle: io.sloeber.autoBuild,
junit-jupiter-api;bundle-version="5.0.0",
junit-jupiter-params;bundle-version="5.0.0",
org.eclipse.core.resources,
org.apache.log4j;bundle-version="1.2.24",
org.eclipse.cdt.core;bundle-version="7.4.200",
org.eclipse.osgi,
org.eclipse.core.jobs,
Expand Down
5 changes: 2 additions & 3 deletions io.sloeber.core/.classpath
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/jmdns-3.5.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jssc-2.9.4.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="bin" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/jsch-0.1.55.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jssc-2.9.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jmdns-3.5.7.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
Expand Down
4 changes: 2 additions & 2 deletions io.sloeber.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Bundle-Vendor: Sloeber.io
Bundle-ActivationPolicy: lazy
Bundle-Activator: io.sloeber.core.Activator
Bundle-ClassPath: .,
lib/jsch-0.1.55.jar,
lib/jssc-2.9.4.jar,
lib/jmdns-3.5.7.jar
Require-Bundle:
Expand All @@ -28,7 +27,8 @@ Require-Bundle:
org.eclipse.ui.intro,
io.sloeber.autoBuild,
org.eclipse.cdt.make.core,
org.apache.commons.lang3;bundle-version="3.14.0"
org.apache.commons.lang3;bundle-version="3.14.0",
com.jcraft.jsch
Export-Package: cc.arduino.packages;x-internal:=true,
cc.arduino.packages.discoverers;x-internal:=true,
cc.arduino.packages.ssh;x-internal:=true,
Expand Down
7 changes: 3 additions & 4 deletions io.sloeber.core/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ bin.includes = .,\
config/,\
OSGI-INF/,\
src/io/sloeber/core/templates/sketch.ino,\
lib/jsch-0.1.55.jar,\
OSGI-INF/l10n/bundle.properties,\
lib/jssc-2.9.4.jar,\
lib/jmdns-3.5.7.jar,\
icons/,\
launch/
launch/,\
lib/jssc-2.9.4.jar,\
lib/jmdns-3.5.7.jar
jars.compile.order = .
src.includes = icons/
Binary file removed io.sloeber.core/lib/jsch-0.1.55.jar
Binary file not shown.
20 changes: 16 additions & 4 deletions io.sloeber.product/sloeber.target
Original file line number Diff line number Diff line change
Expand Up @@ -75,25 +75,37 @@
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>1.5.6-3</version>
<version>1.5.6-8</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.0</version>
<version>2.18.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.26.1</version>
<version>1.27.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.19.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.19.0</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
91 changes: 44 additions & 47 deletions io.sloeber.tests/BuildTests Sloeber.launch

Large diffs are not rendered by default.

24 changes: 11 additions & 13 deletions io.sloeber.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,26 @@ Bundle-SymbolicName: io.sloeber.tests;singleton:=true
Bundle-Version: 5.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Vendor: Sloeber.io
Require-Bundle: io.sloeber.core,
io.sloeber.ui,
org.eclipse.cdt.core,
org.eclipse.core.runtime,
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
junit-jupiter-params;bundle-version="5.10.2",
junit-jupiter-api;bundle-version="5.10.2",
org.apache.log4j,
org.eclipse.swt,
org.eclipse.cdt.core,
io.sloeber.autoBuild,
org.opentest4j,
junit-platform-suite-api
io.sloeber.core,
io.sloeber.ui,
junit-platform-suite-api,
junit-jupiter-params,
junit-jupiter-api,
org.apache.commons.commons-io,
org.apache.logging.log4j.api;bundle-version="2.19.0",
org.apache.logging.log4j.core;bundle-version="2.19.0"
Bundle-ActivationPolicy: lazy
Import-Package: io.sloeber.ui,
io.sloeber.ui.monitor,
io.sloeber.autoBuild.api,
org.apache.commons.io
Automatic-Module-Name: io.sloeber.tests
Export-Package: io.sloeber.core;x-internal:=true,
io.sloeber.junit;x-internal:=true,
io.sloeber.providers;x-internal:=true,
templates.CreateAndCompileTest;x-internal:=true,
Export-Package: templates.CreateAndCompileTest;x-internal:=true,
templates.are_defines_found;x-internal:=true,
templates.basic.ino;x-internal:=true,
templates.defines_and_includes;x-internal:=true,
Expand Down

0 comments on commit c8b6c95

Please sign in to comment.