Skip to content

Commit 1b439f4

Browse files
ochafikochafik
committed
Added some OSGI manifest attributes, and other pom works...
1 parent 293ef1c commit 1b439f4

File tree

5 files changed

+122
-761
lines changed

5 files changed

+122
-761
lines changed

‎Core/pom.xml‎

Lines changed: 59 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,69 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>com.nativelibs4java</groupId>
6-
<artifactId>javacl-core</artifactId>
7-
<name>JavaCL Core / BridJ</name>
8-
<url>http://code.google.com/p/javacl/</url>
9-
<packaging>jar</packaging>
10-
1+
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.nativelibs4java</groupId>
5+
<artifactId>javacl-core</artifactId>
6+
<name>JavaCL Core / BridJ</name>
7+
<url>http://code.google.com/p/javacl/</url>
8+
<packaging>jar</packaging>
119

12-
<description>
10+
11+
<description>
1312
JavaCL is an Object-Oriented API that makes the C OpenCL API available to Java in a very natural way.
1413
It hides away the complexity of cross-platform C bindings, has a clean OO design (with generics, Java enums, NIO buffers, fully typed exceptions...), provides high-level features (OpenGL-interop, array reductions) and comes with samples and demos.
1514
For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL.
1615
</description>
16+
17+
<parent>
18+
<groupId>com.nativelibs4java</groupId>
19+
<artifactId>javacl-parent</artifactId>
20+
<version>1.0-SNAPSHOT</version>
21+
<relativePath>..</relativePath>
22+
</parent>
1723

18-
<parent>
19-
<groupId>com.nativelibs4java</groupId>
20-
<artifactId>javacl-parent</artifactId>
21-
<version>1.0-SNAPSHOT</version>
22-
<relativePath>..</relativePath>
23-
</parent>
24-
25-
<dependencies>
26-
27-
<dependency>
28-
<groupId>com.nativelibs4java</groupId>
29-
<artifactId>opencl4java</artifactId>
30-
</dependency>
31-
<dependency>
32-
<groupId>com.nativelibs4java</groupId>
33-
<artifactId>nativelibs4java-utils</artifactId>
34-
<version>1.4-SNAPSHOT</version>
35-
</dependency>
36-
</dependencies>
37-
38-
<reporting>
39-
<plugins>
40-
<plugin>
41-
<groupId>org.codehaus.mojo</groupId>
42-
<artifactId>cobertura-maven-plugin</artifactId>
43-
<version>2.4</version>
44-
</plugin>
45-
</plugins>
46-
</reporting>
47-
48-
<build>
49-
<plugins>
50-
<plugin>
24+
<properties>
25+
<exportedPackages>com.nativelibs4java.opencl,com.nativelibs4java.opencl.util,com.nativelibs4java.opencl.util.fft</exportedPackages>
26+
<packageName>com.nativelibs4java.opencl</packageName>
27+
</properties>
28+
29+
<dependencies>
30+
31+
<dependency>
5132
<groupId>com.nativelibs4java</groupId>
52-
<artifactId>maven-velocity-plugin</artifactId>
53-
</plugin>
54-
</plugins>
55-
</build>
56-
33+
<artifactId>opencl4java</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.nativelibs4java</groupId>
37+
<artifactId>nativelibs4java-utils</artifactId>
38+
<version>1.4-SNAPSHOT</version>
39+
</dependency>
40+
</dependencies>
41+
42+
<reporting>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.codehaus.mojo</groupId>
46+
<artifactId>cobertura-maven-plugin</artifactId>
47+
<version>2.4</version>
48+
</plugin>
49+
</plugins>
50+
</reporting>
51+
52+
<build>
53+
<plugins>
54+
<plugin>
55+
<groupId>com.nativelibs4java</groupId>
56+
<artifactId>maven-velocity-plugin</artifactId>
57+
</plugin>
58+
59+
<plugin>
60+
<groupId>org.apache.maven.plugins</groupId>
61+
<artifactId>maven-shade-plugin</artifactId>
62+
</plugin>
63+
64+
</plugins>
65+
</build>
66+
5767
</project>
5868

5969

‎Demos/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
<relativePath>..</relativePath>
1616
</parent>
1717

18+
<properties>
19+
<mainClass>com.nativelibs4java.opencl.HardwareReport</mainClass>
20+
<packageName>com.nativelibs4java.opencl</packageName>
21+
</properties>
22+
1823
<dependencies>
1924

2025
<dependency>

‎InteractiveImageDemo/pom.xml‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
<version>1.0-SNAPSHOT</version>
1515
<relativePath>..</relativePath>
1616
</parent>
17-
17+
18+
<properties>
19+
<mainClass>com.nativelibs4java.opencl.demos.interactiveimage.InteractiveImageDemo</mainClass>
20+
</properties>
21+
1822
<dependencies>
1923

