Browse code

fix maven build warnings

devnewton authored on 18/07/2014 at 08:01:06
Showing 8 changed files
... ...
@@ -40,27 +40,10 @@ THE SOFTWARE. -->
40 40
         <plugins>
41 41
             <plugin>
42 42
                 <artifactId>maven-compiler-plugin</artifactId>
43
-                <version>3.1</version>
44
-                <configuration>
45
-                    <!--<compilerArgument>-Xlint:unchecked</compilerArgument>-->
46
-                    <source>1.6</source>
47
-                    <target>1.6</target>
48
-                </configuration>
49 43
             </plugin>
50 44
             <plugin>
51 45
                 <groupId>org.apache.maven.plugins</groupId>
52 46
                 <artifactId>maven-source-plugin</artifactId>
53
-                <version>2.2.1</version>
54
-                <!-- build a -sources.jar always, rather than only on deploy -->
55
-                <executions>
56
-                    <execution>
57
-                        <id>attach-sources</id>
58
-                        <phase>generate-resources</phase>
59
-                        <goals>
60
-                            <goal>jar-no-fork</goal>
61
-                        </goals>
62
-                    </execution>
63
-                </executions>
64 47
             </plugin>
65 48
         </plugins>
66 49
     </build>
... ...
@@ -46,12 +46,6 @@ THE SOFTWARE. -->
46 46
         <plugins>
47 47
             <plugin>
48 48
                 <artifactId>maven-compiler-plugin</artifactId>
49
-                <version>3.1</version>
50
-                <configuration>
51
-                    <!--<compilerArgument>-Xlint:unchecked</compilerArgument>-->
52
-                    <source>1.7</source>
53
-                    <target>1.7</target>
54
-                </configuration>
55 49
             </plugin>
56 50
         </plugins>
57 51
     </build>
... ...
@@ -46,12 +46,6 @@ THE SOFTWARE. -->
46 46
         <plugins>
47 47
             <plugin>
48 48
                 <artifactId>maven-compiler-plugin</artifactId>
49
-                <version>3.1</version>
50
-                <configuration>
51
-                    <!--<compilerArgument>-Xlint:unchecked</compilerArgument>-->
52
-                    <source>1.6</source>
53
-                    <target>1.6</target>
54
-                </configuration>
55 49
             </plugin>
56 50
             <plugin>
57 51
                 <artifactId>maven-resources-plugin</artifactId>
... ...
@@ -28,5 +28,10 @@
28 28
                 </excludes>
29 29
             </resource>
30 30
         </resources>
31
+        <plugins>
32
+            <plugin>
33
+                <artifactId>maven-compiler-plugin</artifactId>
34
+            </plugin>
35
+        </plugins>
31 36
     </build>
32 37
 </project>
... ...
@@ -33,16 +33,6 @@
33 33
             <plugin>
34 34
                 <groupId>org.apache.maven.plugins</groupId>
35 35
                 <artifactId>maven-source-plugin</artifactId>
36
-                <!-- build a -sources.jar always, rather than only on deploy -->
37
-                <executions>
38
-                    <execution>
39
-                        <id>attach-sources</id>
40
-                        <phase>generate-resources</phase>
41
-                        <goals>
42
-                            <goal>jar-no-fork</goal>
43
-                        </goals>
44
-                    </execution>
45
-                </executions>
46 36
             </plugin>
47 37
         </plugins>
48 38
     </build>
... ...
@@ -109,6 +109,9 @@
109 109
     <build>
110 110
         <plugins>
111 111
             <plugin>
112
+                <artifactId>maven-compiler-plugin</artifactId>
113
+            </plugin>
114
+            <plugin>
112 115
                 <groupId>org.codehaus.mojo</groupId>
113 116
                 <artifactId>gwt-maven-plugin</artifactId>
114 117
                 <version>${gwt.version}</version>
