Skip to content

Commit 1c62d5a

Browse files
sschulz92fgdrf
sschulz92
and
fgdrf
authored
[HK] Remove JNA dependency (#481)
* [HK] Remove JNA from libs module & load it from Eclipse Orbit repository see Eclipse CQ#15644 Change-Id: Idceead6824ae09a9101a2d5b1ef0d792b0898794 Signed-off-by: Sebastian Schulz <[email protected]> Co-authored-by: Frank Gasdorf <[email protected]>
1 parent bf5fef6 commit 1c62d5a

File tree

12 files changed

+271
-266
lines changed

12 files changed

+271
-266
lines changed

‎extras/org.locationtech.udig.target/org.locationtech.udig.target.target‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@
112112
<unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/>
113113
<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
114114
<unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
115+
<unit id="com.sun.jna" version="4.5.1.v20190425-1842"/>
116+
<unit id="com.sun.jna.platform" version="4.5.1.v20190425-1842"/>
115117
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/>
116118
</location>
117119
</locations>

‎features/org.locationtech.udig_base-feature/feature.xml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -722,12 +722,26 @@ If you add a depenedncy on any aspect of &quot;org.eclipse.*&quot; then please a
722722
install-size="0"
723723
version="0.0.0"
724724
unpack="false"/>
725-
725+
726726
<plugin
727727
id="org.apache.commons.codec"
728728
download-size="0"
729729
install-size="0"
730730
version="0.0.0"
731-
unpack="false"/>
731+
unpack="false"/>
732+
733+
<plugin
734+
id="com.sun.jna"
735+
download-size="0"
736+
install-size="0"
737+
version="0.0.0"
738+
unpack="false"/>
739+
740+
<plugin
741+
id="com.sun.jna.platform"
742+
download-size="0"
743+
install-size="0"
744+
version="0.0.0"
745+
unpack="false"/>
732746

733747
</feature>

‎plugins/org.locationtech.udig.libs.netcdf/.classpath‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,45 @@
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="lib" path="lib/aws-java-sdk-core-1.11.236.jar"/>
6-
<classpathentry kind="lib" path="lib/aws-java-sdk-kms-1.11.236.jar"/>
7-
<classpathentry kind="lib" path="lib/aws-java-sdk-s3-1.11.236.jar"/>
8-
<classpathentry kind="lib" path="lib/bufr-4.6.11.jar"/>
9-
<classpathentry kind="lib" path="lib/c3p0-0.9.1.1.jar"/>
10-
<classpathentry kind="lib" path="lib/cdm-4.6.11.jar"/>
11-
<classpathentry kind="lib" path="lib/commons-cli-1.4.jar"/>
12-
<classpathentry kind="lib" path="lib/commons-codec-1.2.jar"/>
13-
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
14-
<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
15-
<classpathentry kind="lib" path="lib/gt-netcdf-22.1.jar"/>
16-
<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
17-
<classpathentry kind="lib" path="lib/httpclient-4.5.1.jar"/>
18-
<classpathentry kind="lib" path="lib/httpcore-4.4.4.jar"/>
19-
<classpathentry kind="lib" path="lib/httpmime-4.5.1.jar"/>
20-
<classpathentry kind="lib" path="lib/httpservices-4.6.11.jar"/>
21-
<classpathentry kind="lib" path="lib/imageio-ext-netcdf-1.3.2.jar"/>
22-
<classpathentry kind="lib" path="lib/imageio-ext-netcdf-core-1.3.2.jar"/>
23-
<classpathentry kind="lib" path="lib/imageio-ext-streams-1.3.2.jar"/>
24-
<classpathentry kind="lib" path="lib/ion-java-1.0.2.jar"/>
25-
<classpathentry kind="lib" path="lib/jackson-annotations-2.7.9.jar"/>
26-
<classpathentry kind="lib" path="lib/jackson-core-2.7.9.jar"/>
27-
<classpathentry kind="lib" path="lib/jackson-databind-2.7.9.1.jar"/>
28-
<classpathentry kind="lib" path="lib/jackson-dataformat-cbor-2.6.7.jar"/>
29-
<classpathentry kind="lib" path="lib/jaxen-1.1.6.jar"/>
30-
<classpathentry kind="lib" path="lib/jcip-annotations-1.0.jar"/>
31-
<classpathentry kind="lib" path="lib/jcommander-1.35.jar"/>
32-
<classpathentry kind="lib" path="lib/jdom2-2.0.4.jar"/>
33-
<classpathentry kind="lib" path="lib/jmespath-java-1.11.236.jar"/>
34-
<classpathentry kind="lib" path="lib/jna-4.2.2.jar"/>
35-
<classpathentry kind="lib" path="lib/joda-time-2.8.1.jar"/>
36-
<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
37-
<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.6.4.jar"/>
38-
<classpathentry kind="lib" path="lib/netcdf4-4.6.11.jar"/>
39-
<classpathentry kind="lib" path="lib/netcdf-java-4.0.41.jar"/>
40-
<classpathentry kind="lib" path="lib/opendap-2.1.jar"/>
41-
<classpathentry kind="lib" path="lib/protobuf-java-3.5.0.jar"/>
42-
<classpathentry kind="lib" path="lib/quartz-2.2.0.jar"/>
43-
<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
44-
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.6.4.jar"/>
45-
<classpathentry kind="lib" path="lib/udunits-4.6.11.jar"/>
5+
<classpathentry exported="true" kind="lib" path="lib/aws-java-sdk-core-1.11.236.jar"/>
6+
<classpathentry exported="true" kind="lib" path="lib/aws-java-sdk-kms-1.11.236.jar"/>
7+
<classpathentry exported="true" kind="lib" path="lib/aws-java-sdk-s3-1.11.236.jar"/>
8+
<classpathentry exported="true" kind="lib" path="lib/bufr-4.6.11.jar"/>
9+
<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.1.jar"/>
10+
<classpathentry exported="true" kind="lib" path="lib/cdm-4.6.11.jar"/>
11+
<classpathentry exported="true" kind="lib" path="lib/commons-cli-1.4.jar"/>
12+
<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.2.jar"/>
13+
<classpathentry exported="true" kind="lib" path="lib/commons-httpclient-3.1.jar"/>
14+
<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
15+
<classpathentry exported="true" kind="lib" path="lib/gt-netcdf-22.1.jar"/>
16+
<classpathentry exported="true" kind="lib" path="lib/guava-18.0.jar"/>
17+
<classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.1.jar"/>
18+
<classpathentry exported="true" kind="lib" path="lib/httpcore-4.4.4.jar"/>
19+
<classpathentry exported="true" kind="lib" path="lib/httpmime-4.5.1.jar"/>
20+
<classpathentry exported="true" kind="lib" path="lib/httpservices-4.6.11.jar"/>
21+
<classpathentry exported="true" kind="lib" path="lib/imageio-ext-netcdf-1.3.2.jar"/>
22+
<classpathentry exported="true" kind="lib" path="lib/imageio-ext-netcdf-core-1.3.2.jar"/>
23+
<classpathentry exported="true" kind="lib" path="lib/imageio-ext-streams-1.3.2.jar"/>
24+
<classpathentry exported="true" kind="lib" path="lib/ion-java-1.0.2.jar"/>
25+
<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.7.9.jar"/>
26+
<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.7.9.jar"/>
27+
<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.7.9.1.jar"/>
28+
<classpathentry exported="true" kind="lib" path="lib/jackson-dataformat-cbor-2.6.7.jar"/>
29+
<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.6.jar"/>
30+
<classpathentry exported="true" kind="lib" path="lib/jcip-annotations-1.0.jar"/>
31+
<classpathentry exported="true" kind="lib" path="lib/jcommander-1.35.jar"/>
32+
<classpathentry exported="true" kind="lib" path="lib/jdom2-2.0.4.jar"/>
33+
<classpathentry exported="true" kind="lib" path="lib/jmespath-java-1.11.236.jar"/>
34+
<classpathentry exported="true" kind="lib" path="lib/joda-time-2.8.1.jar"/>
35+
<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.16.jar"/>
36+
<classpathentry exported="true" kind="lib" path="lib/log4j-over-slf4j-1.6.4.jar"/>
37+
<classpathentry exported="true" kind="lib" path="lib/netcdf4-4.6.11.jar"/>
38+
<classpathentry exported="true" kind="lib" path="lib/netcdf-java-4.0.41.jar"/>
39+
<classpathentry exported="true" kind="lib" path="lib/opendap-2.1.jar"/>
40+
<classpathentry exported="true" kind="lib" path="lib/protobuf-java-3.5.0.jar"/>
41+
<classpathentry exported="true" kind="lib" path="lib/quartz-2.2.0.jar"/>
42+
<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
43+
<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.6.4.jar"/>
44+
<classpathentry exported="true" kind="lib" path="lib/udunits-4.6.11.jar"/>
45+
<classpathentry kind="output" path="bin"/>
4646
</classpath>

‎plugins/org.locationtech.udig.libs.netcdf/META-INF/MANIFEST.MF‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ Bundle-ClassPath: lib/aws-java-sdk-core-1.11.236.jar,
4343
lib/jcommander-1.35.jar,
4444
lib/jdom2-2.0.4.jar,
4545
lib/jmespath-java-1.11.236.jar,
46-
lib/jna-4.2.2.jar,
4746
lib/joda-time-2.8.1.jar,
4847
lib/log4j-1.2.16.jar,
4948
lib/log4j-over-slf4j-1.6.4.jar,
@@ -55,7 +54,12 @@ Bundle-ClassPath: lib/aws-java-sdk-core-1.11.236.jar,
5554
lib/slf4j-api-1.7.22.jar,
5655
lib/slf4j-log4j12-1.6.4.jar,
5756
lib/udunits-4.6.11.jar
58-
Import-Package: javax.media.jai,
57+
Import-Package: com.sun.jna;version="4.2.0",
58+
com.sun.jna.platform;version="4.2.0",
59+
com.sun.jna.platform.dnd;version="4.2.0",
60+
com.sun.jna.ptr;version="4.2.0",
61+
com.sun.jna.win32;version="4.2.0",
62+
javax.media.jai,
5963
javax.media.jai.iterator,
6064
javax.media.jai.operator,
6165
javax.media.jai.registry,

‎plugins/org.locationtech.udig.libs.netcdf/build.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ bin.includes = META-INF/,\
2828
lib/jcommander-1.35.jar,\
2929
lib/jdom2-2.0.4.jar,\
3030
lib/jmespath-java-1.11.236.jar,\
31-
lib/jna-4.2.2.jar,\
3231
lib/joda-time-2.8.1.jar,\
3332
lib/log4j-1.2.16.jar,\
3433
lib/log4j-over-slf4j-1.6.4.jar,\

0 commit comments

Comments
 (0)