You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/06/30 09:46:48 UTC
[32/33] ambari git commit: AMBARI-21369. Use JDK 8 compiler maven
plugin for Log Search and Infra projects (oleewere)
AMBARI-21369. Use JDK 8 compiler maven plugin for Log Search and Infra projects (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7c59fca
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7c59fca
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7c59fca
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: d7c59fca19770a8fb0e488371d2f460673f7e3d4
Parents: 7554509
Author: oleewere <ol...@gmail.com>
Authored: Fri Jun 30 11:33:21 2017 +0200
Committer: oleewere <ol...@gmail.com>
Committed: Fri Jun 30 11:35:08 2017 +0200
----------------------------------------------------------------------
ambari-infra/ambari-infra-manager/pom.xml | 1 -
ambari-infra/ambari-infra-solr-plugin/pom.xml | 4 ++--
ambari-infra/pom.xml | 2 +-
ambari-logsearch/ambari-logsearch-logfeeder/pom.xml | 4 ++--
ambari-logsearch/ambari-logsearch-server/pom.xml | 12 ++++++------
ambari-logsearch/pom.xml | 5 +++--
6 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7c59fca/ambari-infra/ambari-infra-manager/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-infra/ambari-infra-manager/pom.xml b/ambari-infra/ambari-infra-manager/pom.xml
index b7708c2..b9f2a77 100644
--- a/ambari-infra/ambari-infra-manager/pom.xml
+++ b/ambari-infra/ambari-infra-manager/pom.xml
@@ -38,7 +38,6 @@
<spring-data-solr.version>2.0.2.RELEASE</spring-data-solr.version>
<jjwt.version>0.6.0</jjwt.version>
<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
- <jdk.version>1.7</jdk.version>
<sqlite.version>3.8.11.2</sqlite.version>
</properties>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7c59fca/ambari-infra/ambari-infra-solr-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-infra/ambari-infra-solr-plugin/pom.xml b/ambari-infra/ambari-infra-solr-plugin/pom.xml
index c890cec..3337d99 100644
--- a/ambari-infra/ambari-infra-solr-plugin/pom.xml
+++ b/ambari-infra/ambari-infra-solr-plugin/pom.xml
@@ -47,8 +47,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7c59fca/ambari-infra/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-infra/pom.xml b/ambari-infra/pom.xml
index 07adb3e..4f5c29c 100644
--- a/ambari-infra/pom.xml
+++ b/ambari-infra/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<properties>
- <jdk.version>1.7</jdk.version>
+ <jdk.version>1.8</jdk.version>
<solr.version>5.5.2</solr.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<python.ver>python >= 2.6</python.ver>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7c59fca/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
index ae2150e..091f957 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
@@ -197,8 +197,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7c59fca/ambari-logsearch/ambari-logsearch-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-server/pom.xml b/ambari-logsearch/ambari-logsearch-server/pom.xml
index fc4029b..ebca2d5 100755
--- a/ambari-logsearch/ambari-logsearch-server/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-server/pom.xml
@@ -63,8 +63,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
</configuration>
</plugin>
<!-- Exec main class plugin -->
@@ -196,8 +196,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
</configuration>
</plugin>
<!-- Exec main class plugin -->
@@ -337,8 +337,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
</configuration>
</plugin>
<!-- Exec main class plugin -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7c59fca/ambari-logsearch/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/pom.xml b/ambari-logsearch/pom.xml
index af1dc6a..82943e4 100644
--- a/ambari-logsearch/pom.xml
+++ b/ambari-logsearch/pom.xml
@@ -39,6 +39,7 @@
<module>ambari-logsearch-it</module>
</modules>
<properties>
+ <jdk.version>1.8</jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<python.ver>python >= 2.6</python.ver>
<deb.python.ver>python (>= 2.6)</deb.python.ver>
@@ -82,8 +83,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
</configuration>
</plugin>
<plugin>