From eeb6f8ab815b82545561e5f2fef537d3dc397a59 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Aug 10 2020 11:38:41 +0000
Subject: Rebuild correctly as a proper JPMS module


---

diff --git a/plexus-languages.spec b/plexus-languages.spec
index b44660d..099c714 100644
--- a/plexus-languages.spec
+++ b/plexus-languages.spec
@@ -1,7 +1,7 @@
 Name:           plexus-languages
 Summary:        Plexus Languages
 Version:        1.0.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        ASL 2.0
 
 URL:            https://github.com/codehaus-plexus/plexus-languages
@@ -36,13 +36,9 @@ cp %{SOURCE1} .
 
 %pom_remove_plugin :maven-enforcer-plugin
 
-# Temporarily force JPMS classes to be built
-%pom_xpath_remove 'pom:profiles' plexus-java
-cp -p plexus-java/src/main/java9/org/codehaus/plexus/languages/java/jpms/* plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms
-
 %build
 # we don't have mockito 2 yet + many tests rely on bundled test jars/classes
-%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
+%mvn_build -f
 
 
 %install
@@ -54,6 +50,9 @@ cp -p plexus-java/src/main/java9/org/codehaus/plexus/languages/java/jpms/* plexu
 
 
 %changelog
+* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.0.5-6
+- Rebuild correctly as a proper JPMS module
+
 * Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.0.5-5
 - Bootstrap restoration of essential JPMS classes