From a419a51916073c5ed9727f9bf0d533bf557bcfce Mon Sep 17 00:00:00 2001
From: Alexander Pyhalov <apyhalov@gmail.com>
Date: Sat, 04 Mar 2017 12:11:47 +0100
Subject: [PATCH] Make Java 8 the default one
---
make-rules/shared-macros.mk | 3 ++-
components/runtime/openjdk-8/Makefile | 1 +
components/runtime/openjdk-8/openjdk8-runtime.p5m | 2 +-
components/runtime/openjdk-7/Makefile | 2 +-
components/runtime/openjdk-7/openjdk7-runtime.p5m | 1 -
transforms/defaults | 2 +-
6 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/components/runtime/openjdk-7/Makefile b/components/runtime/openjdk-7/Makefile
index 5f25ea1..cdf295b 100644
--- a/components/runtime/openjdk-7/Makefile
+++ b/components/runtime/openjdk-7/Makefile
@@ -19,7 +19,7 @@
OPENJDK_BUILD_NUMBER=80
COMPONENT_VERSION=1.7.$(OPENJDK_BUILD_NUMBER)
-COMPONENT_REVISION=3
+COMPONENT_REVISION=4
COMPONENT_SUMMARY= Open-source implementation of the Java Platform, Standard Edition
COMPONENT_SRC= openjdk
COMPONENT_ARCHIVE= openjdk-$(COMPONENT_VERSION)-20150609.tar.xz
diff --git a/components/runtime/openjdk-7/openjdk7-runtime.p5m b/components/runtime/openjdk-7/openjdk7-runtime.p5m
index 3a86969..3b35944 100644
--- a/components/runtime/openjdk-7/openjdk7-runtime.p5m
+++ b/components/runtime/openjdk-7/openjdk7-runtime.p5m
@@ -38,7 +38,6 @@
link path=usr/bin/rmiregistry target=../jdk/instances/openjdk1.7.0/bin/rmiregistry mediator=java mediator-version=7
link path=usr/bin/servertool target=../jdk/instances/openjdk1.7.0/bin/servertool mediator=java mediator-version=7
link path=usr/bin/tnameserv target=../jdk/instances/openjdk1.7.0/bin/tnameserv mediator=java mediator-version=7
-link path=usr/java target=jdk/openjdk1.7.0 mediator=java mediator-version=7
# Generated section:
file path=usr/jdk/instances/openjdk1.7.0/bin/java mode=0555
diff --git a/components/runtime/openjdk-8/Makefile b/components/runtime/openjdk-8/Makefile
index 5092d59..22af6b7 100644
--- a/components/runtime/openjdk-8/Makefile
+++ b/components/runtime/openjdk-8/Makefile
@@ -19,6 +19,7 @@
OPENJDK_BUILD_NUMBER=112
COMPONENT_VERSION=1.8.$(OPENJDK_BUILD_NUMBER)
+COMPONENT_REVISION=1
COMPONENT_SUMMARY= Open-source implementation of the Java Platform, Standard Edition
COMPONENT_SRC= openjdk
COMPONENT_ARCHIVE= openjdk-$(COMPONENT_VERSION)-20161027.tar.xz
diff --git a/components/runtime/openjdk-8/openjdk8-runtime.p5m b/components/runtime/openjdk-8/openjdk8-runtime.p5m
index 1f1e576..592999d 100644
--- a/components/runtime/openjdk-8/openjdk8-runtime.p5m
+++ b/components/runtime/openjdk-8/openjdk8-runtime.p5m
@@ -40,7 +40,7 @@
link path=usr/bin/rmiregistry target=../jdk/instances/openjdk1.8.0/bin/rmiregistry mediator=java mediator-version=8
link path=usr/bin/servertool target=../jdk/instances/openjdk1.8.0/bin/servertool mediator=java mediator-version=8
link path=usr/bin/tnameserv target=../jdk/instances/openjdk1.8.0/bin/tnameserv mediator=java mediator-version=8
-link path=usr/java target=jdk/openjdk1.8.0 mediator=java mediator-version=8
+link path=usr/java target=jdk/openjdk1.8.0
# Generated section:
file path=usr/jdk/instances/openjdk1.8.0/bin/java mode=0555
diff --git a/make-rules/shared-macros.mk b/make-rules/shared-macros.mk
index d048b36..03f503b 100644
--- a/make-rules/shared-macros.mk
+++ b/make-rules/shared-macros.mk
@@ -614,7 +614,8 @@
PYTHON_DATA= $(PYTHON_LIB)
JAVA7_HOME = /usr/jdk/instances/openjdk1.7.0
-JAVA_HOME = $(JAVA7_HOME)
+JAVA8_HOME = /usr/jdk/instances/openjdk1.8.0
+JAVA_HOME = $(JAVA8_HOME)
# This is the default BUILD version of perl
# Not necessarily the system's default version, i.e. /usr/bin/perl
diff --git a/transforms/defaults b/transforms/defaults
index 34d49d1..d5ae76e 100644
--- a/transforms/defaults
+++ b/transforms/defaults
@@ -159,7 +159,7 @@
#
# Set the default Java for mediated links
#
-<transform link mediator=java mediator-version=7 -> default mediator-priority vendor>
+<transform link mediator=java mediator-version=8 -> default mediator-priority vendor>
#
# Add a facet.version-lock.{package} to each 'optional' consolidation
--
Gitblit v1.9.3