Skip to content

HSEARCH-3686 Upgrade to a staging version of ECJ 3.19.0 to work around Eclipse compiler bugs in 3.18.0 #2073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 4, 2019
Merged

HSEARCH-3686 Upgrade to a staging version of ECJ 3.19.0 to work around Eclipse compiler bugs in 3.18.0 #2073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cec4e12
HSEARCH-3686 Upgrade to a version of the Eclipse compiler that fixes …
yrodiere Sep 4, 2019
6e35bcf
HSEARCH-3686 Work around an Eclipse compiler limitation
yrodiere Sep 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchHitsAssert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
Expand Down