Repository: struts
Updated Branches:
  refs/heads/master ef9c66118 -> fb527e4f4


Sets proper java target version


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fb527e4f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fb527e4f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fb527e4f

Branch: refs/heads/master
Commit: fb527e4f4efed0c6e43717ad525453ce8a0b7d59
Parents: ef9c661
Author: Lukasz Lenart <lukaszlen...@apache.org>
Authored: Mon Aug 8 08:51:27 2016 +0200
Committer: Lukasz Lenart <lukaszlen...@apache.org>
Committed: Mon Aug 8 08:51:54 2016 +0200

----------------------------------------------------------------------
 apps/rest-showcase/pom.xml |  7 -------
 core/pom.xml               |  8 --------
 plugins/gxp/pom.xml        | 13 -------------
 pom.xml                    | 17 ++++++++---------
 4 files changed, 8 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/fb527e4f/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index f017bd0..40f1cf9 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -99,13 +99,6 @@
         <finalName>struts2-rest-showcase</finalName>
         <plugins>
             <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <version>8.1.16.v20140903</version>

http://git-wip-us.apache.org/repos/asf/struts/blob/fb527e4f/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6c696c5..9c318ba 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -41,14 +41,6 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.6</version>
                 <configuration>

http://git-wip-us.apache.org/repos/asf/struts/blob/fb527e4f/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 84d985c..42564ff 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -23,19 +23,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

http://git-wip-us.apache.org/repos/asf/struts/blob/fb527e4f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f204871..6ada190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,15 +179,6 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.3</version>
-                    <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>2.19.1</version>
                     <configuration>
@@ -232,6 +223,14 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
             </plugin>
             <plugin>

Reply via email to