Skip to content

Commit 13ea420

Browse files
ochafikochafik
committed
Updated versions of some Maven dependencies and plugins (+ simplified some redundant plugin configs)
1 parent 2b626ea commit 13ea420

25 files changed

Lines changed: 51 additions & 282 deletions

File tree

‎libraries/DirectX/pom.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,6 @@
2929

3030
<build>
3131
<plugins>
32-
<plugin>
33-
<groupId>org.apache.maven.plugins</groupId>
34-
<artifactId>maven-compiler-plugin</artifactId>
35-
<version>2.3.1</version>
36-
<configuration>
37-
<source>1.5</source>
38-
<target>1.5</target>
39-
</configuration>
40-
</plugin>
41-
42-
4332
<plugin>
4433
<groupId>com.jnaerator</groupId>
4534
<artifactId>maven-jnaerator-plugin</artifactId>
@@ -48,15 +37,6 @@
4837
<javaOutputDirectory>src/main/java</javaOutputDirectory>
4938
</configuration>
5039
</plugin>
51-
<plugin>
52-
<groupId>org.apache.maven.plugins</groupId>
53-
<artifactId>maven-compiler-plugin</artifactId>
54-
<version>2.0.2</version>
55-
<configuration>
56-
<source>1.5</source>
57-
<target>1.5</target>
58-
</configuration>
59-
</plugin>
6040
</plugins>
6141
</build>
6242
</project>

‎libraries/FFMpeg/pom.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,6 @@
2929

3030
<build>
3131
<plugins>
32-
<plugin>
33-
<groupId>org.apache.maven.plugins</groupId>
34-
<artifactId>maven-compiler-plugin</artifactId>
35-
<version>2.3.1</version>
36-
<configuration>
37-
<source>1.5</source>
38-
<target>1.5</target>
39-
</configuration>
40-
</plugin>
41-
42-
4332
<plugin>
4433
<groupId>com.jnaerator</groupId>
4534
<artifactId>maven-jnaerator-plugin</artifactId>
@@ -48,15 +37,6 @@
4837
<javaOutputDirectory>src/main/java</javaOutputDirectory>
4938
</configuration>
5039
</plugin>
51-
<plugin>
52-
<groupId>org.apache.maven.plugins</groupId>
53-
<artifactId>maven-compiler-plugin</artifactId>
54-
<version>2.0.2</version>
55-
<configuration>
56-
<source>1.5</source>
57-
<target>1.5</target>
58-
</configuration>
59-
</plugin>
6040
</plugins>
6141
</build>
6242
</project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
<dependency>
3838
<groupId>org.apache.maven</groupId>
3939
<artifactId>maven-plugin-api</artifactId>
40-
<version>2.0</version>
40+
<version>3.0.3</version>
4141
</dependency>
4242

4343
<dependency>
4444
<groupId>org.apache.maven</groupId>
4545
<artifactId>maven-project</artifactId>
46-
<version>2.0.2</version>
46+
<version>3.0-alpha-2</version>
4747
</dependency>
4848

4949
<!--

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<plugin>
5050
<groupId>org.apache.maven.plugins</groupId>
5151
<artifactId>maven-jar-plugin</artifactId>
52-
<version>2.3.1</version>
52+
<version>2.3.2</version>
5353
<configuration>
5454
<archive>
5555
<manifest>
@@ -59,15 +59,6 @@
5959
</configuration>
6060
</plugin>
6161

62-
<plugin>
63-
<groupId>org.apache.maven.plugins</groupId>
64-
<artifactId>maven-compiler-plugin</artifactId>
65-
<version>2.3.1</version>
66-
<configuration>
67-
<source>1.5</source>
68-
<target>1.5</target>
69-
</configuration>
70-
</plugin>
7162
</plugins>
7263
</build>
7364

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
3434
<dependency>
3535
<groupId>org.apache.commons</groupId>
3636
<artifactId>commons-math</artifactId>
37-
<version>2.1</version>
37+
<version>2.2</version>
3838
<scope>test</scope>
3939
</dependency>
4040
<dependency>
@@ -70,7 +70,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
7070
<plugin>
7171
<groupId>org.apache.maven.plugins</groupId>
7272
<artifactId>maven-jar-plugin</artifactId>
73-
<version>2.3.1</version>
73+
<version>2.3.2</version>
7474
<configuration>
7575
<archive>
7676
<manifest>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<packaging>jar</packaging>
1111

1212
<properties>
13-
<scala.version>2.8.1</scala.version>
13+
<scala.version>2.9.1</scala.version>
1414
</properties>
1515

1616
<repositories>
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.apache.commons</groupId>
3232
<artifactId>commons-math</artifactId>
33-
<version>2.1</version>
33+
<version>2.2</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.scala-lang</groupId>
@@ -60,7 +60,7 @@
6060
<plugin>
6161
<groupId>org.apache.maven.plugins</groupId>
6262
<artifactId>maven-compiler-plugin</artifactId>
63-
<version>2.3.1</version>
63+
<version>2.3.2</version>
6464
<configuration>
6565
<source>1.5</source>
6666
<target>1.5</target>
@@ -81,7 +81,7 @@
8181
<plugin>
8282
<groupId>org.apache.maven.plugins</groupId>
8383
<artifactId>maven-shade-plugin</artifactId>
84-
<version>1.3.3</version>
84+
<version>1.4</version>
8585
<executions>
8686
<execution>
8787
<phase>package</phase>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<packaging>jar</packaging>
1111