... ...
@@ -1,95 +1,95 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project xmlns="http://maven.apache.org/POM/4.0.0"
3
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5
-  <modelVersion>4.0.0</modelVersion>
6
-  <parent>
7
-    <groupId>org.geekygoblin</groupId>
8
-    <artifactId>nedetlesmaki-playn</artifactId>
9
-    <version>0.4-SNAPSHOT</version>
10
-  </parent>
3
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5
+    <modelVersion>4.0.0</modelVersion>
6
+    <parent>
7
+        <groupId>org.geekygoblin</groupId>
8
+        <artifactId>nedetlesmaki-playn</artifactId>
9
+        <version>0.4-SNAPSHOT</version>
10
+    </parent>
11 11
 
12
-  <artifactId>nedetlesmaki-playn-java</artifactId>
13
-  <packaging>jar</packaging>
14
-  <name>nedetlesmaki-playn-java</name>
12
+    <artifactId>nedetlesmaki-playn-java</artifactId>
13
+    <packaging>jar</packaging>
14
+    <name>nedetlesmaki-playn-java</name>
15 15
 
16
-  <properties>
17
-    <mainClass>org.geekygoblin.nedetlesmaki.playn.java.NedEtLesMakiPlaynGameJava</mainClass>
18
-  </properties>
16
+    <properties>
17
+        <mainClass>org.geekygoblin.nedetlesmaki.playn.java.NedEtLesMakiPlaynGameJava</mainClass>
18
+    </properties>
19 19
 
20
-  <dependencies>
21
-    <dependency>
22
-      <groupId>org.geekygoblin</groupId>
23
-      <artifactId>nedetlesmaki-playn-core</artifactId>
24
-      <version>${project.version}</version>
25
-    </dependency>
20
+    <dependencies>
21
+        <dependency>
22
+            <groupId>org.geekygoblin</groupId>
23
+            <artifactId>nedetlesmaki-playn-core</artifactId>
24
+        </dependency>
26 25
 
27
-    <dependency>
28
-      <groupId>org.geekygoblin</groupId>
29
-      <artifactId>nedetlesmaki-playn-assets</artifactId>
30
-      <version>${project.version}</version>
31
-    </dependency>
26
+        <dependency>
27
+            <groupId>org.geekygoblin</groupId>
28
+            <artifactId>nedetlesmaki-playn-assets</artifactId>
29
+        </dependency>
32 30
 
33
-    <dependency>
34
-      <groupId>com.googlecode.playn</groupId>
35
-      <artifactId>playn-java</artifactId>
36
-      <version>${playn.version}</version>
37
-    </dependency>
38
-  </dependencies>
31
+        <dependency>
32
+            <groupId>com.googlecode.playn</groupId>
33
+            <artifactId>playn-java</artifactId>
34
+        </dependency>
35
+    </dependencies>
39 36
 
40
-  <build>
41
-    <plugins>
42
-      <!-- builds a standalone jar file during 'mvn package' -->
43
-      <plugin>
44
-        <artifactId>maven-assembly-plugin</artifactId>
45
-        <version>2.4</version>
46
-        <configuration>
47
-          <descriptorRefs>
48
-            <descriptorRef>jar-with-dependencies</descriptorRef>
49
-          </descriptorRefs>
50
-          <archive>
51
-            <manifest>
52
-              <mainClass>${mainClass}</mainClass>
53
-            </manifest>
54
-          </archive>
55
-        </configuration>
56
-        <executions>
57
-          <execution>
58
-            <id>make-assembly</id>
59
-            <phase>package</phase>
60
-            <goals>
61
-              <goal>single</goal>
62
-            </goals>
63
-          </execution>
64
-        </executions>
65
-      </plugin>
66
-    </plugins>
67
-  </build>
68
-
69
-  <profiles>
70
-    <profile>
71
-      <id>java</id>
72
-      <build>
37
+    <build>
73 38
         <plugins>
