KYLO-3234: add maven version requirement

askmetoo · Dec 20, 2018 · 02d2a75 · 02d2a75
1 parent aef7ffd
commit 02d2a75
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 53 deletions.
diff --git a/commons/commons-jpa/pom.xml b/commons/commons-jpa/pom.xml
@@ -51,4 +51,4 @@
       <artifactId>commons-lang3</artifactId>
     </dependency>
   </dependencies>
-</project>
+</project>
diff --git a/commons/commons-spark/pom.xml b/commons/commons-spark/pom.xml
@@ -30,21 +30,18 @@
     <module>commons-spark-shell-v2</module>
     <module>commons-spark-shell-plugin-shared</module>
   </modules>
-
+  
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven.compiler.plugin.version}</version>
-          <configuration>
-            <source>${spark.java.version}</source>
-            <target>${spark.java.version}</target>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven.compiler.plugin.version}</version>
+        <configuration>
+          <source>${spark.java.version}</source>
+          <target>${spark.java.version}</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
-
 </project>
diff --git a/commons/commons-test-persistence/pom.xml b/commons/commons-test-persistence/pom.xml
@@ -81,4 +81,6 @@
       <optional>true</optional>
     </dependency>
   </dependencies>
+
+
 </project>
diff --git a/core/file-metadata/file-metadata-model/pom.xml b/core/file-metadata/file-metadata-model/pom.xml
@@ -12,8 +12,4 @@
   <properties>
     <plugin.license.parentRelative>../../../</plugin.license.parentRelative>
   </properties>
-
-  <dependencies>
-  </dependencies>
-
 </project>
diff --git a/core/file-metadata/pom.xml b/core/file-metadata/pom.xml
@@ -20,18 +20,17 @@
   </modules>
 
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven.compiler.plugin.version}</version>
-          <configuration>
-            <source>${spark.java.version}</source>
-            <target>${spark.java.version}</target>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven.compiler.plugin.version}</version>
+        <configuration>
+          <source>${spark.java.version}</source>
+          <target>${spark.java.version}</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
+
 </project>
diff --git a/integrations/spark/pom.xml b/integrations/spark/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.4.1</version>
+        <version>${plugin.enforcer.version}</version>
         <dependencies>
           <dependency>
             <groupId>org.codehaus.mojo</groupId>

diff --git a/integrations/spark/spark-file-metadata/pom.xml b/integrations/spark/spark-file-metadata/pom.xml
@@ -22,4 +22,5 @@
     <module>spark-file-metadata-spark-v2</module>
     <module>spark-file-metadata-core</module>
   </modules>
+
 </project>
diff --git a/integrations/spark/spark-file-metadata/spark-file-metadata-core/pom.xml b/integrations/spark/spark-file-metadata/spark-file-metadata-core/pom.xml
@@ -73,9 +73,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-    </plugins>
-  </build>
-
 </project>
diff --git a/pom.xml b/pom.xml
@@ -97,8 +97,6 @@
     <java.version>1.8</java.version>
     <spark.java.version>1.7</spark.java.version>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <skipTests>false</skipTests>
     <skipITs>${skipTests}</skipITs>
     <skipUTs>${skipTests}</skipUTs>
     <skipDebian>false</skipDebian>
@@ -190,6 +188,8 @@
     <!-- Plugin Versions -->
     <plugin.license.version>1.16</plugin.license.version>
 
+    <plugin.enforcer.version>1.4.1</plugin.enforcer.version>
+
     <liquibase.version>3.5.3</liquibase.version>
     <!--<liquibase.version>3.3.5</liquibase.version>-->
     <liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
@@ -1111,6 +1111,35 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>${plugin.enforcer.version}</version>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>3.3.9</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven.compiler.plugin.version}</version>
+        <configuration>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>

diff --git a/security/security-api/pom.xml b/security/security-api/pom.xml
@@ -11,17 +11,11 @@
     <plugin.license.parentRelative>../../</plugin.license.parentRelative>
   </properties>
   <dependencies>
-  <dependency>
-    <groupId>com.thinkbiganalytics.kylo</groupId>
-    <artifactId>kylo-commons-security</artifactId>
-    <version>${project.version}</version>
-  </dependency>
-  <!-- 
-  <dependency>
-    <groupId>com.thinkbiganalytics.kylo</groupId>
-    <artifactId>kylo-metadata-api</artifactId>
-    <version>${project.version}</version>
-  </dependency>
-   -->
+    <dependency>
+      <groupId>com.thinkbiganalytics.kylo</groupId>
+      <artifactId>kylo-commons-security</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
+
 </project>