Skip to content

Commit a79fb15

Browse files
ochafikochafik
committed
Maven Fest : snapshot versions, sonatype parent, com.jnaerator groupId renamed to com.nativelibs4java, opencl4java-* artifacts renamed to javacl-*
1 parent b241ce1 commit a79fb15

File tree

10 files changed

+33
-57
lines changed

10 files changed

+33
-57
lines changed

‎Core/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
1818

1919
<parent>
2020
<groupId>com.nativelibs4java</groupId>
21-
<artifactId>opencl4java-parent-jna</artifactId>
21+
<artifactId>javacl-parent-jna</artifactId>
2222
<version>1.0-SNAPSHOT</version>
2323
<relativePath>../Parent</relativePath>
2424
</parent>
@@ -28,7 +28,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
2828
<dependency>
2929
<groupId>com.nativelibs4java</groupId>
3030
<artifactId>opencl4java-jna</artifactId>
31-
<version>${opencl4java.version}</version>
31+
<version>${javacl-jna.version}</version>
3232
<scope>compile</scope>
3333
</dependency>
3434

@@ -57,7 +57,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
5757
<plugin>
5858
<groupId>com.nativelibs4java</groupId>
5959
<artifactId>maven-velocity-plugin</artifactId>
60-
<version>${bridj.version}</version>
60+
<version>${maven-velocity-plugin.version}</version>
6161
<executions>
6262
<execution>
6363
<goals>

‎Demos/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<parent>
1313
<groupId>com.nativelibs4java</groupId>
14-
<artifactId>opencl4java-parent-jna</artifactId>
14+
<artifactId>javacl-parent-jna</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
<relativePath>../Parent</relativePath>
1717
</parent>
@@ -21,15 +21,15 @@
2121
<dependency>
2222
<groupId>com.nativelibs4java</groupId>
2323
<artifactId>javacl-jna</artifactId>
24-
<version>${opencl4java.version}</version>
24+
<version>${javacl-jna.version}</version>
2525
<scope>compile</scope>
2626
</dependency>
2727

2828

2929
<!-- <dependency>
3030
<groupId>com.nativelibs4java</groupId>
3131
<artifactId>javacl-blas-jna</artifactId>
32-
<version>${opencl4java.version}</version>
32+
<version>${javacl-jna.version}</version>
3333
<scope>compile</scope>
3434
</dependency>
3535
-->
@@ -46,7 +46,7 @@
4646
<plugin>
4747
<groupId>com.nativelibs4java</groupId>
4848
<artifactId>javacl-generator-jna</artifactId>
49-
<version>${opencl4java.version}</version>
49+
<version>${javacl-jna.version}</version>
5050
<!--configuration>
5151
<javaOutputDirectory>${project.build.directory}/../src/main/java</javaOutputDirectory>
5252
</configuration-->

‎Generator/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212

1313
<parent>
1414
<groupId>com.nativelibs4java</groupId>
15-
<artifactId>opencl4java-parent-jna</artifactId>
15+
<artifactId>javacl-parent-jna</artifactId>
1616
<version>1.0-SNAPSHOT</version>
1717
<relativePath>../Parent</relativePath>
1818
</parent>
1919

2020
<dependencies>
2121

2222
<dependency>
23-
<groupId>com.jnaerator</groupId>
23+
<groupId>com.nativelibs4java</groupId>
2424
<artifactId>jnaerator</artifactId>
2525
<version>${jnaerator.version}</version>
2626
<scope>compile</scope>
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>com.nativelibs4java</groupId>
3232
<artifactId>javacl-core-jna</artifactId>
33-
<version>${opencl4java.version}</version>
33+
<version>${javacl-jna.version}</version>
3434
<scope>compile</scope>
3535
</dependency>
3636

