X Tutup
Skip to content

Commit a8556e3

Browse files
ochafikochafik
committed
Updated versions of some Maven dependencies and plugins (+ simplified some redundant plugin configs)
1 parent 4aca7ec commit a8556e3

File tree

7 files changed

+14
-117
lines changed

7 files changed

+14
-117
lines changed

‎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

‎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

‎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>
@@ -71,7 +71,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
7171
<plugin>
7272
<groupId>org.apache.maven.plugins</groupId>
7373
<artifactId>maven-jar-plugin</artifactId>
74-
<version>2.3.1</version>
74+
<version>2.3.2</version>
7575
<configuration>
7676
<archive>
7777
<manifest>

‎NumericalBenchmark/pom.xml‎

Lines changed: 3 additions & 3 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>
@@ -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>

‎Parent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<plugin>
3232
<groupId>org.apache.maven.plugins</groupId>
3333
<artifactId>maven-shade-plugin</artifactId>
34-
<version>1.3.3</version>
34+
<version>1.4</version>
3535
<executions>
3636

3737
<execution>

‎ScalaCLPlugin/pom.xml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ For more info, please visit http://code.google.com/p/scalacl
2222
<scala.version>2.8.1</scala.version>
2323
-->
2424
<scala.version>2.9.1</scala.version>
25+
<junit.version>4.10</junit.version>
2526
</properties>
2627
<!--
2728
<parent>
@@ -35,7 +36,7 @@ For more info, please visit http://code.google.com/p/scalacl
3536
<dependency>
3637
<groupId>junit</groupId>
3738
<artifactId>junit</artifactId>
38-
<version>4.8.2</version>
39+
<version>${junit.version}</version>
3940
<scope>test</scope>
4041
</dependency>
4142

@@ -114,15 +115,6 @@ For more info, please visit http://code.google.com/p/scalacl
114115
</execution>
115116
</executions>
116117
</plugin>
117-
<plugin>
118-
<groupId>org.apache.maven.plugins</groupId>
119-
<artifactId>maven-compiler-plugin</artifactId>
120-
<version>2.0.2</version>
121-
<configuration>
122-
<source>1.6</source>
123-
<target>1.6</target>
124-
</configuration>
125-
</plugin>
126118
</plugins>
127119
</build>
128120

‎Tutorials/DFT/pom.xml‎

Lines changed: 3 additions & 12 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
<parent>
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>org.apache.commons</groupId>
3939
<artifactId>commons-math</artifactId>
40-
<version>2.1</version>
40+
<version>2.2</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.scala-lang</groupId>
@@ -64,15 +64,6 @@
6464
</execution>
6565
</executions>
6666
</plugin>
67-
<plugin>
68-
<groupId>org.apache.maven.plugins</groupId>
69-
<artifactId>maven-compiler-plugin</artifactId>
70-
<version>2.3.1</version>
71-
<configuration>
72-
<source>1.5</source>
73-
<target>1.5</target>
74-
</configuration>
75-
</plugin>
7667
<plugin>
7768
<groupId>org.scala-tools</groupId>
7869
<artifactId>maven-scala-plugin</artifactId>
@@ -88,7 +79,7 @@
8879
<plugin>
8980
<groupId>org.apache.maven.plugins</groupId>
9081
<artifactId>maven-shade-plugin</artifactId>
91-
<version>1.3.3</version>
82+
<version>1.4</version>
9283
<executions>
9384
<execution>
9485
<phase>package</phase>

0 commit comments

Comments
 (0)
X Tutup