[Pkg-freeipa-devel] [Git][freeipa-team/jss][master] 2 commits: support-jdk8.diff: Build with -target/-source 1.8.

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at FreeIPA packaging / jss


Commits:
1e579140 by Timo Aaltonen at 2019-04-24T17:27:25Z
support-jdk8.diff: Build with -target/-source 1.8.

- - - - -
c7bdeabb by Timo Aaltonen at 2019-04-24T18:05:40Z
releasing package jss version 4.5.3-2

- - - - -


3 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/support-jdk8.diff


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+jss (4.5.3-2) experimental; urgency=medium
+
+  * support-jdk8.diff: Build with -target/-source 1.8.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 24 Apr 2019 21:05:34 +0300
+
 jss (4.5.3-1) experimental; urgency=medium
 
   * New upstream release.


=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-#placeholder
+support-jdk8.diff


=====================================
debian/patches/support-jdk8.diff
=====================================
@@ -0,0 +1,42 @@
+From 76b80d261cc57dd3ce3b56e1e6de0311c6855073 Mon Sep 17 00:00:00 2001
+From: Alexander Scheel <ascheel at redhat.com>
+Date: Wed, 24 Apr 2019 13:04:16 -0400
+Subject: [PATCH] Use JDK8 as the source and target release
+
+Signed-off-by: Alexander Scheel <ascheel at redhat.com>
+---
+ cmake/JSSConfig.cmake | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/cmake/JSSConfig.cmake b/cmake/JSSConfig.cmake
+index fcbd3742..45fd8648 100644
+--- a/cmake/JSSConfig.cmake
++++ b/cmake/JSSConfig.cmake
+@@ -249,6 +249,13 @@ macro(jss_config_java)
+     list(APPEND JSS_JAVAC_FLAGS "${JAVAC_CLASSPATH}")
+     list(APPEND JSS_JAVAC_FLAGS "-sourcepath")
+     list(APPEND JSS_JAVAC_FLAGS "${PROJECT_SOURCE_DIR}")
++
++    # Ensure we're compatible with JDK 8
++    list(APPEND JSS_JAVAC_FLAGS "-target")
++    list(APPEND JSS_JAVAC_FLAGS "1.8")
++    list(APPEND JSS_JAVAC_FLAGS "-source")
++    list(APPEND JSS_JAVAC_FLAGS "1.8")
++
+     if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+         list(APPEND JSS_JAVAC_FLAGS "-g")
+     else()
+@@ -260,6 +267,13 @@ macro(jss_config_java)
+     list(APPEND JSS_TEST_JAVAC_FLAGS "${JAVAC_CLASSPATH}:${JUNIT4_JAR}")
+     list(APPEND JSS_TEST_JAVAC_FLAGS "-sourcepath")
+     list(APPEND JSS_TEST_JAVAC_FLAGS "${PROJECT_SOURCE_DIR}")
++
++    # Ensure we're compatible with JDK 8
++    list(APPEND JSS_TEST_JAVAC_FLAGS "-target")
++    list(APPEND JSS_TEST_JAVAC_FLAGS "1.8")
++    list(APPEND JSS_TEST_JAVAC_FLAGS "-source")
++    list(APPEND JSS_TEST_JAVAC_FLAGS "1.8")
++
+     if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+         list(APPEND JSS_TEST_JAVAC_FLAGS "-g")
+     else()



View it on GitLab: https://salsa.debian.org/freeipa-team/jss/compare/eccdbee2aa9460807ad4526321547d6d9cd20c7f...c7bdeabbdd0e4056be9777482b9e95799240b840

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/jss/compare/eccdbee2aa9460807ad4526321547d6d9cd20c7f...c7bdeabbdd0e4056be9777482b9e95799240b840
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20190424/debe83a9/attachment-0001.html>