svn commit: r1799186 - in /maven/plugins/trunk: maven-assembly-plugin/pom.xml pom.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1799186 - in /maven/plugins/trunk: maven-assembly-plugin/pom.xml pom.xml

michaelo
Author: michaelo
Date: Mon Jun 19 12:07:32 2017
New Revision: 1799186

URL: http://svn.apache.org/viewvc?rev=1799186&view=rev
Log:
[MASSEMBLY-860] Upgrade to Java 7

This closes #117

Modified:
    maven/plugins/trunk/maven-assembly-plugin/pom.xml
    maven/plugins/trunk/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1799186&r1=1799185&r2=1799186&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Mon Jun 19 12:07:32 2017
@@ -57,6 +57,7 @@ under the License.
   </distributionManagement>
 
   <properties>
+    <javaVersion>7</javaVersion>
     <mdoVersion>2.0.0</mdoVersion>
     <mavenArchiverVersion>3.1.1</mavenArchiverVersion>
     <mavenFilteringVersion>3.1.1</mavenFilteringVersion>

Modified: maven/plugins/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=1799186&r1=1799185&r2=1799186&view=diff
==============================================================================
--- maven/plugins/trunk/pom.xml (original)
+++ maven/plugins/trunk/pom.xml Mon Jun 19 12:07:32 2017
@@ -125,6 +125,7 @@ under the License.
       <!-- For plugins that require at least Java 7 to build -->
       <id>java-7</id>
       <modules>
+        <module>maven-assembly-plugin</module>
         <module>maven-checkstyle-plugin</module>
         <module>maven-pmd-plugin</module>
       </modules>
@@ -162,7 +163,6 @@ under the License.
         <jdk>[1.6,)</jdk>
       </activation>
       <modules>
-        <module>maven-assembly-plugin</module>
         <module>maven-dependency-plugin</module>
       </modules>
     </profile>