From 845a865b6dbd7acada84470bd290a12d7403bf259eb6f9ed4f441135c38ba63e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 1 May 2023 17:43:17 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=61 --- ...avadoc-plugin-for-source-and-release.patch | 88 ----- 0001-Port-to-Maven-3.8.5.patch | 50 --- ...ore-possibility-to-build-with-Java-8.patch | 85 ---- ...ation-of-toolchains-https-github.com.patch | 56 --- ...ate-compiler-source-target-to-JDK-11.patch | 370 ------------------ ...dule-path-not-allowed-with-release-8.patch | 91 ----- ...w-Collection-methods-added-in-Java-9.patch | 109 ------ ...le-to-assure-that-we-are-jdk8-compat.patch | 44 --- xmvn-4.0.0.tar.xz | 3 - xmvn-4.2.0.tar.xz | 3 + xmvn-build.tar.xz | 4 +- xmvn-connector.spec | 12 +- xmvn-mojo.spec | 12 +- xmvn-parent.spec | 12 +- xmvn-tools.spec | 19 +- xmvn.spec | 4 +- 16 files changed, 19 insertions(+), 943 deletions(-) delete mode 100644 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch delete mode 100644 0001-Port-to-Maven-3.8.5.patch delete mode 100644 0001-Restore-possibility-to-build-with-Java-8.patch delete mode 100644 0001-Simple-implementation-of-toolchains-https-github.com.patch delete mode 100644 0002-Revert-Update-compiler-source-target-to-JDK-11.patch delete mode 100644 0002-module-path-not-allowed-with-release-8.patch delete mode 100644 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch delete mode 100644 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch delete mode 100644 xmvn-4.0.0.tar.xz create mode 100644 xmvn-4.2.0.tar.xz diff --git a/0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch b/0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch deleted file mode 100644 index d320a42..0000000 --- a/0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch +++ /dev/null @@ -1,88 +0,0 @@ -From c2f74691a71509c3671d3bc612be285a511c53f1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Wed, 4 May 2022 13:26:00 +0200 -Subject: [PATCH 1/2] Mimic maven-javadoc-plugin for -source and --release - -Consider the maven.compiler.source and maven.compiler.release -properties. Skip module-info.java if source level is specified -and it is < 9 or if non-modular Java is used ---- - .../fedoraproject/xmvn/mojo/JavadocMojo.java | 38 +++++++++++++++++-- - 1 file changed, 34 insertions(+), 4 deletions(-) - -diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java -index b2cd41fd..68d097f5 100644 ---- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java -+++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java -@@ -84,9 +84,12 @@ public class JavadocMojo - @Parameter( defaultValue = "${project.build.directory}", required = true ) - private File buildDirectory; - -- @Parameter( property = "source" ) -+ @Parameter( property = "source", defaultValue = "${maven.compiler.source}" ) - private String source; - -+ @Parameter( defaultValue = "${maven.compiler.release}" ) -+ private String release; -+ - private static String quoted( Object obj ) - { - String arg = obj.toString(); -@@ -222,8 +225,9 @@ public class JavadocMojo - List reactorClassPath = new ArrayList<>(); - List fullClassPath = new ArrayList<>(); - populateClasspath( reactorClassPath, fullClassPath ); -+ boolean isModular = !findFiles( reactorClassPath, "module-info\\.class" ).isEmpty(); - -- if ( findFiles( reactorClassPath, "module-info\\.class" ).isEmpty() ) -+ if ( !isModular ) - { - opts.add( "-classpath" ); - } -@@ -244,15 +248,41 @@ public class JavadocMojo - opts.add( quoted( docencoding ) ); - opts.add( "-doctitle" ); - opts.add( quoted( "Javadoc for package XXX" ) ); -- if ( source != null ) -+ -+ String sourceLevel = null; -+ if ( release != null && isModular ) -+ { -+ opts.add( "--release" ); -+ opts.add( quoted( release ) ); -+ sourceLevel = release; -+ -+ } -+ else if ( source != null ) - { - opts.add( "-source" ); - opts.add( quoted( source ) ); -+ sourceLevel = source; -+ } -+ -+ boolean skipModuleInfo = !isModular; -+ if ( sourceLevel != null && !skipModuleInfo ) -+ { -+ try -+ { -+ float f = Float.parseFloat( sourceLevel ); -+ if ( f < 9 ) -+ skipModuleInfo = true; -+ } -+ catch ( Exception e ) -+ { -+ // pass, we assume that we use modular Java -+ } - } - - for ( Path file : sourceFiles ) - { -- opts.add( quoted( file ) ); -+ if ( !skipModuleInfo || !file.endsWith( "module-info.java" ) ) -+ opts.add( quoted( file ) ); - } - - Files.write( outputDir.resolve( "args" ), opts, StandardOpenOption.CREATE ); --- -2.36.0 - diff --git a/0001-Port-to-Maven-3.8.5.patch b/0001-Port-to-Maven-3.8.5.patch deleted file mode 100644 index 1e7b3af..0000000 --- a/0001-Port-to-Maven-3.8.5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2be4a625a254d0f9ac888ca47bbaac0c02977bc7 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 22 Apr 2022 10:59:32 +0200 -Subject: [PATCH] Port to Maven 3.8.5 - ---- - .../xmvn/connector/maven/XMvnModelValidator.java | 6 ++++++ - xmvn-parent/pom.xml | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java -index a3fe4712..d340b91f 100644 ---- a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java -+++ b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java -@@ -27,6 +27,7 @@ import org.apache.maven.model.Model; - import org.apache.maven.model.Plugin; - import org.apache.maven.model.building.ModelBuildingRequest; - import org.apache.maven.model.building.ModelProblemCollector; -+import org.apache.maven.model.interpolation.DefaultModelVersionProcessor; - import org.apache.maven.model.validation.DefaultModelValidator; - import org.apache.maven.model.validation.ModelValidator; - import org.codehaus.plexus.component.annotations.Component; -@@ -52,6 +53,11 @@ public class XMvnModelValidator - @Requirement - private Configurator configurator; - -+ public XMvnModelValidator() -+ { -+ super( new DefaultModelVersionProcessor() ); -+ } -+ - @Override - public void validateEffectiveModel( Model model, ModelBuildingRequest request, ModelProblemCollector problems ) - { -diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml -index 58ca7dc4..7640ab28 100644 ---- a/xmvn-parent/pom.xml -+++ b/xmvn-parent/pom.xml -@@ -81,7 +81,7 @@ - 1.81 - 3.1.0 - 1.7.1 -- 3.8.1 -+ 3.8.5 - 2.6.0 - 3.3.0 - 3.6.1 --- -2.36.1 - diff --git a/0001-Restore-possibility-to-build-with-Java-8.patch b/0001-Restore-possibility-to-build-with-Java-8.patch deleted file mode 100644 index 9200cce..0000000 --- a/0001-Restore-possibility-to-build-with-Java-8.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 25029d2fc4db56e9f9a451505c8c76aaf0e8be9a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Fri, 6 May 2022 18:40:49 +0200 -Subject: [PATCH 1/4] Restore possibility to build with Java 8 - ---- - .../xmvn/connector/maven/XMvnToolchainManager.java | 5 +++-- - .../org/fedoraproject/xmvn/deployer/BasicDeployerTest.java | 3 ++- - .../org/fedoraproject/xmvn/tools/install/JarUtilsTest.java | 6 +++--- - 3 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnToolchainManager.java b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnToolchainManager.java -index 53f1020d..1fb59cb3 100644 ---- a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnToolchainManager.java -+++ b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnToolchainManager.java -@@ -22,6 +22,7 @@ import org.apache.maven.execution.MavenSession; - import org.apache.maven.project.MavenProject; - import org.apache.maven.toolchain.DefaultToolchainManagerPrivate; - import org.apache.maven.toolchain.MisconfiguredToolchainException; -+import org.apache.maven.toolchain.ToolchainPrivate; - import org.codehaus.plexus.component.annotations.Component; - - /** -@@ -38,11 +39,11 @@ public class XMvnToolchainManager - - try - { -- for ( var toolchain : getToolchainsForType( "jdk", session ) ) -+ for ( ToolchainPrivate toolchain : getToolchainsForType( "jdk", session ) ) - { - if ( toolchain.matchesRequirements( Collections.singletonMap( "xmvn", "xmvn" ) ) ) - { -- for ( var project : session.getAllProjects() ) -+ for ( MavenProject project : session.getAllProjects() ) - { - session.setCurrentProject( project ); - storeToolchainToBuildContext( toolchain, session ); -diff --git a/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java b/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java -index f79e5b64..0028f4f1 100644 ---- a/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java -+++ b/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java -@@ -28,6 +28,7 @@ import java.nio.file.Paths; - import java.nio.file.attribute.PosixFilePermission; - import java.util.Arrays; - import java.util.Collections; -+import java.util.regex.Matcher; - import java.util.regex.Pattern; - - import org.junit.jupiter.api.Test; -@@ -149,7 +150,7 @@ public class BasicDeployerTest - { - return Files.lines( Paths.get( "/proc/self/status" ) ).map( s -> - { -- var matcher = PROCESS_UID_PATTERN.matcher( s ); -+ Matcher matcher = PROCESS_UID_PATTERN.matcher( s ); - - if ( matcher.matches() ) - { -diff --git a/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/JarUtilsTest.java b/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/JarUtilsTest.java -index 8866752d..d2ef084e 100644 ---- a/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/JarUtilsTest.java -+++ b/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/JarUtilsTest.java -@@ -411,8 +411,8 @@ public class JarUtilsTest - - byte[] content = Files.readAllBytes( testJar ); - -- var previousSecurity = System.getSecurityManager(); -- var fobiddingSecurity = new ForbiddingSecurityManager( testJar.toString() ); -+ SecurityManager previousSecurity = System.getSecurityManager(); -+ SecurityManager fobiddingSecurity = new ForbiddingSecurityManager( testJar.toString() ); - - System.setSecurityManager( fobiddingSecurity ); - -@@ -430,7 +430,7 @@ public class JarUtilsTest - "Content of the backup file is different from the content of the original file" ); - - System.setSecurityManager( previousSecurity ); -- try ( var os = new FileOutputStream( testJar.toFile(), true ) ) -+ try ( FileOutputStream os = new FileOutputStream( testJar.toFile(), true ) ) - { - /// Append garbage to the original file to check if the content of the backup will be retained - os.write( 0 ); --- -2.36.0 - diff --git a/0001-Simple-implementation-of-toolchains-https-github.com.patch b/0001-Simple-implementation-of-toolchains-https-github.com.patch deleted file mode 100644 index c8eaeca..0000000 --- a/0001-Simple-implementation-of-toolchains-https-github.com.patch +++ /dev/null @@ -1,56 +0,0 @@ -From acb236f878b020722512b1ce0ba20329500083c2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Sat, 7 May 2022 18:13:02 +0200 -Subject: [PATCH 1/2] Simple implementation of toolchains - https://github.com/fedora-java/xmvn/issues/142 - ---- - .../fedoraproject/xmvn/mojo/JavadocMojo.java | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java -index b2cd41fd..2b06e702 100644 ---- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java -+++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java -@@ -45,6 +45,8 @@ import org.apache.maven.project.DependencyResolutionRequest; - import org.apache.maven.project.DependencyResolutionResult; - import org.apache.maven.project.MavenProject; - import org.apache.maven.project.ProjectDependenciesResolver; -+import org.apache.maven.toolchain.Toolchain; -+import org.apache.maven.toolchain.ToolchainManager; - import org.codehaus.plexus.logging.Logger; - import org.codehaus.plexus.util.StringUtils; - import org.eclipse.aether.util.filter.AndDependencyFilter; -@@ -69,6 +71,9 @@ public class JavadocMojo - @Component - private Configurator confugurator; - -+ @Component -+ private ToolchainManager toolchainManager; -+ - @Parameter( defaultValue = "${session}", readonly = true ) - private MavenSession session; - -@@ -161,8 +166,18 @@ public class JavadocMojo - public void execute() - throws MojoExecutionException, MojoFailureException - { -+ String javadocTool = null; -+ Toolchain tc = toolchainManager.getToolchainFromBuildContext( "jdk", session ); -+ if ( tc != null ) -+ { -+ javadocTool = tc.findTool( "javadoc" ); -+ } - Path javadocExecutable; -- if ( System.getenv().containsKey( "JAVA_HOME" ) ) -+ if ( javadocTool != null && !javadocTool.isEmpty() ) -+ { -+ javadocExecutable = Paths.get( javadocTool ); -+ } -+ else if ( System.getenv().containsKey( "JAVA_HOME" ) ) - { - javadocExecutable = Paths.get( System.getenv( "JAVA_HOME" ) ) // - .resolve( "bin" ) // --- -2.36.0 - diff --git a/0002-Revert-Update-compiler-source-target-to-JDK-11.patch b/0002-Revert-Update-compiler-source-target-to-JDK-11.patch deleted file mode 100644 index e3e024a..0000000 --- a/0002-Revert-Update-compiler-source-target-to-JDK-11.patch +++ /dev/null @@ -1,370 +0,0 @@ -From cd83d67f9138ef1cada913b539c0eb90c35de585 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Sat, 7 May 2022 09:01:27 +0200 -Subject: [PATCH 2/4] Revert "Update compiler source/target to JDK 11" - -This reverts commit 5ac46f5864c5a7c7d16c51405aa572b6dc5bd6f5. ---- - xmvn-api/.classpath | 2 +- - xmvn-api/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- - xmvn-connector/.classpath | 2 +- - xmvn-connector/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- - xmvn-core/.classpath | 2 +- - xmvn-core/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- - xmvn-it/.classpath | 2 +- - xmvn-it/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- - xmvn-it/src/test/resources/testJavadocJPMS/pom.xml | 3 ++- - xmvn-mojo/.classpath | 2 +- - xmvn-mojo/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- - xmvn-parent/pom.xml | 3 ++- - xmvn-tools/xmvn-install/.classpath | 2 +- - .../xmvn-install/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- - xmvn-tools/xmvn-resolve/.classpath | 2 +- - .../xmvn-resolve/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- - xmvn-tools/xmvn-subst/.classpath | 2 +- - .../xmvn-subst/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- - 18 files changed, 44 insertions(+), 42 deletions(-) - -diff --git a/xmvn-api/.classpath b/xmvn-api/.classpath -index 6c61e620..12aa8aee 100644 ---- a/xmvn-api/.classpath -+++ b/xmvn-api/.classpath -@@ -13,7 +13,7 @@ - - - -- -+ - - - -diff --git a/xmvn-api/.settings/org.eclipse.jdt.core.prefs b/xmvn-api/.settings/org.eclipse.jdt.core.prefs -index 2d67d3f3..2f39a66b 100644 ---- a/xmvn-api/.settings/org.eclipse.jdt.core.prefs -+++ b/xmvn-api/.settings/org.eclipse.jdt.core.prefs -@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= - org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable - org.eclipse.jdt.core.compiler.annotation.nullable.secondary= - org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled --org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 --org.eclipse.jdt.core.compiler.compliance=11 -+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -+org.eclipse.jdt.core.compiler.compliance=1.8 - org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning - org.eclipse.jdt.core.compiler.problem.autoboxing=ignore - org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning - org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning - org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning - org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning --org.eclipse.jdt.core.compiler.release=enabled --org.eclipse.jdt.core.compiler.source=11 -+org.eclipse.jdt.core.compiler.release=disabled -+org.eclipse.jdt.core.compiler.source=1.8 - org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false - org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 - org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -diff --git a/xmvn-connector/.classpath b/xmvn-connector/.classpath -index 97c81cef..4f8e155a 100644 ---- a/xmvn-connector/.classpath -+++ b/xmvn-connector/.classpath -@@ -13,7 +13,7 @@ - - - -- -+ - - - -diff --git a/xmvn-connector/.settings/org.eclipse.jdt.core.prefs b/xmvn-connector/.settings/org.eclipse.jdt.core.prefs -index 2d67d3f3..2f39a66b 100644 ---- a/xmvn-connector/.settings/org.eclipse.jdt.core.prefs -+++ b/xmvn-connector/.settings/org.eclipse.jdt.core.prefs -@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= - org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable - org.eclipse.jdt.core.compiler.annotation.nullable.secondary= - org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled --org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 --org.eclipse.jdt.core.compiler.compliance=11 -+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -+org.eclipse.jdt.core.compiler.compliance=1.8 - org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning - org.eclipse.jdt.core.compiler.problem.autoboxing=ignore - org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning - org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning - org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning - org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning --org.eclipse.jdt.core.compiler.release=enabled --org.eclipse.jdt.core.compiler.source=11 -+org.eclipse.jdt.core.compiler.release=disabled -+org.eclipse.jdt.core.compiler.source=1.8 - org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false - org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 - org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -diff --git a/xmvn-core/.classpath b/xmvn-core/.classpath -index 0fb79cfe..002ad570 100644 ---- a/xmvn-core/.classpath -+++ b/xmvn-core/.classpath -@@ -24,7 +24,7 @@ - - - -- -+ - - - -diff --git a/xmvn-core/.settings/org.eclipse.jdt.core.prefs b/xmvn-core/.settings/org.eclipse.jdt.core.prefs -index 2d67d3f3..2f39a66b 100644 ---- a/xmvn-core/.settings/org.eclipse.jdt.core.prefs -+++ b/xmvn-core/.settings/org.eclipse.jdt.core.prefs -@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= - org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable - org.eclipse.jdt.core.compiler.annotation.nullable.secondary= - org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled --org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 --org.eclipse.jdt.core.compiler.compliance=11 -+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -+org.eclipse.jdt.core.compiler.compliance=1.8 - org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning - org.eclipse.jdt.core.compiler.problem.autoboxing=ignore - org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning - org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning - org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning - org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning --org.eclipse.jdt.core.compiler.release=enabled --org.eclipse.jdt.core.compiler.source=11 -+org.eclipse.jdt.core.compiler.release=disabled -+org.eclipse.jdt.core.compiler.source=1.8 - org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false - org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 - org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -diff --git a/xmvn-it/.classpath b/xmvn-it/.classpath -index 2fcc9100..8131be0e 100644 ---- a/xmvn-it/.classpath -+++ b/xmvn-it/.classpath -@@ -19,7 +19,7 @@ - - - -- -+ - - - -diff --git a/xmvn-it/.settings/org.eclipse.jdt.core.prefs b/xmvn-it/.settings/org.eclipse.jdt.core.prefs -index 2d67d3f3..2f39a66b 100644 ---- a/xmvn-it/.settings/org.eclipse.jdt.core.prefs -+++ b/xmvn-it/.settings/org.eclipse.jdt.core.prefs -@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= - org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable - org.eclipse.jdt.core.compiler.annotation.nullable.secondary= - org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled --org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 --org.eclipse.jdt.core.compiler.compliance=11 -+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -+org.eclipse.jdt.core.compiler.compliance=1.8 - org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning - org.eclipse.jdt.core.compiler.problem.autoboxing=ignore - org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning - org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning - org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning - org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning --org.eclipse.jdt.core.compiler.release=enabled --org.eclipse.jdt.core.compiler.source=11 -+org.eclipse.jdt.core.compiler.release=disabled -+org.eclipse.jdt.core.compiler.source=1.8 - org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false - org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 - org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -diff --git a/xmvn-it/src/test/resources/testJavadocJPMS/pom.xml b/xmvn-it/src/test/resources/testJavadocJPMS/pom.xml -index 6bb860ef..46926484 100644 ---- a/xmvn-it/src/test/resources/testJavadocJPMS/pom.xml -+++ b/xmvn-it/src/test/resources/testJavadocJPMS/pom.xml -@@ -16,7 +16,8 @@ - maven-compiler-plugin - 3.8.1 - -- 11 -+ 1.8 -+ 1.8 - - - -diff --git a/xmvn-mojo/.classpath b/xmvn-mojo/.classpath -index 4d004b9e..1a0c5608 100644 ---- a/xmvn-mojo/.classpath -+++ b/xmvn-mojo/.classpath -@@ -18,7 +18,7 @@ - - - -- -+ - - - -diff --git a/xmvn-mojo/.settings/org.eclipse.jdt.core.prefs b/xmvn-mojo/.settings/org.eclipse.jdt.core.prefs -index 2d67d3f3..2f39a66b 100644 ---- a/xmvn-mojo/.settings/org.eclipse.jdt.core.prefs -+++ b/xmvn-mojo/.settings/org.eclipse.jdt.core.prefs -@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= - org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable - org.eclipse.jdt.core.compiler.annotation.nullable.secondary= - org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled --org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 --org.eclipse.jdt.core.compiler.compliance=11 -+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -+org.eclipse.jdt.core.compiler.compliance=1.8 - org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning - org.eclipse.jdt.core.compiler.problem.autoboxing=ignore - org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning - org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning - org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning - org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning --org.eclipse.jdt.core.compiler.release=enabled --org.eclipse.jdt.core.compiler.source=11 -+org.eclipse.jdt.core.compiler.release=disabled -+org.eclipse.jdt.core.compiler.source=1.8 - org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false - org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 - org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml -index fd5289c3..383f320c 100644 ---- a/xmvn-parent/pom.xml -+++ b/xmvn-parent/pom.xml -@@ -298,7 +298,8 @@ - maven-compiler-plugin - ${compilerPluginVersion} - -- 11 -+ 1.8 -+ 1.8 - - - -diff --git a/xmvn-tools/xmvn-install/.classpath b/xmvn-tools/xmvn-install/.classpath -index 0fb79cfe..002ad570 100644 ---- a/xmvn-tools/xmvn-install/.classpath -+++ b/xmvn-tools/xmvn-install/.classpath -@@ -24,7 +24,7 @@ - - - -- -+ - - - -diff --git a/xmvn-tools/xmvn-install/.settings/org.eclipse.jdt.core.prefs b/xmvn-tools/xmvn-install/.settings/org.eclipse.jdt.core.prefs -index 2d67d3f3..2f39a66b 100644 ---- a/xmvn-tools/xmvn-install/.settings/org.eclipse.jdt.core.prefs -+++ b/xmvn-tools/xmvn-install/.settings/org.eclipse.jdt.core.prefs -@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= - org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable - org.eclipse.jdt.core.compiler.annotation.nullable.secondary= - org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled --org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 --org.eclipse.jdt.core.compiler.compliance=11 -+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -+org.eclipse.jdt.core.compiler.compliance=1.8 - org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning - org.eclipse.jdt.core.compiler.problem.autoboxing=ignore - org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning - org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning - org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning - org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning --org.eclipse.jdt.core.compiler.release=enabled --org.eclipse.jdt.core.compiler.source=11 -+org.eclipse.jdt.core.compiler.release=disabled -+org.eclipse.jdt.core.compiler.source=1.8 - org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false - org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 - org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -diff --git a/xmvn-tools/xmvn-resolve/.classpath b/xmvn-tools/xmvn-resolve/.classpath -index 97c81cef..4f8e155a 100644 ---- a/xmvn-tools/xmvn-resolve/.classpath -+++ b/xmvn-tools/xmvn-resolve/.classpath -@@ -13,7 +13,7 @@ - - - -- -+ - - - -diff --git a/xmvn-tools/xmvn-resolve/.settings/org.eclipse.jdt.core.prefs b/xmvn-tools/xmvn-resolve/.settings/org.eclipse.jdt.core.prefs -index 2d67d3f3..2f39a66b 100644 ---- a/xmvn-tools/xmvn-resolve/.settings/org.eclipse.jdt.core.prefs -+++ b/xmvn-tools/xmvn-resolve/.settings/org.eclipse.jdt.core.prefs -@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= - org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable - org.eclipse.jdt.core.compiler.annotation.nullable.secondary= - org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled --org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 --org.eclipse.jdt.core.compiler.compliance=11 -+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -+org.eclipse.jdt.core.compiler.compliance=1.8 - org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning - org.eclipse.jdt.core.compiler.problem.autoboxing=ignore - org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning - org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning - org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning - org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning --org.eclipse.jdt.core.compiler.release=enabled --org.eclipse.jdt.core.compiler.source=11 -+org.eclipse.jdt.core.compiler.release=disabled -+org.eclipse.jdt.core.compiler.source=1.8 - org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false - org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 - org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -diff --git a/xmvn-tools/xmvn-subst/.classpath b/xmvn-tools/xmvn-subst/.classpath -index 4559ca0b..5e8a55fe 100644 ---- a/xmvn-tools/xmvn-subst/.classpath -+++ b/xmvn-tools/xmvn-subst/.classpath -@@ -13,7 +13,7 @@ - - - -- -+ - - - -diff --git a/xmvn-tools/xmvn-subst/.settings/org.eclipse.jdt.core.prefs b/xmvn-tools/xmvn-subst/.settings/org.eclipse.jdt.core.prefs -index 2d67d3f3..2f39a66b 100644 ---- a/xmvn-tools/xmvn-subst/.settings/org.eclipse.jdt.core.prefs -+++ b/xmvn-tools/xmvn-subst/.settings/org.eclipse.jdt.core.prefs -@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= - org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable - org.eclipse.jdt.core.compiler.annotation.nullable.secondary= - org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled --org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 --org.eclipse.jdt.core.compiler.compliance=11 -+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -+org.eclipse.jdt.core.compiler.compliance=1.8 - org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning - org.eclipse.jdt.core.compiler.problem.autoboxing=ignore - org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning - org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning - org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning - org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning --org.eclipse.jdt.core.compiler.release=enabled --org.eclipse.jdt.core.compiler.source=11 -+org.eclipse.jdt.core.compiler.release=disabled -+org.eclipse.jdt.core.compiler.source=1.8 - org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false - org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 - org.eclipse.jdt.core.formatter.align_type_members_on_columns=false --- -2.36.0 - diff --git a/0002-module-path-not-allowed-with-release-8.patch b/0002-module-path-not-allowed-with-release-8.patch deleted file mode 100644 index ada8af1..0000000 --- a/0002-module-path-not-allowed-with-release-8.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 34ee4dad896f9f82131a090293c3a9ccaa77b729 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Sun, 8 May 2022 15:19:45 +0200 -Subject: [PATCH 2/2] --module-path not allowed with release=8 - ---- - .../fedoraproject/xmvn/mojo/JavadocMojo.java | 49 +++++++++---------- - 1 file changed, 24 insertions(+), 25 deletions(-) - -diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java -index 68d097f5..480b0f0a 100644 ---- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java -+++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java -@@ -227,35 +227,12 @@ public class JavadocMojo - populateClasspath( reactorClassPath, fullClassPath ); - boolean isModular = !findFiles( reactorClassPath, "module-info\\.class" ).isEmpty(); - -- if ( !isModular ) -- { -- opts.add( "-classpath" ); -- } -- else -- { -- opts.add( "--module-path" ); -- } -- opts.add( quoted( StringUtils.join( fullClassPath.iterator(), ":" ) ) ); -- opts.add( "-encoding" ); -- opts.add( quoted( encoding ) ); -- opts.add( "-sourcepath" ); -- opts.add( quoted( StringUtils.join( sourcePaths.iterator(), ":" ) ) ); -- opts.add( "-charset" ); -- opts.add( quoted( docencoding ) ); -- opts.add( "-d" ); -- opts.add( quoted( outputDir ) ); -- opts.add( "-docencoding" ); -- opts.add( quoted( docencoding ) ); -- opts.add( "-doctitle" ); -- opts.add( quoted( "Javadoc for package XXX" ) ); -- - String sourceLevel = null; -- if ( release != null && isModular ) -+ if ( release != null ) - { - opts.add( "--release" ); - opts.add( quoted( release ) ); - sourceLevel = release; -- - } - else if ( source != null ) - { -@@ -265,7 +242,7 @@ public class JavadocMojo - } - - boolean skipModuleInfo = !isModular; -- if ( sourceLevel != null && !skipModuleInfo ) -+ if ( sourceLevel != null ) - { - try - { -@@ -279,6 +256,28 @@ public class JavadocMojo - } - } - -+ if ( !isModular || skipModuleInfo ) -+ { -+ opts.add( "-classpath" ); -+ } -+ else -+ { -+ opts.add( "--module-path" ); -+ } -+ opts.add( quoted( StringUtils.join( fullClassPath.iterator(), ":" ) ) ); -+ opts.add( "-encoding" ); -+ opts.add( quoted( encoding ) ); -+ opts.add( "-sourcepath" ); -+ opts.add( quoted( StringUtils.join( sourcePaths.iterator(), ":" ) ) ); -+ opts.add( "-charset" ); -+ opts.add( quoted( docencoding ) ); -+ opts.add( "-d" ); -+ opts.add( quoted( outputDir ) ); -+ opts.add( "-docencoding" ); -+ opts.add( quoted( docencoding ) ); -+ opts.add( "-doctitle" ); -+ opts.add( quoted( "Javadoc for package XXX" ) ); -+ - for ( Path file : sourceFiles ) - { - if ( !skipModuleInfo || !file.endsWith( "module-info.java" ) ) --- -2.36.0 - diff --git a/0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch b/0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch deleted file mode 100644 index 0db2166..0000000 --- a/0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 67ad1e7228166863edc81fe56b74abad443251df Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Sun, 8 May 2022 19:28:37 +0200 -Subject: [PATCH 3/4] Revert "Use new Collection methods added in Java 9" - -This reverts commit 1acda1ff8bb2a58c458395d61c0aaeae3d425e53. ---- - .../fedoraproject/xmvn/deployer/DependencyDescriptor.java | 3 ++- - .../org/fedoraproject/xmvn/deployer/DeploymentRequest.java | 5 +++-- - .../xmvn/connector/maven/XMvnMojoExecutionListener.java | 3 ++- - .../org/fedoraproject/xmvn/mojo/BuildDependencyVisitor.java | 3 ++- - 4 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DependencyDescriptor.java b/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DependencyDescriptor.java -index 9918affe..1af7d2fb 100644 ---- a/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DependencyDescriptor.java -+++ b/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DependencyDescriptor.java -@@ -15,6 +15,7 @@ - */ - package org.fedoraproject.xmvn.deployer; - -+import java.util.Collections; - import java.util.List; - - import org.fedoraproject.xmvn.artifact.Artifact; -@@ -34,7 +35,7 @@ public class DependencyDescriptor - { - this.dependencyArtifact = dependencyArtifact; - this.optional = optional; -- this.exclusions = List.copyOf( exclusions ); -+ this.exclusions = Collections.unmodifiableList( exclusions ); - } - - public Artifact getDependencyArtifact() -diff --git a/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DeploymentRequest.java b/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DeploymentRequest.java -index 6c67d2c7..16e48471 100644 ---- a/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DeploymentRequest.java -+++ b/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DeploymentRequest.java -@@ -19,6 +19,7 @@ import java.nio.file.Path; - import java.nio.file.Paths; - import java.util.ArrayList; - import java.util.Arrays; -+import java.util.Collections; - import java.util.Iterator; - import java.util.LinkedHashMap; - import java.util.List; -@@ -53,7 +54,7 @@ public class DeploymentRequest - - public List getDependencies() - { -- return List.copyOf( dependencies ); -+ return Collections.unmodifiableList( dependencies ); - } - - public void addDependency( Artifact dependencyArtifact, Artifact... exclusions ) -@@ -85,7 +86,7 @@ public class DeploymentRequest - - public Map getProperties() - { -- return Map.copyOf( properties ); -+ return Collections.unmodifiableMap( properties ); - } - - public String getProperty( String key ) -diff --git a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java -index dc312edf..812ecd83 100644 ---- a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java -+++ b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java -@@ -25,6 +25,7 @@ import java.nio.file.Files; - import java.nio.file.Path; - import java.nio.file.Paths; - import java.util.ArrayList; -+import java.util.Collections; - import java.util.List; - import java.util.Properties; - -@@ -276,7 +277,7 @@ public class XMvnMojoExecutionListener - } - else if ( XMVN_BUILDDEP.equals( execution ) ) - { -- trySetBeanProperty( mojo, "resolutions", List.copyOf( resolutions ) ); -+ trySetBeanProperty( mojo, "resolutions", Collections.unmodifiableList( new ArrayList<>( resolutions ) ) ); - } - } - -diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/BuildDependencyVisitor.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/BuildDependencyVisitor.java -index e77ca530..75cc4922 100644 ---- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/BuildDependencyVisitor.java -+++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/BuildDependencyVisitor.java -@@ -16,6 +16,7 @@ - package org.fedoraproject.xmvn.mojo; - - import java.util.Arrays; -+import java.util.Collections; - import java.util.LinkedHashSet; - import java.util.List; - import java.util.Set; -@@ -53,7 +54,7 @@ class BuildDependencyVisitor - - public Set getArtifacts() - { -- return Set.copyOf( artifacts ); -+ return Collections.unmodifiableSet( artifacts ); - } - - private boolean isExternal( InputLocation location ) --- -2.36.0 - diff --git a/0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch b/0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch deleted file mode 100644 index c341a73..0000000 --- a/0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4dc70921e93fdf1f34e9c02b7a9bd8890bb4ac4f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Sun, 8 May 2022 19:56:30 +0200 -Subject: [PATCH 4/4] Add a jdk9+ profile to assure that we are jdk8 compatible - ---- - xmvn-parent/pom.xml | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml -index 383f320c..e1ed807f 100644 ---- a/xmvn-parent/pom.xml -+++ b/xmvn-parent/pom.xml -@@ -565,5 +565,27 @@ - - - -+ -+ jdk9+ -+ -+ [9,) -+ -+ -+ -+ -+ maven-compiler-plugin -+ -+ 8 -+ -+ -+ -+ maven-surefire-plugin -+ -+ --add-opens java.base/java.lang=ALL-UNNAMED -+ -+ -+ -+ -+ - - --- -2.36.0 - diff --git a/xmvn-4.0.0.tar.xz b/xmvn-4.0.0.tar.xz deleted file mode 100644 index da32c53..0000000 --- a/xmvn-4.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0d5bb4fe3e66d84695abd5347b570bb1135bab21125d55ab9a07fbacfa5bb3c -size 140696 diff --git a/xmvn-4.2.0.tar.xz b/xmvn-4.2.0.tar.xz new file mode 100644 index 0000000..6495a81 --- /dev/null +++ b/xmvn-4.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df519da40433cb457d3d7582f5e190d9a7ecb35505b71fd6e8f9f729e02a1c42 +size 137756 diff --git a/xmvn-build.tar.xz b/xmvn-build.tar.xz index 064695a..e38053c 100644 --- a/xmvn-build.tar.xz +++ b/xmvn-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:815da412149ba8c2ef2d723d9d1ce7e9b16966157d3654092ac4680017bc8075 -size 4316 +oid sha256:feefd48dec56e4fea6f591381a6eb6dfb27283ee64e43bd03af387b21ee033dc +size 4352 diff --git a/xmvn-connector.spec b/xmvn-connector.spec index 97aa436..b7002b8 100644 --- a/xmvn-connector.spec +++ b/xmvn-connector.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %global subname connector %bcond_with tests Name: %{parent}-%{subname} -Version: 4.0.0 +Version: 4.2.0 Release: 0 Summary: XMvn Connector for Maven Resolver License: Apache-2.0 @@ -28,14 +28,6 @@ Group: Development/Tools/Building URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz Source1: %{parent}-build.tar.xz -Patch1: 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch -Patch2: 0002-module-path-not-allowed-with-release-8.patch -Patch3: 0001-Simple-implementation-of-toolchains-https-github.com.patch -Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch -Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch -Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch -Patch7: 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch -Patch8: 0001-Port-to-Maven-3.8.5.patch BuildRequires: %{parent}-api = %{version} BuildRequires: %{parent}-core = %{version} BuildRequires: ant diff --git a/xmvn-mojo.spec b/xmvn-mojo.spec index b4af52a..d22418b 100644 --- a/xmvn-mojo.spec +++ b/xmvn-mojo.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,21 +19,13 @@ %global parent xmvn %global subname mojo Name: %{parent}-%{subname} -Version: 4.0.0 +Version: 4.2.0 Release: 0 Summary: XMvn MOJO License: Apache-2.0 Group: Development/Tools/Building URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz -Patch1: 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch -Patch2: 0002-module-path-not-allowed-with-release-8.patch -Patch3: 0001-Simple-implementation-of-toolchains-https-github.com.patch -Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch -Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch -Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch -Patch7: 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch -Patch8: 0001-Port-to-Maven-3.8.5.patch BuildRequires: %{parent}-api = %{version} BuildRequires: %{parent}-core = %{version} BuildRequires: fdupes diff --git a/xmvn-parent.spec b/xmvn-parent.spec index 56ed616..1699351 100644 --- a/xmvn-parent.spec +++ b/xmvn-parent.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,21 +19,13 @@ %global parent xmvn %global subname parent Name: %{parent}-%{subname} -Version: 4.0.0 +Version: 4.2.0 Release: 0 Summary: XMvn Parent POM License: Apache-2.0 Group: Development/Tools/Building URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz -Patch1: 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch -Patch2: 0002-module-path-not-allowed-with-release-8.patch -Patch3: 0001-Simple-implementation-of-toolchains-https-github.com.patch -Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch -Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch -Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch -Patch7: 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch -Patch8: 0001-Port-to-Maven-3.8.5.patch BuildRequires: javapackages-local BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin) diff --git a/xmvn-tools.spec b/xmvn-tools.spec index 0d12c47..4ed5d50 100644 --- a/xmvn-tools.spec +++ b/xmvn-tools.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global parent xmvn %global subname tools Name: %{parent}-%{subname} -Version: 4.0.0 +Version: 4.2.0 Release: 0 Summary: Local Extensions for Apache Maven License: Apache-2.0 @@ -27,17 +27,10 @@ Group: Development/Tools/Building URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/xmvn/releases/download/%{version}/%{parent}-%{version}.tar.xz Source1: %{parent}-build.tar.xz -Patch1: 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch -Patch2: 0002-module-path-not-allowed-with-release-8.patch -Patch3: 0001-Simple-implementation-of-toolchains-https-github.com.patch -Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch -Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch -Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch -Patch7: 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch -Patch8: 0001-Port-to-Maven-3.8.5.patch BuildRequires: ant BuildRequires: apache-commons-compress -BuildRequires: beust-jcommander +BuildRequires: atinject +BuildRequires: beust-jcommander >= 1.82 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local @@ -81,7 +74,7 @@ Summary: XMvn Resolver Group: Development/Tools/Building Requires: %{parent}-api = %{version} Requires: %{parent}-core = %{version} -Requires: beust-jcommander +Requires: beust-jcommander >= 1.82 Requires: javapackages-tools %description -n %{parent}-resolve @@ -181,7 +174,7 @@ build-jar-repository -s lib \ beust-jcommander commons-compress maven-invoker/maven-invoker \ objectweb-asm/asm plexus-containers/plexus-component-annotations \ plexus-containers/plexus-container-default plexus/utils slf4j/api \ - maven-shared-utils/maven-shared-utils + maven-shared-utils/maven-shared-utils javax.inject %{ant} -Dtest.skip=true package javadoc %install diff --git a/xmvn.spec b/xmvn.spec index 7033d12..3c4496d 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,7 +1,7 @@ # # spec file for package xmvn # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xmvn -Version: 4.0.0 +Version: 4.2.0 Release: 0 Summary: Local Extensions for Apache Maven License: Apache-2.0