X Tutup
Skip to content

Commit 48f59c5

Browse files
ochafikochafik
committed
JavaCL: make the javacl artifact OSGi-enabled (no more java-osgi artifact)
1 parent 9623d48 commit 48f59c5

File tree

5 files changed

+55
-134
lines changed

5 files changed

+55
-134
lines changed

‎JavaCL-OSGi/pom.xml‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎JavaCL-Shaded/pom.xml‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎JavaCL/pom.xml‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,16 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
2222
</parent>
2323

2424
<dependencies>
25-
2625
<dependency>
2726
<groupId>com.nativelibs4java</groupId>
2827
<artifactId>javacl-core</artifactId>
2928
</dependency>
29+
<dependency>
30+
<groupId>org.osgi</groupId>
31+
<artifactId>org.osgi.core</artifactId>
32+
<version>4.3.0</version>
33+
<scope>provided</scope>
34+
</dependency>
3035
<dependency>
3136
<groupId>org.apache.commons</groupId>
3237
<artifactId>commons-math</artifactId>
@@ -53,6 +58,55 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
5358
<artifactId>maven-shade-plugin</artifactId>
5459
</plugin>
5560

61+
<plugin>
62+
<groupId>org.apache.felix</groupId>
63+
<artifactId>maven-bundle-plugin</artifactId>
64+
<version>2.3.7</version>
65+
<extensions>true</extensions>
66+
<configuration>
67+
<instructions>
68+
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
69+
<Bundle-Name>${pom.name}</Bundle-Name>
70+
<Bundle-Version>${pom.version}</Bundle-Version>
71+
<Bundle-Activator>
72+
com.nativelibs4java.opencl.OSGiBundleActivator
73+
</Bundle-Activator>
74+
<Private-Package>
75+
org.bridj.relocated.*
76+
</Private-Package>
77+
<Import-Package>
78+
org.osgi.framework
79+
</Import-Package>
80+
<Export-Package>
81+
com.nativelibs4java.opencl,
82+
com.nativelibs4java.opencl.library,
83+
com.nativelibs4java.opencl.util,
84+
com.nativelibs4java.opencl.util.fft,
85+
com.nativelibs4java.util,
86+
com.ochafik.util.string,
87+
88+
org.bridj,
89+
org.bridj.ann,
90+
org.bridj.cpp,
91+
org.bridj.cpp.com,
92+
org.bridj.cpp.com.shell,
93+
org.bridj.demangling,
94+
org.bridj.jawt,
95+
org.bridj.objc,
96+
org.bridj.dyncall,
97+
org.bridj.util,
98+
99+
org.bridj.lib.darwin_universal,
100+
org.bridj.lib.linux_x64,
101+
org.bridj.lib.linux_x86,
102+
org.bridj.lib.sunos_x86,
103+
org.bridj.lib.win32,
104+
org.bridj.lib.win64
105+
</Export-Package>
106+
</instructions>
107+
</configuration>
108+
</plugin>
109+
56110
</plugins>
57111
</build>
58112
</project>

JavaCL-OSGi/src/main/java/com/nativelibs4java/opencl/OSGiBundleActivator.java renamed to JavaCL/src/main/java/com/nativelibs4java/opencl/OSGiBundleActivator.java

File renamed without changes.

‎pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
<module>OpenCL4Java</module>
2525
<module>Demos</module>
2626
<module>JavaCL</module>
27-
<module>JavaCL-Shaded</module>
28-
<module>JavaCL-OSGi</module>
2927
<module>Core</module>
3028
<module>Blas</module>
3129
<module>OpenGLDemos</module>

0 commit comments

Comments
 (0)
X Tutup