‎Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public void convertFunction(Function function, Signatures signatures, boolean is
230230
varRef(kernelVarName), Expression.AssignmentOperator.Equal,
231231
methodCall(
232232
"createKernel",
233-
new Expression.Constant(Expression.Constant.Type.String, functionName)
233+
new Expression.Constant(Expression.Constant.Type.String, functionName, null)
234234
)
235235
)
236236
),

‎InteractiveImageDemo/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<parent>
1313
<groupId>com.nativelibs4java</groupId>
14-
<artifactId>opencl4java-parent-jna</artifactId>
14+
<artifactId>javacl-parent-jna</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
<relativePath>../Parent</relativePath>
1717
</parent>
@@ -21,22 +21,22 @@
2121
<dependency>
2222
<groupId>com.nativelibs4java</groupId>
2323
<artifactId>javacl-core-jna</artifactId>
24-
<version>${opencl4java.version}</version>
24+
<version>${javacl-jna.version}</version>
2525
<scope>compile</scope>
2626
</dependency>
2727
<dependency>
2828
<groupId>com.nativelibs4java</groupId>
2929
<artifactId>javacl-demos-jna</artifactId>
30-
<version>${opencl4java.version}</version>
30+
<version>${javacl-jna.version}</version>
3131
<scope>compile</scope>
3232
</dependency>
3333
<dependency>
3434
<groupId>com.nativelibs4java</groupId>
3535
<artifactId>libcl</artifactId>
36-
<version>${opencl4java.version}</version>
36+
<version>${javacl-jna.version}</version>
3737
</dependency>
3838
<dependency>
39-
<groupId>com.ochafik</groupId>
39+
<groupId>com.nativelibs4java</groupId>
4040
<artifactId>ochafik-swing</artifactId>
4141
<version>${jnaerator.version}</version>
4242
</dependency>

‎JavaCL/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
1818

1919
<parent>
2020
<groupId>com.nativelibs4java</groupId>
21-
<artifactId>opencl4java-parent-jna</artifactId>
21+
<artifactId>javacl-parent-jna</artifactId>
2222
<version>1.0-SNAPSHOT</version>
2323
<relativePath>../Parent</relativePath>
2424
</parent>
@@ -28,7 +28,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
2828
<dependency>
2929
<groupId>com.nativelibs4java</groupId>
3030
<artifactId>javacl-core-jna</artifactId>
31-
<version>${opencl4java.version}</version>
31+
<version>${javacl-jna.version}</version>
3232
<scope>compile</scope>
3333
</dependency>
3434
<dependency>
@@ -51,7 +51,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
5151
<plugin>
5252
<groupId>com.nativelibs4java</groupId>
5353
<artifactId>javacl-generator-jna</artifactId>
54-
<version>${opencl4java.version}</version>
54+
<version>${javacl-jna.version}</version>
5555
<!--configuration>
5656
<javaOutputDirectory>${project.build.directory}/../src/main/java</javaOutputDirectory>
5757
</configuration-->

‎OpenCL4Java/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
2020

2121
<parent>
2222
<groupId>com.nativelibs4java</groupId>
23-
<artifactId>opencl4java-parent-jna</artifactId>
23+
<artifactId>javacl-parent-jna</artifactId>
2424
<version>1.0-SNAPSHOT</version>
2525
<relativePath>../Parent</relativePath>
2626
</parent>
2727

2828
<dependencies>
2929

3030
<dependency>
31-
<groupId>com.jnaerator</groupId>
31+
<groupId>com.nativelibs4java</groupId>
3232
<artifactId>jnaerator-runtime</artifactId>
3333
<!--classifier>shaded</classifier-->
3434
<version>${jnaerator.version}</version>
@@ -41,7 +41,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
4141
<plugins>
4242

4343
<plugin>
44-
<groupId>com.jnaerator</groupId>
44+
<groupId>com.nativelibs4java</groupId>
4545
<artifactId>maven-jnaerator-plugin</artifactId>
4646
<version>${jnaerator.version}</version>
4747
<configuration>

