You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2019/07/09 13:46:16 UTC
[griffin] branch master updated: [GRIFFIN-264] Clean up maven
dependencies in pom.xml
This is an automated email from the ASF dual-hosted git repository.
guoyp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/griffin.git
The following commit(s) were added to refs/heads/master by this push:
new 7c5ac89 [GRIFFIN-264] Clean up maven dependencies in pom.xml
7c5ac89 is described below
commit 7c5ac8920009d7e112db3e55134f5eb64f74c950
Author: Johnnie <jo...@gmail.com>
AuthorDate: Tue Jul 9 21:45:58 2019 +0800
[GRIFFIN-264] Clean up maven dependencies in pom.xml
clean up the maven pom.xml files
Author: Johnnie <jo...@gmail.com>
Author: Johnnie Zhang <yi...@ebay.com>
Closes #508 from joohnnie/master.
---
measure/pom.xml | 21 ++-------------------
pom.xml | 19 ++++++++++---------
service/pom.xml | 26 ++++++++++----------------
ui/pom.xml | 9 ---------
4 files changed, 22 insertions(+), 53 deletions(-)
diff --git a/measure/pom.xml b/measure/pom.xml
index c8a98b5..39a12c8 100644
--- a/measure/pom.xml
+++ b/measure/pom.xml
@@ -33,20 +33,13 @@ under the License.
<url>http://maven.apache.org</url>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
-
<scala.version>2.11.8</scala.version>
<spark.version>2.2.1</spark.version>
<scala.binary.version>2.11</scala.binary.version>
-
<avro.version>1.7.7</avro.version>
<jackson.version>2.8.7</jackson.version>
<scalaj.version>2.3.0</scalaj.version>
<mongo.version>2.1.0</mongo.version>
- <junit.version>4.11</junit.version>
<scalatest.version>3.0.0</scalatest.version>
<slf4j.version>1.7.21</slf4j.version>
<log4j.version>1.2.16</log4j.version>
@@ -127,11 +120,7 @@ under the License.
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-simple</artifactId>-->
- <!--<version>${slf4j.version}</version>-->
- <!--</dependency>-->
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -154,8 +143,6 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
</dependency>
<!--scala test-->
@@ -219,12 +206,8 @@ under the License.
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index bb25869..310d1c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,9 +75,6 @@ under the License.
</mailingList>
</mailingLists>
- <!--<pluginRepositories>-->
- <!--</pluginRepositories>-->
-
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/griffin.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/griffin.git</developerConnection>
@@ -95,6 +92,16 @@ under the License.
<module>measure</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<pluginManagement>
@@ -167,13 +174,7 @@ under the License.
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- </plugins>
</build>
</project>
\ No newline at end of file
diff --git a/service/pom.xml b/service/pom.xml
index ab38a23..511c811 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -32,14 +32,12 @@ under the License.
<name>Apache Griffin :: Web Service</name>
<properties>
- <java.version>1.8</java.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>2.7.1</hadoop.version>
<hive.version>2.2.0</hive.version>
<scala.version>2.10</scala.version>
<spring.boot.version>1.5.1.RELEASE</spring.boot.version>
<confluent.version>3.2.0</confluent.version>
- <quartz.version>2.2.1</quartz.version>
+ <quartz.version>2.2.2</quartz.version>
<start-class>org.apache.griffin.core.GriffinWebApplication</start-class>
<powermock.version>1.6.6</powermock.version>
<mockito.version>1.10.19</mockito.version>
@@ -48,6 +46,9 @@ under the License.
<eclipselink.version>2.6.0</eclipselink.version>
<mysql.java.version>5.1.47</mysql.java.version>
<postgresql.version>9.4.1212.jre7</postgresql.version>
+ <livy.core.version>0.3.0</livy.core.version>
+ <elasticsearch-rest-client.version>6.2.4</elasticsearch-rest-client.version>
+ <jackson-databind.version>2.6.3</jackson-databind.version>
</properties>
<repositories>
@@ -57,7 +58,6 @@ under the License.
</repository>
</repositories>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -127,7 +127,7 @@ under the License.
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.6.3</version>
+ <version>${jackson-databind.version}</version>
</dependency>
<!-- to access metastore from hive-->
@@ -182,19 +182,19 @@ under the License.
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.2.2</version>
+ <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz-jobs</artifactId>
- <version>2.2.2</version>
+ <version>${quartz.version}</version>
</dependency>
<!--livy-core-->
<dependency>
<groupId>com.cloudera.livy</groupId>
- <artifactId>livy-core_2.10</artifactId>
- <version>0.3.0</version>
+ <artifactId>livy-core_${scala.version}</artifactId>
+ <version>${livy.core.version}</version>
</dependency>
<!-- test -->
@@ -207,7 +207,6 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
@@ -226,7 +225,7 @@ under the License.
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
- <version>6.2.4</version>
+ <version>${elasticsearch-rest-client.version}</version>
</dependency>
</dependencies>
<profiles>
@@ -315,11 +314,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/ui/pom.xml b/ui/pom.xml
index 8993b07..d42cb6a 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -34,7 +34,6 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.8</java.version>
<node.version>v6.11.3</node.version>
<npm.version>3.10.10</npm.version>
</properties>
@@ -44,12 +43,9 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -137,11 +133,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
</plugin>
</plugins>
</build>