74
-          <!-- allows testing of Java backend via: mvn test -Pjava -->
75
-          <plugin>
76
-            <groupId>org.codehaus.mojo</groupId>
77
-            <artifactId>exec-maven-plugin</artifactId>
78
-            <version>1.2.1</version>
79
-            <executions>
80
-              <execution>
81
-                <phase>test</phase>
82
-                <goals>
83
-                  <goal>java</goal>
84
-                </goals>
85
-              </execution>
86
-            </executions>
87
-            <configuration>
88
-              <mainClass>${mainClass}</mainClass>
89
-            </configuration>
90
-          </plugin>
39
+            <plugin>
40
+                <artifactId>maven-compiler-plugin</artifactId>
41
+            </plugin>
42
+            <!-- builds a standalone jar file during 'mvn package' -->
43
+            <plugin>
44
+                <artifactId>maven-assembly-plugin</artifactId>
45
+                <version>2.4</version>
46
+                <configuration>
47
+                    <descriptorRefs>
48
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
49
+                    </descriptorRefs>
50
+                    <archive>
51
+                        <manifest>
52
+                            <mainClass>${mainClass}</mainClass>
53
+                        </manifest>
54
+                    </archive>
55
+                </configuration>
56
+                <executions>
57
+                    <execution>
58
+                        <id>make-assembly</id>
59
+                        <phase>package</phase>
60
+                        <goals>
61
+                            <goal>single</goal>
62
+                        </goals>
63
+                    </execution>
64
+                </executions>
65
+            </plugin>
91 66
         </plugins>
92
-      </build>
93
-    </profile>
94
-  </profiles>
67
+    </build>
68
+
69
+    <profiles>
70
+        <profile>
71
+            <id>java</id>
72
+            <build>
73
+                <plugins>
74
+                    <!-- allows testing of Java backend via: mvn test -Pjava -->
75
+                    <plugin>
76
+                        <groupId>org.codehaus.mojo</groupId>
77
+                        <artifactId>exec-maven-plugin</artifactId>
78
+                        <version>1.2.1</version>
79
+                        <executions>
80
+                            <execution>
81
+                                <phase>test</phase>
82
+                                <goals>
83
+                                    <goal>java</goal>
84
+                                </goals>
85
+                            </execution>
86
+                        </executions>
87
+                        <configuration>
88
+                            <mainClass>${mainClass}</mainClass>
89
+                        </configuration>
90
+                    </plugin>
91
+                </plugins>
92
+            </build>
93
+        </profile>
94
+    </profiles>
95 95
 </project>
... ...
@@ -25,6 +25,36 @@
25 25
         <module>packages/rpm64</module>
26 26
         <module>playn/nedetlesmaki-playn</module>
27 27
     </modules>
28
+    <build>
29
+        <pluginManagement>
30
+            <plugins>
31
+                <plugin>
32
+                    <artifactId>maven-compiler-plugin</artifactId>
33
+                    <version>3.1</version>
34
+                    <configuration>
35
+                        <!--<compilerArgument>-Xlint:unchecked</compilerArgument>-->
36
+                        <source>1.6</source>
37
+                        <target>1.6</target>
38
+                    </configuration>
39
+                </plugin>
40
+                <plugin>
41
+                    <groupId>org.apache.maven.plugins</groupId>
42
+                    <artifactId>maven-source-plugin</artifactId>
43
+                    <version>2.2.1</version>
44
+                    <!-- build a -sources.jar always, rather than only on deploy -->
45
+                    <executions>
46
+                        <execution>
47
+                            <id>attach-sources</id>
48
+                            <phase>generate-resources</phase>
49
+                            <goals>
50
+                                <goal>jar-no-fork</goal>
51
+                            </goals>
52
+                        </execution>
53
+                    </executions>
54
+                </plugin>
55
+            </plugins>
56
+        </pluginManagement>
57
+    </build>
28 58
     <dependencyManagement>
29 59
         <dependencies>
30 60
             <dependency>
... ...
@@ -147,11 +177,6 @@
147 147
             <dependency>
148 148
                 <groupId>org.geekygoblin</groupId>
149 149
                 <artifactId>nedetlesmaki-core</artifactId>
150
-                <version>${project.version}</version>
151
-            </dependency>
152
-            <dependency>
153
-                <groupId>org.geekygoblin</groupId>
154
-                <artifactId>nedetlesmaki-core</artifactId>
155 150
                 <classifier>sources</classifier>
156 151
                 <version>${project.version}</version>
157 152
             </dependency>