Skip to content

Commit 39704bf

Browse files
ochafikochafik
committed
Pom cleanup (renamed vars pom.x -> project.x, use scala-maven-plugin from net.alchim31.maven instead of maven-scala-plugin from org.scala-tools to get the doc-jar goal)
1 parent 5650043 commit 39704bf

13 files changed

Lines changed: 72 additions & 44 deletions

File tree

‎libraries/BridJ/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@
9494
<extensions>true</extensions>
9595
<configuration>
9696
<instructions>
97-
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
98-
<Bundle-Name>${pom.name}</Bundle-Name>
99-
<Bundle-Version>${pom.version}</Bundle-Version>
97+
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
98+
<Bundle-Name>${project.name}</Bundle-Name>
99+
<Bundle-Version>${project.version}</Bundle-Version>
100100
<Bundle-Activator>
101101
org.bridj.OSGiBundleActivator
102102
</Bundle-Activator>

‎libraries/OpenCL-JNA/JavaCLTutorial/pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</plugin>
4747
<plugin>
4848
<groupId>org.scala-tools</groupId>
49-
<artifactId>maven-scala-plugin</artifactId>
49+
<artifactId>scala-maven-plugin</artifactId>
5050
</plugin>
5151
<plugin>
5252
<groupId>org.apache.maven.plugins</groupId>
@@ -58,9 +58,8 @@
5858
<reporting>
5959
<plugins>
6060
<plugin>
61-
<groupId>org.scala-tools</groupId>
62-
<artifactId>maven-scala-plugin</artifactId>
63-
<version>${scala.version}</version>
61+
<groupId>net.alchim31.maven</groupId>
62+
<artifactId>scala-maven-plugin</artifactId>
6463
</plugin>
6564
</plugins>
6665
</reporting>

‎libraries/OpenCL-JNA/NumericalBenchmark/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
</executions>
4848
</plugin>
4949
<plugin>
50-
<groupId>org.scala-tools</groupId>
51-
<artifactId>maven-scala-plugin</artifactId>
50+
<groupId>net.alchim31.maven</groupId>
51+
<artifactId>scala-maven-plugin</artifactId>
5252
</plugin>
5353
<plugin>
5454
<groupId>org.apache.maven.plugins</groupId>
@@ -60,8 +60,8 @@
6060
<reporting>
6161
<plugins>
6262
<plugin>
63-
<groupId>org.scala-tools</groupId>
64-
<artifactId>maven-scala-plugin</artifactId>
63+
<groupId>net.alchim31.maven</groupId>
64+
<artifactId>scala-maven-plugin</artifactId>
6565
</plugin>
6666
</plugins>
6767
</reporting>

‎libraries/OpenCL-JNA/OpenCL4Java/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
3838

3939
<build>
4040
<plugins>
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-javadoc-plugin</artifactId>
44+
</plugin>
4145
<!--
4246
<plugin>
4347
<groupId>com.nativelibs4java</groupId>

‎libraries/OpenCL/JavaCL/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
6464
<extensions>true</extensions>
6565
<configuration>
6666
<instructions>
67-
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
68-
<Bundle-Name>${pom.name}</Bundle-Name>
69-
<Bundle-Version>${pom.version}</Bundle-Version>
67+
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
68+
<Bundle-Name>${project.name}</Bundle-Name>
69+
<Bundle-Version>${project.version}</Bundle-Version>
7070
<Bundle-Activator>
7171
com.nativelibs4java.opencl.OSGiBundleActivator
7272
</Bundle-Activator>

‎libraries/OpenCL/NumericalBenchmark/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<artifactId>maven-javacl-plugin</artifactId>
3838
</plugin>
3939
<plugin>
40-
<groupId>org.scala-tools</groupId>
41-
<artifactId>maven-scala-plugin</artifactId>
40+
<groupId>net.alchim31.maven</groupId>
41+
<artifactId>scala-maven-plugin</artifactId>
4242
</plugin>
4343
<plugin>
4444
<groupId>org.apache.maven.plugins</groupId>
@@ -50,8 +50,8 @@
5050
<reporting>
5151
<plugins>
5252
<plugin>
53-
<groupId>org.scala-tools</groupId>
54-
<artifactId>maven-scala-plugin</artifactId>
53+
<groupId>net.alchim31.maven</groupId>
54+
<artifactId>scala-maven-plugin</artifactId>
5555
</plugin>
5656
</plugins>
5757
</reporting>

‎libraries/OpenCL/OpenCL4Java/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
3737

3838
<build>
3939
<plugins>
40+
<plugin>
41+
<groupId>org.apache.maven.plugins</groupId>
42+
<artifactId>maven-javadoc-plugin</artifactId>
43+
</plugin>
4044
<!--
4145
<plugin>
4246
<groupId>com.nativelibs4java</groupId>

‎libraries/OpenCL/Tutorials/DFT/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<artifactId>maven-javacl-plugin</artifactId>
3838
</plugin>
3939
<plugin>
40-
<groupId>org.scala-tools</groupId>
41-
<artifactId>maven-scala-plugin</artifactId>
40+
<groupId>net.alchim31.maven</groupId>
41+
<artifactId>scala-maven-plugin</artifactId>
4242
</plugin>
4343
<plugin>
4444
<groupId>org.apache.maven.plugins</groupId>
@@ -50,8 +50,8 @@
5050
<reporting>
5151
<plugins>
5252
<plugin>
53-
<groupId>org.scala-tools</groupId>
54-
<artifactId>maven-scala-plugin</artifactId>
53+
<groupId>net.alchim31.maven</groupId>
54+
<artifactId>scala-maven-plugin</artifactId>
5555
</plugin>
5656
</plugins>
5757
</reporting>

‎libraries/Runtime/ScalaBridJ/pom.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
</plugin>
5656
-->
5757
<plugin>
58-
<groupId>org.scala-tools</groupId>
59-
<artifactId>maven-scala-plugin</artifactId>
58+
<groupId>net.alchim31.maven</groupId>
59+
<artifactId>scala-maven-plugin</artifactId>
6060
<executions>
6161
<execution>
6262
<goals>
@@ -102,9 +102,8 @@
102102
<reporting>
103103
<plugins>
104104
<plugin>
105-
<groupId>org.scala-tools</groupId>
106-
<artifactId>maven-scala-plugin</artifactId>
107-
<version>${scala.version}</version>
105+
<groupId>net.alchim31.maven</groupId>
106+
<artifactId>scala-maven-plugin</artifactId>
108107
</plugin>
109108
<plugin>
110109
<groupId>org.codehaus.mojo</groupId>

‎libraries/ScalaCL/Test/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<build>
4141
<plugins>
4242
<plugin>
43-
<groupId>org.scala-tools</groupId>
44-
<artifactId>maven-scala-plugin</artifactId>
43+
<groupId>net.alchim31.maven</groupId>
44+
<artifactId>scala-maven-plugin</artifactId>
4545
<executions>
4646
<execution>
4747
<goals>

0 commit comments

Comments
 (0)