#1 Build with JDK8 compatibility
Merged 3 years ago by cipherboy. Opened 3 years ago by cipherboy.
rpms/ cipherboy/idm-console-framework jdk8-compat  into  master

@@ -0,0 +1,63 @@ 

+ From 175cbce177d6f060d201c34c2b4a69c332f0c09f Mon Sep 17 00:00:00 2001

+ From: Alexander Scheel <ascheel@redhat.com>

+ Date: Tue, 18 Aug 2020 08:33:03 -0400

+ Subject: [PATCH] Force JDK8 support for the time being

+ 

+ Signed-off-by: Alexander Scheel <ascheel@redhat.com>

+ ---

+  build.xml | 14 ++++++++------

+  1 file changed, 8 insertions(+), 6 deletions(-)

+ 

+ diff --git a/build.xml b/build.xml

+ index 41125ab..55519aa 100644

+ --- a/build.xml

+ +++ b/build.xml

+ @@ -7,12 +7,12 @@ This library is free software; you can redistribute it and/or

+  modify it under the terms of the GNU Lesser General Public

+  License as published by the Free Software Foundation version

+  2.1 of the License.

+ -                                                                                

+ +

+  This library is distributed in the hope that it will be useful,

+  but WITHOUT ANY WARRANTY; without even the implied warranty of

+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+  Lesser General Public License for more details.

+ -                                                                                

+ +

+  You should have received a copy of the GNU Lesser General Public

+  License along with this library; if not, write to the Free Software

+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

+ @@ -180,7 +180,9 @@ END COPYRIGHT BLOCK

+               optimize="${compile.optimize}"

+               verbose="no"

+               fork="true"

+ -             excludes="**/CVS/**">

+ +             excludes="**/CVS/**"

+ +             source="1.8"

+ +             target="1.8">

+               <classpath refid="console.classpath" />

+      </javac>

+    </target>

+ @@ -304,10 +306,10 @@ END COPYRIGHT BLOCK

+        </tarfileset>

+      </tar>

+    </target>

+ - 

+ +

+    <!-- Javadoc -->

+    <target name="javadoc" depends="prepare_doc">

+ -    <javadoc 

+ +    <javadoc

+        packagenames="com.netscape.management.*"

+        sourcepath="src"

+        destdir="${javadoc.dir}"

+ @@ -329,5 +331,5 @@ END COPYRIGHT BLOCK

+    <target name="clean_imports">

+      <delete dir="${imports.dir}"/>

+    </target>

+ -  

+ +

+  </project>

+ -- 

+ 2.26.2

+ 

file modified
+5 -1
@@ -9,7 +9,7 @@ 

  BuildArch:        noarch

  

  Version:          1.2.0

- Release:          6%{?_timestamp}%{?_commit_id}%{?dist}

+ Release:          7%{?_timestamp}%{?_commit_id}%{?dist}

  # global           _phase -a1

  

  # To create a tarball from a version tag:
@@ -26,6 +26,7 @@ 

  #     <version tag> \

  #     > idm-console-framework-VERSION-RELEASE.patch

  # Patch: idm-console-framework-VERSION-RELEASE.patch

+ Patch1: 0001-Force-JDK8-support-for-the-time-being.patch

  

  ################################################################################

  # Build Dependencies
@@ -86,6 +87,9 @@ 

  

  ################################################################################

  %changelog

+ * Tue Aug 18 2020 Alexander Scheel <ascheel@redhat.com> - 1.2.0-7

+ - Rebuilt for JDK8 compatibility

+ 

  * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-6

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

  

Signed-off-by: Alexander Scheel <ascheel@redhat.com>

Pull-Request has been merged by cipherboy

3 years ago