[
https://issues.apache.org/jira/browse/AMBARI-24692?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16645418#comment-16645418
]
ASF GitHub Bot commented on AMBARI-24692:
-----------------------------------------
oleewere closed pull request #7: AMBARI-24692. Use jdk8 as default compiler
version
URL: https://github.com/apache/ambari-logsearch/pull/7
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Makefile b/Makefile
index 16d3782b6d..6ad38e40c9 100644
--- a/Makefile
+++ b/Makefile
@@ -19,59 +19,41 @@ else
LOGSEARCH_BUILD_DOCKER_TAG = "latest"
endif
+ifeq ("$(LOGSEARCH_JDK_11)", "true")
+ LOGSEARCH_JAVA_VERSION = "11"
+else
+ LOGSEARCH_JAVA_VERSION = "1.8"
+endif
+
package:
- $(MAVEN_BINARY) clean package
+ $(MAVEN_BINARY) clean package -Djdk.version=$(LOGSEARCH_JAVA_VERSION)
install:
- $(MAVEN_BINARY) clean install -DskipTests
+ $(MAVEN_BINARY) clean install -DskipTests
-Djdk.version=$(LOGSEARCH_JAVA_VERSION)
be:
- $(MAVEN_BINARY) clean package -Pbe
+ $(MAVEN_BINARY) clean package -Pbe
-Djdk.version=$(LOGSEARCH_JAVA_VERSION)
fe:
- $(MAVEN_BINARY) clean package -Pfe
+ $(MAVEN_BINARY) clean package -Pfe
-Djdk.version=$(LOGSEARCH_JAVA_VERSION)
test:
- $(MAVEN_BINARY) clean test
+ $(MAVEN_BINARY) clean test -Djdk.version=$(LOGSEARCH_JAVA_VERSION)
rpm:
- $(MAVEN_BINARY) clean package -Dbuild-rpm -DskipTests
+ $(MAVEN_BINARY) clean package -Dbuild-rpm -DskipTests
-Djdk.version=$(LOGSEARCH_JAVA_VERSION)
deb:
- $(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests
+ $(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests
-Djdk.version=$(LOGSEARCH_JAVA_VERSION)
update-version:
$(MAVEN_BINARY) versions:set -DnewVersion=$(new-version)
-DgenerateBackupPoms=false
-package-jdk8:
- $(MAVEN_BINARY) clean package -Djdk.version=1.8
-
-install-jdk8:
- $(MAVEN_BINARY) clean install -DskipTests -Djdk.version=1.8
-
-be-jdk8:
- $(MAVEN_BINARY) clean package -Pbe -Djdk.version=1.8
-
-fe-jdk8:
- $(MAVEN_BINARY) clean package -Pfe -Djdk.version=1.8
-
-test-jdk8:
- $(MAVEN_BINARY) clean test -Djdk.version=1.8
-
-rpm-jdk8:
- $(MAVEN_BINARY) clean package -Dbuild-rpm -DskipTests -Djdk.version=1.8
-
-deb-jdk8:
- $(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests -Djdk.version=1.8
-
-javadoc:
- $(MAVEN_BINARY) javadoc:javadoc
-
docker-build:
- $(MAVEN_BINARY) clean package docker:build -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
+ $(MAVEN_BINARY) clean package docker:build -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
-Djdk.version=$(LOGSEARCH_JAVA_VERSION)
docker-push:
- $(MAVEN_BINARY) clean package docker:build docker:push -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
+ $(MAVEN_BINARY) clean package docker:build docker:push -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
-Djdk.version=$(LOGSEARCH_JAVA_VERSION)
docker-dev-start:
cd docker && docker-compose up -d
diff --git a/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
b/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
index b9141f0846..37f5b00fba 100755
--- a/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
+++ b/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
@@ -80,7 +80,12 @@ else
LOGFEEDER_GC_LOGFILE="$LOG_PATH_WITHOUT_SLASH/$LOGFEEDER_GC_LOGFILE"
fi
-LOGFEEDER_GC_OPTS="-Xlog:gc*:file=$LOGFEEDER_GC_LOGFILE:time"
+java_version=$($JVM -version 2>&1 | grep 'java version' | cut -d'"' -f2 | cut
-d'.' -f2)
+if [ $java_version == "8" ]; then
+ LOGFEEDER_GC_OPTS="-XX:+PrintGCDetails -XX:+PrintGCDateStamps
-Xloggc:$LOGFEEDER_GC_LOGFILE"
+else
+ LOGFEEDER_GC_OPTS="-Xlog:gc*:file=$LOGFEEDER_GC_LOGFILE:time"
+fi
function print_usage() {
cat << EOF
diff --git a/ambari-logsearch-server/src/main/scripts/logsearch.sh
b/ambari-logsearch-server/src/main/scripts/logsearch.sh
index 629e8f294c..acd183bff4 100755
--- a/ambari-logsearch-server/src/main/scripts/logsearch.sh
+++ b/ambari-logsearch-server/src/main/scripts/logsearch.sh
@@ -78,7 +78,12 @@ else
LOGSEARCH_GC_LOGFILE="$LOG_PATH_WITHOUT_SLASH/$LOGSEARCH_GC_LOGFILE"
fi
-LOGSEARCH_GC_OPTS="-Xlog:gc*:file=$LOGSEARCH_GC_LOGFILE:time"
+java_version=$($JVM -version 2>&1 | grep 'java version' | cut -d'"' -f2 | cut
-d'.' -f2)
+if [ $java_version == "8" ]; then
+ LOGSEARCH_GC_OPTS="-XX:+PrintGCDetails -XX:+PrintGCDateStamps
-Xloggc:$LOGSEARCH_GC_LOGFILE"
+else
+ LOGSEARCH_GC_OPTS="-Xlog:gc*:file=$LOGSEARCH_GC_LOGFILE:time"
+fi
function print_usage() {
cat << EOF
diff --git a/pom.xml b/pom.xml
index 649cf3ba91..e40b81e219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
</profile>
</profiles>
<properties>
- <jdk.version>11</jdk.version>
+ <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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> JDK 11 support for Log Search
> -----------------------------
>
> Key: AMBARI-24692
> URL: https://issues.apache.org/jira/browse/AMBARI-24692
> Project: Ambari
> Issue Type: Bug
> Components: ambari-logsearch
> Affects Versions: 2.7.0
> Reporter: Olivér Szabó
> Assignee: Olivér Szabó
> Priority: Major
> Labels: pull-request-available
> Fix For: 2.8.0
>
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
