KYLO-3119: cleaned up remaining module definitions for v7 java

adeagbot · Dec 6, 2018 · d9e518e · d9e518e
1 parent 998e800
commit d9e518e
Show file tree

Hide file tree

Showing 22 changed files with 122 additions and 125 deletions.
diff --git a/core/classname-change/classname-change-api/pom.xml b/core/classname-change/classname-change-api/pom.xml
@@ -58,7 +58,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>${maven.compiler.plugin.version}</version>
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>

diff --git a/core/field-policy/pom.xml b/core/field-policy/pom.xml
@@ -21,10 +21,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>${maven.compiler.plugin.version}</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>${spark.java.version}</source>
+          <target>${spark.java.version}</target>
         </configuration>
       </plugin>
     </plugins>

diff --git a/core/file-metadata/file-metadata-util/pom.xml b/core/file-metadata/file-metadata-util/pom.xml
@@ -50,17 +50,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>provided</scope>
     </dependency>
-
   </dependencies>
 
-  <!--
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-  -->
 </project>
diff --git a/core/kerberos/kerberos-core/pom.xml b/core/kerberos/kerberos-core/pom.xml
@@ -16,7 +16,6 @@
   </properties>
 
   <dependencies>
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -88,39 +87,17 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
-
-
   </dependencies>
 
   <build>
     <plugins>
-      <!--plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>com.thinkbiganalytics.kerberos.KerberosTicketGeneratorGenerator</mainClass>
-                </transformer>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>${maven.compiler.plugin.version}</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>${spark.java.version}</source>
+          <target>${spark.java.version}</target>
         </configuration>
       </plugin>
     </plugins>

diff --git a/core/kerberos/kerberos-test-client/pom.xml b/core/kerberos/kerberos-test-client/pom.xml
@@ -180,15 +180,17 @@
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>${maven.compiler.plugin.version}</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>${spark.java.version}</source>
+          <target>${spark.java.version}</target>
         </configuration>
       </plugin>
+
     </plugins>
   </build>
 

diff --git a/core/nifi-provenance/nifi-provenance-constants/pom.xml b/core/nifi-provenance/nifi-provenance-constants/pom.xml
@@ -15,32 +15,29 @@
   </properties>
 
   <dependencies>
-
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
-
-
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>${maven.compiler.plugin.version}</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>${spark.java.version}</source>
+          <target>${spark.java.version}</target>
         </configuration>
       </plugin>
+
     </plugins>
   </build>
 </project>
diff --git a/core/nifi-provenance/nifi-provenance-model/pom.xml b/core/nifi-provenance/nifi-provenance-model/pom.xml
@@ -14,53 +14,42 @@
     <plugin.license.parentRelative>../../../</plugin.license.parentRelative>
   </properties>
 
-
   <dependencies>
-
     <dependency>
       <groupId>com.thinkbiganalytics.kylo</groupId>
       <artifactId>kylo-nifi-provenance-constants</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
-
-
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
     </dependency>
-
-
   </dependencies>
 
   <build>
-<plugins>
-  <plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-compiler-plugin</artifactId>
-    <version>3.2</version>
-    <configuration>
-      <source>1.7</source>
-      <target>1.7</target>
-    </configuration>
-  </plugin>
-
-</plugins>
-
+    <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/core/schema-discovery/pom.xml b/core/schema-discovery/pom.xml
@@ -20,7 +20,20 @@
   </modules>
 
   <dependencies>
-
   </dependencies>
 
+  <build>
+    <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/core/schema-discovery/schema-discovery-api/pom.xml b/core/schema-discovery/schema-discovery-api/pom.xml
@@ -45,18 +45,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/core/schema-discovery/schema-discovery-rdbms/pom.xml b/core/schema-discovery/schema-discovery-rdbms/pom.xml
@@ -11,8 +11,6 @@
     <version>0.10.1-SNAPSHOT</version>
   </parent>
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
     <plugin.license.parentRelative>../../../</plugin.license.parentRelative>
   </properties>
 

diff --git a/core/ui-annotation/pom.xml b/core/ui-annotation/pom.xml
@@ -23,10 +23,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>${maven.compiler.plugin.version}</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>${spark.java.version}</source>
+          <target>${spark.java.version}</target>
         </configuration>
       </plugin>
     </plugins>

diff --git a/install/install-inspector/install-inspector-app/pom.xml b/install/install-inspector/install-inspector-app/pom.xml
@@ -42,7 +42,6 @@
 
         <!-- Plugin versions -->
         <maven-clean-plugin.version>2.6.1</maven-clean-plugin.version>
-        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
         <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
         <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
         <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
@@ -187,7 +186,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
+                <version>${maven.compiler.plugin.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/integrations/input-format/pom.xml b/integrations/input-format/pom.xml
@@ -23,13 +23,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>${maven.compiler.plugin.version}</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>${spark.java.version}</source>
+          <target>${spark.java.version}</target>
         </configuration>
       </plugin>
-
     </plugins>
   </build>
 

diff --git a/plugins/catalog-credential-vault/pom.xml b/plugins/catalog-credential-vault/pom.xml
@@ -103,7 +103,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>${maven.compiler.plugin.version}</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>

diff --git a/plugins/field-policy-default/pom.xml b/plugins/field-policy-default/pom.xml
@@ -35,17 +35,19 @@
       <artifactId>commons-codec</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>${maven.compiler.plugin.version}</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>${spark.java.version}</source>
+          <target>${spark.java.version}</target>
         </configuration>
       </plugin>
+
     </plugins>
   </build>
 

diff --git a/plugins/jms-service-activemq/pom.xml b/plugins/jms-service-activemq/pom.xml
@@ -68,10 +68,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>${maven.compiler.plugin.version}</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
         </configuration>
       </plugin>
     </plugins>

diff --git a/services/catalog-service/catalog-model/pom.xml b/services/catalog-service/catalog-model/pom.xml
@@ -14,8 +14,6 @@
 
   <properties>
     <plugin.license.parentRelative>../../../</plugin.license.parentRelative>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -48,4 +46,18 @@
       <artifactId>guava</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <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>