1212
<properties>
13-
<scala.version>2.8.1</scala.version>
13+
<scala.version>2.9.1</scala.version>
1414
</properties>
1515

1616
<repositories>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>org.apache.commons</groupId>
3333
<artifactId>commons-math</artifactId>
34-
<version>2.1</version>
34+
<version>2.2</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.scala-lang</groupId>
@@ -61,7 +61,7 @@
6161
<plugin>
6262
<groupId>org.apache.maven.plugins</groupId>
6363
<artifactId>maven-compiler-plugin</artifactId>
64-
<version>2.3.1</version>
64+
<version>2.3.2</version>
6565
<configuration>
6666
<source>1.5</source>
6767
<target>1.5</target>
@@ -82,7 +82,7 @@
8282
<plugin>
8383
<groupId>org.apache.maven.plugins</groupId>
8484
<artifactId>maven-shade-plugin</artifactId>
85-
<version>1.3.3</version>
85+
<version>1.4</version>
8686
<executions>
8787
<execution>
8888
<phase>package</phase>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<plugin>
2828
<groupId>org.apache.maven.plugins</groupId>
2929
<artifactId>maven-shade-plugin</artifactId>
30-
<version>1.3.3</version>
30+
<version>1.4</version>
3131
<executions>
3232

3333
<execution>

‎libraries/OpenCL/Generator/pom.xml‎

Lines changed: 2 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -37,93 +37,17 @@
3737
<dependency>
3838
<groupId>org.apache.maven</groupId>
3939
<artifactId>maven-plugin-api</artifactId>
40-
<version>2.0</version>
40+
<version>3.0.3</version>
4141
</dependency>
4242

4343
<dependency>
4444
<groupId>org.apache.maven</groupId>
4545
<artifactId>maven-project</artifactId>
46-
<version>2.0.2</version>
46+
<version>3.0-alpha-2</version>
4747
</dependency>
4848

49-
<!--
50-
<dependency>
51-
<groupId>org.apache.maven</groupId>
52-
<artifactId>maven-model</artifactId>
53-
<version>2.0.2</version>
54-
</dependency>
55-
<dependency>
56-
<groupId>org.apache.maven</groupId>
57-
<artifactId>maven-project</artifactId>
58-
<version>2.0.2</version>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.apache.maven</groupId>
62-
<artifactId>maven-core</artifactId>
63-
<version>2.0.2</version>
64-
</dependency>
65-
<dependency>
66-
<groupId>org.apache.maven</groupId>
67-
<artifactId>maven-plugin-api</artifactId>
68-
<version>2.0</version>
69-
</dependency>
70-
<dependency>
71-
<groupId>org.apache.maven</groupId>
72-
<artifactId>maven-artifact</artifactId>
73-
<version>2.0</version>
74-
</dependency>
75-
<dependency>
76-
<groupId>org.codehaus.plexus</groupId>
77-
<artifactId>plexus-utils</artifactId>
78-
<version>1.5.8</version>
79-
</dependency-->
80-
8149
</dependencies>
8250

83-
<!--build>
84-
<plugins>
85-
86-
<plugin>
87-
<groupId>org.apache.maven.plugins</groupId>
88-
<artifactId>maven-shade-plugin</artifactId>
89-
<version>1.3.3</version>
90-
<executions>
91-
92-
<execution>
93-
<id>full-package</id>
94-
<phase>package</phase>
95-
<goals>
96-
<goal>shade</goal>
97-
</goals>
98-
<configuration>
99-
<shadedArtifactAttached>false</shadedArtifactAttached>
100-
<artifactSet>
101-
<excludes>
102-
<exclude>org.scala-lang:scala-library</exclude>
103-
<exclude>org.slf4j:slf4j-jdk14</exclude>
104-
<exclude>junit:junit</exclude>
105-
</excludes>
106-
</artifactSet>
107-
108-
<filters>
109-
<filter>
110-
<artifact>*:*</artifact>
111-
<excludes>
112-
<exclude>META-INF/*.SF</exclude>
113-
<exclude>META-INF/*.DSA</exclude>
114-
<exclude>META-INF/*.RSA</exclude>
115-
<exclude>META-INF/maven/**</exclude>
116-
</excludes>
117-
</filter>
118-
</filters>
119-
</configuration>
120-
</execution>
121-
122-
</executions>
123-
</plugin>
124-
</plugins>
125-
</build-->
126-
12751
</project>
12852

12953

‎libraries/OpenCL/InteractiveImageDemo/pom.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<plugin>
5050
<groupId>org.apache.maven.plugins</groupId>
5151
<artifactId>maven-jar-plugin</artifactId>
52-
<version>2.3.1</version>
52+
<version>2.3.2</version>
5353
<configuration>
5454
<archive>
5555
<manifest>
@@ -58,16 +58,6 @@
5858
</archive>
5959
</configuration>
6060
</plugin>
61-
62-
<plugin>
63-
<groupId>org.apache.maven.plugins</groupId>
64-
<artifactId>maven-compiler-plugin</artifactId>
65-
<version>2.3.1</version>
66-
<configuration>
67-
<source>1.5</source>
68-
<target>1.5</target>
69-
</configuration>
70-
</plugin>
7161
</plugins>
7262
</build>
7363

0 commit comments

Comments
 (0)