2024
<dependency>
@@ -36,24 +40,6 @@
3640
</dependency>
3741

3842
</dependencies>
39-
40-
<build>
41-
<plugins>
42-
43-
<plugin>
44-
<groupId>org.apache.maven.plugins</groupId>
45-
<artifactId>maven-jar-plugin</artifactId>
46-
<version>2.3.2</version>
47-
<configuration>
48-
<archive>
49-
<manifest>
50-
<mainClass>com.nativelibs4java.opencl.demos.interactiveimage.InteractiveImageDemo</mainClass>
51-
</manifest>
52-
</archive>
53-
</configuration>
54-
</plugin>
55-
</plugins>
56-
</build>
5743

5844
</project>
5945

‎JavaCL/pom.xml‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>com.nativelibs4java</groupId>
6-
<artifactId>javacl</artifactId>
7-
<name>JavaCL / BridJ</name>
8-
<url>http://code.google.com/p/javacl/</url>
9-
<packaging>jar</packaging>
10-
1+
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.nativelibs4java</groupId>
5+
<artifactId>javacl</artifactId>
6+
<name>JavaCL / BridJ</name>
7+
<url>http://code.google.com/p/javacl/</url>
8+
<packaging>jar</packaging>
119

12-
<description>
10+
11+
<description>
1312
JavaCL is an Object-Oriented API that makes the C OpenCL API available to Java in a very natural way.
1413
It hides away the complexity of cross-platform C bindings, has a clean OO design (with generics, Java enums, NIO buffers, fully typed exceptions...), provides high-level features (OpenGL-interop, array reductions) and comes with samples and demos.
1514
For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL.
1615
</description>
17-
18-
<parent>
19-
<groupId>com.nativelibs4java</groupId>
20-
<artifactId>javacl-parent</artifactId>
21-
<version>1.0-SNAPSHOT</version>
22-
<relativePath>..</relativePath>
23-
</parent>
24-
25-
<dependencies>
26-
27-
<dependency>
28-
<groupId>com.nativelibs4java</groupId>
29-
<artifactId>javacl-core</artifactId>
30-
</dependency>
31-
<dependency>
32-
<groupId>org.apache.commons</groupId>
33-
<artifactId>commons-math</artifactId>
34-
<version>2.2</version>
35-
<scope>test</scope>
36-
</dependency>
37-
</dependencies>
3816

39-
<build>
40-
<plugins>
17+
<parent>
18+
<groupId>com.nativelibs4java</groupId>
19+
<artifactId>javacl-parent</artifactId>
20+
<version>1.0-SNAPSHOT</version>
21+
<relativePath>..</relativePath>
22+
</parent>
23+
24+
<properties>
25+
<exportedPackages>com.nativelibs4java.opencl,com.nativelibs4java.opencl.util,com.nativelibs4java.opencl.util.fft</exportedPackages>
26+
<packageName>com.nativelibs4java.opencl</packageName>
27+
</properties>
4128

42-
<plugin>
29+
<dependencies>
30+
31+
<dependency>
4332
<groupId>com.nativelibs4java</groupId>
44-
<artifactId>maven-javacl-plugin</artifactId>
45-
</plugin>
33+
<artifactId>javacl-core</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.apache.commons</groupId>
37+
<artifactId>commons-math</artifactId>
38+
<version>2.2</version>
39+
<scope>test</scope>
40+
</dependency>
41+
</dependencies>
4642

47-
<plugin>
48-
<groupId>org.apache.maven.plugins</groupId>
49-
<artifactId>maven-jar-plugin</artifactId>
50-
<version>2.3.2</version>
51-
<configuration>
52-
<archive>
53-
<manifest>
54-
<mainClass>com.nativelibs4java.opencl.HardwareReport</mainClass>
55-
<packageName>com.nativelibs4java.opencl</packageName>
56-
</manifest>
57-
</archive>
58-
</configuration>
59-
</plugin>
60-
61-
</plugins>
62-
</build>
43+
<build>
44+
<plugins>
45+
46+
<plugin>
47+
<groupId>com.nativelibs4java</groupId>
48+
<artifactId>maven-javacl-plugin</artifactId>
49+
</plugin>
50+
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-jar-plugin</artifactId>
54+
</plugin>
55+
56+
<plugin>
57+
<groupId>org.apache.maven.plugins</groupId>
58+
<artifactId>maven-shade-plugin</artifactId>
59+
</plugin>
60+
61+
</plugins>
62+
</build>
6363
</project>
6464

6565

0 commit comments

Comments
 (0)