From cec4e12cb4d8def2609e42f0cce32555ddf0a29e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Wed, 4 Sep 2019 08:41:09 +0200
Subject: [PATCH 1/2] HSEARCH-3686 Upgrade to a version of the Eclipse compiler
 that fixes https://bugs.eclipse.org/bugs/show_bug.cgi?id=547807

---
 pom.xml | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 222d0bf6117..d066c53e01e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,6 +299,11 @@
         <jboss.public.repo.id>jboss-public-repository-group</jboss.public.repo.id>
         <jboss.public.repo.url>https://repository.jboss.org/nexus/content/groups/public-jboss/</jboss.public.repo.url>
 
+        <!-- Eclipse repository (for the ECJ compiler, disabled by default) -->
+
+        <eclipse.repo.id>eclipse-staging</eclipse.repo.id>
+        <eclipse.repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</eclipse.repo.url>
+
         <!-- Repository Deployment URLs -->
 
         <jboss.releases.repo.id>jboss-releases-repository</jboss.releases.repo.id>
@@ -334,7 +339,7 @@
                 is outdated and leads to compilation errors.
          -->
         <version.org.codehaus.plexus.plexus-compiler-eclipse>2.8.5</version.org.codehaus.plexus.plexus-compiler-eclipse>
-        <version.org.eclipse.jdt.ecj>3.17.0</version.org.eclipse.jdt.ecj>
+        <version.org.eclipse.jdt.ecj>3.19.0.v20190826-1051</version.org.eclipse.jdt.ecj>
 
         <!--
             The absolute path to the root project directory.
@@ -1981,6 +1986,27 @@
                     </plugins>
                 </pluginManagement>
             </build>
+            <pluginRepositories>
+                <!--
+                     This is needed to access pre-release versions of ECJ,
+                     where bugs that affect us are fixed.
+                     See in particular https://bugs.eclipse.org/bugs/show_bug.cgi?id=547807,
+                     not fixed in 3.18.0, the latest ECJ release at the moment.
+                     This configuration *MUST STAY IN A SPECIFIC PROFILE*,
+                     otherwise it would "taint" projects that depend on Hibernate Search.
+                 -->
+                <pluginRepository>
+                    <id>${eclipse.repo.id}</id>
+                    <url>${eclipse.repo.url}</url>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
         </profile>
 
         <profile>

From 6e35bcf1e638460ed80bc75a7b63afe4e78256f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Wed, 4 Sep 2019 08:20:06 +0200
Subject: [PATCH 2/2] HSEARCH-3686 Work around an Eclipse compiler limitation

---
 .../impl/integrationtest/common/assertion/SearchHitsAssert.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchHitsAssert.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchHitsAssert.java
index 80e7177d80d..e6ace6f2c4f 100644
--- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchHitsAssert.java
+++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchHitsAssert.java
@@ -54,7 +54,7 @@ public ListAssert<List<?>> asNormalizedLists() {
 		shouldHaveOnlyElementsOfTypeOrNull( asIs(), List.class );
 		@SuppressWarnings( "unchecked" ) // We check that at runtime, that's what the assertion is for
 		List<List<?>> normalized = ( (List<? extends List<?>>) actual ).stream()
-				.map( NormalizationUtils::normalize )
+				.map( NormalizationUtils::<List<?>>normalize )
 				.collect( Collectors.toList() );
 		return Assertions.assertThat( normalized ).as( description );
 	}