From 549b9d9ef49e0f663cc6b847fa457d47452d1938 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 19 Jun 2017 11:19:57 +0200
Subject: [PATCH] [MASSEMBLY-860] Upgrade to Java 7

---
 maven-assembly-plugin/pom.xml | 1 +
 pom.xml                       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/maven-assembly-plugin/pom.xml b/maven-assembly-plugin/pom.xml
index d74a744d09..2fc2a7649f 100644
--- a/maven-assembly-plugin/pom.xml
+++ b/maven-assembly-plugin/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index db469f0115..e7bc8f3d1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>