‎OpenGLDemos/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<parent>
1313
<groupId>com.nativelibs4java</groupId>
14-
<artifactId>opencl4java-parent-jna</artifactId>
14+
<artifactId>javacl-parent-jna</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
<relativePath>../Parent</relativePath>
1717
</parent>
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>com.nativelibs4java</groupId>
2323
<artifactId>javacl-demos-jna</artifactId>
24-
<version>${opencl4java.version}</version>
24+
<version>${javacl-jna.version}</version>
2525
<scope>compile</scope>
2626
</dependency>
2727

@@ -38,7 +38,7 @@
3838
<plugin>
3939
<groupId>com.nativelibs4java</groupId>
4040
<artifactId>javacl-generator-jna</artifactId>
41-
<version>${opencl4java.version}</version>
41+
<version>${javacl-jna.version}</version>
4242
<!--configuration>
4343
<javaOutputDirectory>${project.build.directory}/../src/main/java</javaOutputDirectory>
4444
</configuration-->

‎Parent/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.nativelibs4java</groupId>
5-
<artifactId>opencl4java-parent-jna</artifactId>
5+
<artifactId>javacl-parent-jna</artifactId>
66
<version>1.0-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<name>OpenCL4Java Common Configuration / JNA</name>
99
<inceptionYear>2009</inceptionYear>
1010
<url>http://code.google.com/p/nativelibs4java/wiki/OpenCL</url>
1111

1212
<properties>
13-
<opencl4java.version>1.0-SNAPSHOT</opencl4java.version>
13+
<javacl-jna.version>1.0-SNAPSHOT</javacl-jna.version>
1414
</properties>
1515

1616
<parent>
1717
<groupId>com.nativelibs4java</groupId>
1818
<artifactId>nativelibs4java-parent</artifactId>
19-
<version>1.6</version>
19+
<version>1.7-SNAPSHOT</version>
2020
<relativePath>../../Parent</relativePath>
2121
</parent>
2222

@@ -28,7 +28,7 @@
2828
<build>
2929
<plugins>
3030

31-
<plugin>
31+
<!--plugin>
3232
<groupId>org.apache.maven.plugins</groupId>
3333
<artifactId>maven-shade-plugin</artifactId>
3434
<version>1.4</version>
@@ -65,7 +65,7 @@
6565
</execution>
6666
6767
</executions>
68-
</plugin>
68+
</plugin-->
6969
</plugins>
7070
</build>
7171

‎pom.xml‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.nativelibs4java</groupId>
5-
<artifactId>opencl4java-root-jna</artifactId>
5+
<artifactId>javacl-root-jna</artifactId>
66
<version>1.0-SNAPSHOT</version>
77
<packaging>pom</packaging>
8-
<name>OpenCL4Java Root Project / JNA</name>
8+
<name>Legacy JavaCL-JNA Root Project</name>
99

1010
<parent>
1111
<groupId>com.nativelibs4java</groupId>
12-
<artifactId>opencl4java-parent-jna</artifactId>
12+
<artifactId>javacl-parent-jna</artifactId>
1313
<version>1.0-SNAPSHOT</version>
1414
<relativePath>Parent</relativePath>
1515
</parent>
@@ -25,28 +25,4 @@
2525
<module>OpenGLDemos</module>
2626
</modules>
2727

28-
29-
<build>
30-
<plugins>
31-
<plugin>
32-
<groupId>org.apache.maven.plugins</groupId>
33-
<artifactId>maven-javadoc-plugin</artifactId>
34-
<version>2.7</version>
35-
<configuration>
36-
</configuration>
37-
<executions>
38-
<execution>
39-
<id>aggregate</id>
40-
<goals>
41-
<goal>aggregate</goal>
42-
</goals>
43-
<phase>site</phase>
44-
<configuration>
45-
</configuration>
46-
</execution>
47-
</executions>
48-
</plugin>
49-
</plugins>
50-
</build>
51-
5228
</project>

0 commit comments

Comments
 (0)