Skip to content

Commit c8b6c95

Browse files
author
jan
committed
trying to fix dependency related warnings
1 parent 158797c commit c8b6c95

File tree

8 files changed

+78
-74
lines changed

8 files changed

+78
-74
lines changed

io.sloeber.autoBuild.test/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Require-Bundle: io.sloeber.autoBuild,
77
junit-jupiter-api;bundle-version="5.0.0",
88
junit-jupiter-params;bundle-version="5.0.0",
99
org.eclipse.core.resources,
10-
org.apache.log4j;bundle-version="1.2.24",
1110
org.eclipse.cdt.core;bundle-version="7.4.200",
1211
org.eclipse.osgi,
1312
org.eclipse.core.jobs,

io.sloeber.core/.classpath

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3+
<classpathentry exported="true" kind="lib" path="lib/jmdns-3.5.7.jar"/>
4+
<classpathentry exported="true" kind="lib" path="lib/jssc-2.9.4.jar"/>
35
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
46
<classpathentry kind="src" output="bin" path="src">
57
<attributes>
68
<attribute name="optional" value="true"/>
79
<attribute name="maven.pomderived" value="true"/>
810
</attributes>
911
</classpathentry>
10-
<classpathentry exported="true" kind="lib" path="lib/jsch-0.1.55.jar"/>
11-
<classpathentry exported="true" kind="lib" path="lib/jssc-2.9.4.jar"/>
12-
<classpathentry exported="true" kind="lib" path="lib/jmdns-3.5.7.jar"/>
1312
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
1413
<attributes>
1514
<attribute name="maven.pomderived" value="true"/>

io.sloeber.core/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Bundle-Vendor: Sloeber.io
88
Bundle-ActivationPolicy: lazy
99
Bundle-Activator: io.sloeber.core.Activator
1010
Bundle-ClassPath: .,
11-
lib/jsch-0.1.55.jar,
1211
lib/jssc-2.9.4.jar,
1312
lib/jmdns-3.5.7.jar
1413
Require-Bundle:
@@ -28,7 +27,8 @@ Require-Bundle:
2827
org.eclipse.ui.intro,
2928
io.sloeber.autoBuild,
3029
org.eclipse.cdt.make.core,
31-
org.apache.commons.lang3;bundle-version="3.14.0"
30+
org.apache.commons.lang3;bundle-version="3.14.0",
31+
com.jcraft.jsch
3232
Export-Package: cc.arduino.packages;x-internal:=true,
3333
cc.arduino.packages.discoverers;x-internal:=true,
3434
cc.arduino.packages.ssh;x-internal:=true,

io.sloeber.core/build.properties

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ bin.includes = .,\
99
config/,\
1010
OSGI-INF/,\
1111
src/io/sloeber/core/templates/sketch.ino,\
12-
lib/jsch-0.1.55.jar,\
1312
OSGI-INF/l10n/bundle.properties,\
14-
lib/jssc-2.9.4.jar,\
15-
lib/jmdns-3.5.7.jar,\
1613
icons/,\
17-
launch/
14+
launch/,\
15+
lib/jssc-2.9.4.jar,\
16+
lib/jmdns-3.5.7.jar
1817
jars.compile.order = .
1918
src.includes = icons/

io.sloeber.core/lib/jsch-0.1.55.jar

-274 KB
Binary file not shown.

io.sloeber.product/sloeber.target

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,37 @@
7575
<dependency>
7676
<groupId>com.github.luben</groupId>
7777
<artifactId>zstd-jni</artifactId>
78-
<version>1.5.6-3</version>
78+
<version>1.5.6-8</version>
7979
<type>jar</type>
8080
</dependency>
8181
<dependency>
8282
<groupId>com.google.code.gson</groupId>
8383
<artifactId>gson</artifactId>
84-
<version>2.10.1</version>
84+
<version>2.11.0</version>
8585
<type>jar</type>
8686
</dependency>
8787
<dependency>
8888
<groupId>commons-io</groupId>
8989
<artifactId>commons-io</artifactId>
90-
<version>2.15.0</version>
90+
<version>2.18.0</version>
9191
<type>jar</type>
9292
</dependency>
9393
<dependency>
9494
<groupId>org.apache.commons</groupId>
9595
<artifactId>commons-compress</artifactId>
96-
<version>1.26.1</version>
96+
<version>1.27.1</version>
97+
<type>jar</type>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.apache.logging.log4j</groupId>
101+
<artifactId>log4j-api</artifactId>
102+
<version>2.19.0</version>
103+
<type>jar</type>
104+
</dependency>
105+
<dependency>
106+
<groupId>org.apache.logging.log4j</groupId>
107+
<artifactId>log4j-core</artifactId>
108+
<version>2.19.0</version>
97109
<type>jar</type>
98110
</dependency>
99111
</dependencies>

io.sloeber.tests/BuildTests Sloeber.launch

Lines changed: 44 additions & 47 deletions
Large diffs are not rendered by default.

io.sloeber.tests/META-INF/MANIFEST.MF

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,26 @@ Bundle-SymbolicName: io.sloeber.tests;singleton:=true
55
Bundle-Version: 5.0.0.qualifier
66
Bundle-RequiredExecutionEnvironment: JavaSE-17
77
Bundle-Vendor: Sloeber.io
8-
Require-Bundle: io.sloeber.core,
9-
io.sloeber.ui,
10-
org.eclipse.cdt.core,
11-
org.eclipse.core.runtime,
8+
Require-Bundle: org.eclipse.core.runtime,
129
org.eclipse.core.resources,
13-
junit-jupiter-params;bundle-version="5.10.2",
14-
junit-jupiter-api;bundle-version="5.10.2",
15-
org.apache.log4j,
1610
org.eclipse.swt,
11+
org.eclipse.cdt.core,
1712
io.sloeber.autoBuild,
18-
org.opentest4j,
19-
junit-platform-suite-api
13+
io.sloeber.core,
14+
io.sloeber.ui,
15+
junit-platform-suite-api,
16+
junit-jupiter-params,
17+
junit-jupiter-api,
18+
org.apache.commons.commons-io,
19+
org.apache.logging.log4j.api;bundle-version="2.19.0",
20+
org.apache.logging.log4j.core;bundle-version="2.19.0"
2021
Bundle-ActivationPolicy: lazy
2122
Import-Package: io.sloeber.ui,
2223
io.sloeber.ui.monitor,
2324
io.sloeber.autoBuild.api,
2425
org.apache.commons.io
2526
Automatic-Module-Name: io.sloeber.tests
26-
Export-Package: io.sloeber.core;x-internal:=true,
27-
io.sloeber.junit;x-internal:=true,
28-
io.sloeber.providers;x-internal:=true,
29-
templates.CreateAndCompileTest;x-internal:=true,
27+
Export-Package: templates.CreateAndCompileTest;x-internal:=true,
3028
templates.are_defines_found;x-internal:=true,
3129
templates.basic.ino;x-internal:=true,
3230
templates.defines_and_includes;x-internal:=true,

0 commit comments

Comments
 (0)