From 1f7e1143f0f833020e9a941046bbd6f7ab9f78cd Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mon, 9 Apr 2018 13:47:05 +0100
Subject: [PATCH] Update to Oxygen.3a release for java 10 support Break
 circular dep on JDT by providing the java API stubs in this package

---
 .gitignore                      |  1 +
 ecj.spec                        | 24 ++++++++++++++++--------
 java9api.patch => javaAPI.patch |  2 +-
 sources                         |  5 +++--
 4 files changed, 21 insertions(+), 11 deletions(-)
 rename java9api.patch => javaAPI.patch (97%)

diff --git a/.gitignore b/.gitignore
index faa4e07..03358e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /ecj-*.pom
 /ecj-*/
 /ecjsrc-*.jar
+/java10api.jar
diff --git a/ecj.spec b/ecj.spec
index e96df03..c329ada 100644
--- a/ecj.spec
+++ b/ecj.spec
@@ -1,19 +1,21 @@
 Epoch: 1
 
-%global qualifier M-4.7.3-201803010715
+%global qualifier M-4.7.3aRC2-201803300640
 
 Summary: Eclipse Compiler for Java
 Name: ecj
-Version: 4.7.3
+Version: 4.7.3a
 Release: 1%{?dist}
 URL: http://www.eclipse.org
 License: EPL
 
-Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/ecjsrc-%{version}.jar
+Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/ecjsrc-%{version}RC2.jar
 Source1: ecj.sh.in
 Source3: https://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/%{version}/ecj-%{version}.pom
 # Extracted from https://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/%%{qualifier}/ecj-%%{version}.jar
 Source4: MANIFEST.MF
+# Java API stubs for newer JDKs
+Source5: java10api.jar
 
 # Always generate debug info when building RPMs (Andrew Haley)
 Patch0: %{name}-rpmdebuginfo.patch
@@ -21,15 +23,13 @@ Patch0: %{name}-rpmdebuginfo.patch
 # Fix build with lambda syntax, ebz#520940
 Patch1: java8.patch
 
-# Include java9api stubs in build
-Patch2: java9api.patch
+# Include java API stubs in build
+Patch2: javaAPI.patch
 
 BuildArch: noarch
 
 BuildRequires: ant
 BuildRequires: javapackages-local
-# Needed for java9api jar
-BuildRequires: eclipse-jdt
 
 %description
 ECJ is the Java bytecode compiler of the Eclipse Platform.  It is also known as
@@ -60,8 +60,12 @@ rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
   org.eclipse.tycho:org.eclipse.jdt.core org.eclipse.tycho:org.eclipse.jdt.compiler.apt \
   org.eclipse.jdt:core org.eclipse.jdt:ecj
 
+# Make Java API stubs available for other packages
+%mvn_artifact "org.eclipse:java10api:jar:10" %{SOURCE5}
+%mvn_alias "org.eclipse:java10api:jar:10" "org.eclipse:java9api:jar:9"
+
 %build
-ant -Djava9api=$(build-classpath eclipse/java9api)
+ant -Djavaapi=%{SOURCE5}
 
 %install
 %mvn_artifact pom.xml ecj.jar
@@ -80,6 +84,10 @@ install -m 644 -p ecj.1 $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1
 %{_mandir}/man1/ecj*
 
 %changelog
+* Mon Apr 09 2018 Mat Booth <mat.booth@redhat.com> - 1:4.7.3a-1
+- Update to Oxygen.3a release for java 10 support
+- Break circular dep on JDT by providing the java API stubs in this package
+
 * Tue Mar 20 2018 Mat Booth <mat.booth@redhat.com> - 1:4.7.3-1
 - Update to Oxygen.3
 
diff --git a/java9api.patch b/javaAPI.patch
similarity index 97%
rename from java9api.patch
rename to javaAPI.patch
index 02159f5..2d81834 100644
--- a/java9api.patch
+++ b/javaAPI.patch
@@ -5,7 +5,7 @@
  	<property name="jar_file" value="ecj.jar" />
  
 +	<path id="build.path">
-+		<pathelement path="${java9api}"/>
++		<pathelement path="${javaapi}"/>
 +		<pathelement path="/usr/lib/jvm/java-1.8.0/jre/lib/rt.jar"/>
 +	</path>
  	<target name="build">
diff --git a/sources b/sources
index 6a090ae..a1d9462 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-SHA512 (ecjsrc-4.7.3.jar) = 31a86941360fca6a9e93216acf3f66ea27d66b955ffefed7f2b160685ac0d26111e8eaf0fecfd4972f48112970d1501cf60aed121c67c55f007b313706490688
-SHA512 (ecj-4.7.3.pom) = 79e59064806c2c4a2ed62da3a584448bbd3603bc1e7fab73f0d5b34dffec8ff8305604e1786e8e5fbf41204a4e336e3268d862158986fea0d4cbd81bb1158d32
+SHA512 (ecjsrc-4.7.3aRC2.jar) = c6886bf1b21f47ba68f55fff40b2c02f6032e2b491a79d374c2596418a04c994d243623a3efef747f36edefdb5f2731a475e972a1191d7e002beaecc2ef9d5e5
+SHA512 (ecj-4.7.3a.pom) = a4eb5656867b88817dfe2776320c5a91f2d2402372a993e7698bc5846d5dd05f0bfb9808ed2e514e442438595cf05db0df7014c1c957e4c134bb82f236975759
+SHA512 (java10api.jar) = b92faee6a4f7ab3d631e93ed99fffb101035bf7c0dd632dd5322c9e0d2848eeda496d6cf4d28122c88173fb7fcacc77ce40f2822e923903cec47114c9a25c242