From 821d29fd15cd0b40ec5e23e72a80e85b49506497 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 21 Sep 2017 19:04:01 +0100
Subject: [PATCH] Update to Oxygen.1 release

---
 MANIFEST.MF |  4 ++--
 ecj.spec    | 13 ++++++++++---
 java8.patch | 38 ++++++++++++++++++++++++++++++++++++++
 sources     |  4 ++--
 4 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 java8.patch

diff --git a/MANIFEST.MF b/MANIFEST.MF
index c5c91ba..fec577b 100644
--- a/MANIFEST.MF
+++ b/MANIFEST.MF
@@ -23,8 +23,8 @@ Export-Package: org.eclipse.jdt.core,org.eclipse.jdt.core.compiler,org
  -internal:=true,org.eclipse.jdt.internal.compiler.tool;x-internal:=tr
  ue
 Bundle-Name: Eclipse Compiler for Java(TM)
-Bundle-Version: 3.12.2.v20161117-1814
+Bundle-Version: 3.13.0.v20170516-1929
 Bundle-ClassPath: .
 Created-By: Apache Maven
-Build-Jdk: 1.8.0_102
+Build-Jdk: 1.8.0_121
 
diff --git a/ecj.spec b/ecj.spec
index b8c26b2..0523e13 100644
--- a/ecj.spec
+++ b/ecj.spec
@@ -1,11 +1,11 @@
 Epoch: 1
 
-%global qualifier R-4.6.3-201703010400
+%global qualifier R-4.7.1-201709061700
 
 Summary: Eclipse Compiler for Java
 Name: ecj
-Version: 4.6.3
-Release: 3%{?dist}
+Version: 4.7.1
+Release: 1%{?dist}
 URL: http://www.eclipse.org
 License: EPL
 
@@ -18,6 +18,9 @@ Source4: MANIFEST.MF
 # Always generate debug info when building RPMs (Andrew Haley)
 Patch0: %{name}-rpmdebuginfo.patch
 
+# Fix build with lambda syntax, ebz#520940
+Patch1: java8.patch
+
 BuildArch: noarch
 
 BuildRequires: ant
@@ -30,6 +33,7 @@ the JDT Core batch compiler.
 %prep
 %setup -q -c
 %patch0 -p1
+%patch1 -p3
 
 sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
 sed -i -e "s/Xlint:none/Xlint:none -encoding cp1252/g" build.xml
@@ -70,6 +74,9 @@ install -m 644 -p ecj.1 $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1
 %{_mandir}/man1/ecj*
 
 %changelog
+* Thu Sep 21 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.1-1
+- Update to Oxygen.1 release
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/java8.patch b/java8.patch
new file mode 100644
index 0000000..a014ae3
--- /dev/null
+++ b/java8.patch
@@ -0,0 +1,38 @@
+From 40575084a51619788a032ee4ee3698c47358575b Mon Sep 17 00:00:00 2001
+From: Mat Booth
+Date: Mon, 14 Aug 2017 14:19:48 +0100
+Subject: Bug 520940 - ecj cannot be built since introduction of java 1.8
+ lambda syntax
+
+Change-Id: Ib65c17e614d96de44416b0ede1f059c63df47130
+Signed-off-by: Mat Booth <mat.booth@redhat.com>
+---
+ org.eclipse.jdt.core/scripts/build.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/org.eclipse.jdt.core/scripts/build.xml b/org.eclipse.jdt.core/scripts/build.xml
+index 3fbdb3e..f7e951d 100644
+--- a/org.eclipse.jdt.core/scripts/build.xml
++++ b/org.eclipse.jdt.core/scripts/build.xml
+@@ -22,8 +22,8 @@
+ 
+ 		<javac srcdir="${basedir}" destdir="${output}"
+ 					debuglevel="lines,source"
+-					source="1.7"
+-					target="1.7">
++					source="1.8"
++					target="1.8">
+ 			<compilerarg line="-Xlint:none"/>
+ 		</javac>
+ 
+@@ -43,4 +43,4 @@
+ 		</zip>
+ 		<delete dir="${output}" />
+ 	</target>
+-</project>
+\ No newline at end of file
++</project>
+-- 
+cgit v1.1
+
+
diff --git a/sources b/sources
index 0ea168e..bf574ca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ecj-4.6.3.pom) = b5b95a06eb4b1cf288e8c92ed098ea5c1d1fdc22d61ba0bc36af3d7a5e9b6aae424f57d2a1f1456bf40b8fa0e8ede9c59cfe9f04439b5e23be6a4db99add30c9
-SHA512 (ecjsrc-4.6.3.jar) = a509b6d1fd7e5218ca6d9748b6c899c8c57a9d016d01e3f1d2116876f3aab796f792e1b1733189a436b6251caf8c208ec3928e3978cd0803c1449b29eae1891d
+SHA512 (ecj-4.7.1.pom) = 2f670ac1b1fefa73ae73a56b99b374bc1c3c31944e667f39c0a16cae2580e754f2ba3f6b2ec5234cf1ab03d63743f71a0912a4919772b37fe7b4f37fbd9593d8
+SHA512 (ecjsrc-4.7.1.jar) = d4ec9be4c7e3f6b5072dad58219b98475def366d45953a92e7fedfa7b316522a377a19a2733e81411e1bb072db7fdf27fd420d2db4229b225349adc27dcaacd9