Skip to content

Commit c1995f4

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

File tree

23 files changed

+89
-144
lines changed

23 files changed

+89
-144
lines changed

‎Blas/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</artifactId>
14+
<artifactId>javacl-parent</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</artifactId>
24-
<version>${opencl4java.version}</version>
24+
<version>${javacl.version}</version>
2525
<!--classifier>shaded</classifier-->
2626
<scope>compile</scope>
2727
</dependency>
@@ -41,7 +41,7 @@
4141
<plugin>
4242
<groupId>com.nativelibs4java</groupId>
4343
<artifactId>maven-javacl-plugin</artifactId>
44-
<version>${opencl4java.version}</version>
44+
<version>${javacl.version}</version>
4545

4646
<!--configuration>
4747
<javaOutputDirectory>${project.build.directory}/../src/main/java</javaOutputDirectory>

‎Core/pom.xml‎

Lines changed: 3 additions & 10 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</artifactId>
21+
<artifactId>javacl-parent</artifactId>
2222
<version>1.0-SNAPSHOT</version>
2323
<relativePath>../Parent</relativePath>
2424
</parent>
@@ -28,17 +28,10 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
2828
<dependency>
2929
<groupId>com.nativelibs4java</groupId>
3030
<artifactId>opencl4java</artifactId>
31-
<version>${opencl4java.version}</version>
31+
<version>${javacl.version}</version>
3232
<scope>compile</scope>
3333
</dependency>
3434

35-
<!--dependency>
36-
<groupId>com.nativelibs4java</groupId>
37-
<artifactId>nativelibs4java-utils</artifactId>
38-
<version>1.4-SNAPSHOT</version>
39-
<scope>compile</scope>
40-
</dependency-->
41-
4235
</dependencies>
4336

4437
<reporting>
@@ -57,7 +50,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
5750
<plugin>
5851
<groupId>com.nativelibs4java</groupId>
5952
<artifactId>maven-velocity-plugin</artifactId>
60-
<version>${bridj.version}</version>
53+
<version>${maven-velocity-plugin.version}</version>
6154
<executions>
6255
<execution>
6356
<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</artifactId>
14+
<artifactId>javacl-parent</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</artifactId>
24-
<version>${opencl4java.version}</version>
24+
<version>${javacl.version}</version>
2525
<scope>compile</scope>
2626
</dependency>
2727

2828

2929
<!-- <dependency>
3030
<groupId>com.nativelibs4java</groupId>
3131
<artifactId>javacl-blas</artifactId>
32-
<version>${opencl4java.version}</version>
32+
<version>${javacl.version}</version>
3333
<scope>compile</scope>
3434
</dependency>
3535
-->
@@ -46,7 +46,7 @@
4646
<plugin>
4747
<groupId>com.nativelibs4java</groupId>
4848
<artifactId>maven-javacl-plugin</artifactId>
49-
<version>${opencl4java.version}</version>
49+
<version>${javacl.version}</version>
5050

5151
<!--configuration>
5252
<javaOutputDirectory>${project.build.directory}/../src/main/java</javaOutputDirectory>

‎Generator/pom.xml‎

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

1212
<parent>
1313
<groupId>com.nativelibs4java</groupId>
14-
<artifactId>opencl4java-parent</artifactId>
14+
<artifactId>javacl-parent</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
<relativePath>../Parent</relativePath>
1717
</parent>
1818

1919
<dependencies>
2020

2121
<dependency>
22-
<groupId>com.jnaerator</groupId>
22+
<groupId>com.nativelibs4java</groupId>
2323
<artifactId>jnaerator</artifactId>
2424
<version>${jnaerator.version}</version>
2525
<scope>compile</scope>
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.nativelibs4java</groupId>
3131
<artifactId>javacl-core</artifactId>
32-
<version>${opencl4java.version}</version>
32+
<version>${javacl.version}</version>
3333
<scope>compile</scope>
3434
</dependency>
3535
</dependencies>

‎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</artifactId>
14+
<artifactId>javacl-parent</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</artifactId>
24-
<version>${opencl4java.version}</version>
24+
<version>${javacl.version}</version>
2525
<scope>compile</scope>
2626
</dependency>
2727
<dependency>
2828
<groupId>com.nativelibs4java</groupId>
2929
<artifactId>javacl-demos</artifactId>
30-
<version>${opencl4java.version}</version>
30+
<version>${javacl.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.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</artifactId>
21+
<artifactId>javacl-parent</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</artifactId>
31-
<version>${opencl4java.version}</version>
31+
<version>${javacl.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>maven-javacl-plugin</artifactId>
54-
<version>${opencl4java.version}</version>
54+
<version>${javacl.version}</version>
5555

5656
<!--configuration>
5757
<javaOutputDirectory>${project.build.directory}/../src/main/java</javaOutputDirectory>

‎JavaCL/src/test/java/com/nativelibs4java/opencl/util/DiscreteFourierTransformTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static void assertArrayEquals(String title, Object a, Object b) {
7070

7171
static Collection<double[]> createTestDoubleInputs() {
7272
Collection<double[]> ret = new ArrayList<double[]>();
73-
for (int n : new int[] { 1024, 1, 2, 4, 8, 16 }) {
73+
for (int n : new int[] { 1, 2, 4, 8, 16, 1024 }) {
7474
double[] in = new double[2 * n];
7575

7676
for (int i = 0; i < n; i++) {

‎LibCL/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<parent>
1717
<groupId>com.nativelibs4java</groupId>
18-
<artifactId>opencl4java-parent</artifactId>
18+
<artifactId>javacl-parent</artifactId>
1919
<version>1.0-SNAPSHOT</version>
2020
<relativePath>../Parent</relativePath>
2121
</parent>

‎MavenPlugin/pom.xml‎

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

1313
<parent>
1414
<groupId>com.nativelibs4java</groupId>
15-
<artifactId>opencl4java-parent</artifactId>
15+
<artifactId>javacl-parent</artifactId>
1616
<version>1.0-SNAPSHOT</version>
1717
<relativePath>../Parent</relativePath>
1818
</parent>
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>com.nativelibs4java</groupId>
2424
<artifactId>javacl-generator</artifactId>
25-
<version>${opencl4java.version}</version>
25+
<version>${javacl.version}</version>
2626
<scope>compile</scope>
2727
</dependency>
2828

0 commit comments

Comments
 (0)