Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xmvn for openSUSE:Factory checked in at 2022-05-11 09:20:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmvn (Old) and /work/SRC/openSUSE:Factory/.xmvn.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmvn" Wed May 11 09:20:13 2022 rev:8 rq:976065 version:4.0.0 Changes: -------- New Changes file: --- /dev/null 2022-04-21 01:28:04.620089996 +0200 +++ /work/SRC/openSUSE:Factory/.xmvn.new.1538/xmvn-connector.changes 2022-05-11 09:20:14.660622482 +0200 @@ -0,0 +1,45 @@ +------------------------------------------------------------------- +Tue May 10 12:36:15 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 4.0.0 +- Rename package xmvn-connector-aether -> xmvn-connector +- Removed patches: + * xmvn-gradle_4_4_1.patch + * 0001-Fix-resolution-of-aliases-registered-by-add_maven_de.patch + + Patches the inexisting xmvn-connector-gradle module + * 0001-Prefer-namespaced-metadata-when-duplicates-are-found.patch + * 0002-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch + * 0003-Fix-requires-generation-for-self-depending-packages.patch + + Integrated upstream +- Added patches: + * 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch + * 0002-module-path-not-allowed-with-release-8.patch + + make Xmvn Javadoc Mojo respect release and source arguments + * 0001-Simple-implementation-of-toolchains-https-github.com.patch + + consider toolchains if specifies in Xmvn Javadoc Mojo + * 0001-Restore-possibility-to-build-with-Java-8.patch + * 0002-Revert-Update-compiler-source-target-to-JDK-11.patch + * 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch + * 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch + + different fixes to be able to build with JDK8 + +------------------------------------------------------------------- +Thu Nov 21 14:23:27 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Upgrade to upstream version 3.1.0 +- Removed patches: + * 0001-Fix-installer-plugin-loading.patch + * 0001-Port-to-Gradle-4.2.patch + * 0001-Port-to-Gradle-4.3.1.patch + * 0001-Support-setting-Xdoclint-none-in-m-javadoc-p-3.0.0.patch + * 0001-Fix-configuration-of-aliased-plugins.patch + * 0001-Don-t-use-JAXB-for-converting-bytes-to-hex-string.patch + * 0001-Use-apache-commons-compress-for-manifest-injection-a.patch + * 0001-port-to-gradle-4.4.1.patch + * 0001-Replace-JAXB-parser.patch + + Integrated in this version + +------------------------------------------------------------------- +Wed Mar 27 06:27:36 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Initial packaging of xmvn-connector-aether 3.0.0 --- /work/SRC/openSUSE:Factory/xmvn/xmvn-mojo.changes 2019-11-26 17:04:51.103996974 +0100 +++ /work/SRC/openSUSE:Factory/.xmvn.new.1538/xmvn-mojo.changes 2022-05-11 09:20:14.680622502 +0200 @@ -1,0 +2,24 @@ +Tue May 10 12:36:15 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 4.0.0 +- Removed patches: + * xmvn-gradle_4_4_1.patch + * 0001-Fix-resolution-of-aliases-registered-by-add_maven_de.patch + + Patches the inexisting xmvn-connector-gradle module + * 0001-Prefer-namespaced-metadata-when-duplicates-are-found.patch + * 0002-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch + * 0003-Fix-requires-generation-for-self-depending-packages.patch + + Integrated upstream +- Added patches: + * 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch + * 0002-module-path-not-allowed-with-release-8.patch + + make Xmvn Javadoc Mojo respect release and source arguments + * 0001-Simple-implementation-of-toolchains-https-github.com.patch + + consider toolchains if specifies in Xmvn Javadoc Mojo + * 0001-Restore-possibility-to-build-with-Java-8.patch + * 0002-Revert-Update-compiler-source-target-to-JDK-11.patch + * 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch + * 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch + + different fixes to be able to build with JDK8 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/xmvn/xmvn-parent.changes 2019-11-26 17:04:53.075996293 +0100 +++ /work/SRC/openSUSE:Factory/.xmvn.new.1538/xmvn-parent.changes 2022-05-11 09:20:14.708622529 +0200 @@ -1,0 +2,5 @@ +Tue May 10 12:36:15 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 4.0.0 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/xmvn/xmvn-tools.changes 2019-11-26 17:04:54.403995835 +0100 +++ /work/SRC/openSUSE:Factory/.xmvn.new.1538/xmvn-tools.changes 2022-05-11 09:20:14.776622597 +0200 @@ -1,0 +2,24 @@ +Tue May 10 12:36:15 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 4.0.0 +- Removed patches: + * xmvn-gradle_4_4_1.patch + * 0001-Fix-resolution-of-aliases-registered-by-add_maven_de.patch + + Patches the inexisting xmvn-connector-gradle module + * 0001-Prefer-namespaced-metadata-when-duplicates-are-found.patch + * 0002-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch + * 0003-Fix-requires-generation-for-self-depending-packages.patch + + Integrated upstream +- Added patches: + * 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch + * 0002-module-path-not-allowed-with-release-8.patch + + make Xmvn Javadoc Mojo respect release and source arguments + * 0001-Simple-implementation-of-toolchains-https-github.com.patch + + consider toolchains if specifies in Xmvn Javadoc Mojo + * 0001-Restore-possibility-to-build-with-Java-8.patch + * 0002-Revert-Update-compiler-source-target-to-JDK-11.patch + * 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch + * 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch + + different fixes to be able to build with JDK8 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/xmvn/xmvn.changes 2021-10-23 00:52:02.617149611 +0200 +++ /work/SRC/openSUSE:Factory/.xmvn.new.1538/xmvn.changes 2022-05-11 09:20:14.796622616 +0200 @@ -1,0 +2,5 @@ +Tue May 10 12:36:15 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 4.0.0 + +------------------------------------------------------------------- Old: ---- 0001-Fix-resolution-of-aliases-registered-by-add_maven_de.patch 0001-Prefer-namespaced-metadata-when-duplicates-are-found.patch 0002-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch 0003-Fix-requires-generation-for-self-depending-packages.patch xmvn-3.1.0.tar.xz xmvn-connector-aether.changes xmvn-connector-aether.spec xmvn-connector-gradle.changes xmvn-connector-gradle.spec xmvn-connector-ivy.changes xmvn-connector-ivy.spec xmvn-gradle_4_4_1.patch New: ---- 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch 0001-Restore-possibility-to-build-with-Java-8.patch 0001-Simple-implementation-of-toolchains-https-github.com.patch 0002-Revert-Update-compiler-source-target-to-JDK-11.patch 0002-module-path-not-allowed-with-release-8.patch 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch xmvn-4.0.0.tar.xz xmvn-connector.changes xmvn-connector.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmvn-connector-aether.spec -> xmvn-connector.spec ++++++ --- /work/SRC/openSUSE:Factory/xmvn/xmvn-connector-aether.spec 2021-10-23 00:52:02.533149573 +0200 +++ /work/SRC/openSUSE:Factory/.xmvn.new.1538/xmvn-connector.spec 2022-05-11 09:20:14.672622494 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,10 @@ %global parent xmvn -%global subname connector-aether +%global subname connector %bcond_with tests Name: %{parent}-%{subname} -Version: 3.1.0 +Version: 4.0.0 Release: 0 Summary: XMvn Connector for Maven Resolver License: Apache-2.0 @@ -28,6 +28,13 @@ 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 BuildRequires: %{parent}-api = %{version} BuildRequires: %{parent}-core = %{version} BuildRequires: ant @@ -43,6 +50,8 @@ BuildRequires: sisu-plexus BuildRequires: xmvn-install BuildRequires: xmvn-resolve +Provides: %{name}-aether = %{version} +Obsoletes: %{name}-aether < %{version} BuildArch: noarch %description @@ -61,9 +70,7 @@ %prep %setup -q -n %{parent}-%{version} -a1 -# Bisect IT has no chances of working in local, offline mode, without -# network access - it needs to access remote repositories. -find -name BisectIntegrationTest.java -delete +%autopatch -p1 # Resolver IT won't work either - it tries to execute JAR file, which # relies on Class-Path in manifest, which is forbidden in Fedora... ++++++ xmvn-mojo.spec ++++++ --- /var/tmp/diff_new_pack.sLneY3/_old 2022-05-11 09:20:15.696623507 +0200 +++ /var/tmp/diff_new_pack.sLneY3/_new 2022-05-11 09:20:15.700623512 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,20 @@ %global parent xmvn %global subname mojo Name: %{parent}-%{subname} -Version: 3.1.0 +Version: 4.0.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 BuildRequires: %{parent}-api = %{version} BuildRequires: %{parent}-core = %{version} BuildRequires: fdupes @@ -72,9 +79,7 @@ %prep %setup -q -n %{parent}-%{version} -# Bisect IT has no chances of working in local, offline mode, without -# network access - it needs to access remote repositories. -find -name BisectIntegrationTest.java -delete +%autopatch -p1 # Resolver IT won't work either - it tries to execute JAR file, which # relies on Class-Path in manifest, which is forbidden in Fedora... @@ -98,7 +103,8 @@ # Don't put Class-Path attributes in manifests %pom_remove_plugin :maven-jar-plugin xmvn-tools -%pom_remove_dep -r :xmlunit-assertj +# Remove all dependencies with scope test, since a raw xmvn does not hide them +%pom_remove_dep -r :::test: pushd %{name} %{mvn_file} :{*} %{parent}/@1 ++++++ xmvn-parent.spec ++++++ --- /var/tmp/diff_new_pack.sLneY3/_old 2022-05-11 09:20:15.720623531 +0200 +++ /var/tmp/diff_new_pack.sLneY3/_new 2022-05-11 09:20:15.724623535 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,20 @@ %global parent xmvn %global subname parent Name: %{parent}-%{subname} -Version: 3.1.0 +Version: 4.0.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 BuildRequires: javapackages-local BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin) @@ -40,6 +47,8 @@ %prep %setup -q -n %{parent}-%{version} +%autopatch -p1 + %pom_remove_plugin -r :maven-site-plugin # Upstream code quality checks, not relevant when building RPMs ++++++ xmvn-tools.spec ++++++ --- /var/tmp/diff_new_pack.sLneY3/_old 2022-05-11 09:20:15.744623555 +0200 +++ /var/tmp/diff_new_pack.sLneY3/_new 2022-05-11 09:20:15.748623559 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 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: 3.1.0 +Version: 4.0.0 Release: 0 Summary: Local Extensions for Apache Maven License: Apache-2.0 @@ -27,9 +27,13 @@ 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-Prefer-namespaced-metadata-when-duplicates-are-found.patch -Patch2: 0002-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch -Patch3: 0003-Fix-requires-generation-for-self-depending-packages.patch +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 BuildRequires: ant BuildRequires: apache-commons-compress BuildRequires: beust-jcommander @@ -86,19 +90,6 @@ implemented by XMvn Core. The primary intended use case of XMvn Resolver is debugging local artifact repositories. -%package -n %{parent}-bisect -Summary: XMvn Bisect -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Group: Development/Tools/Building -Requires: beust-jcommander -Requires: javapackages-tools -Requires: maven-invoker - -%description -n %{parent}-bisect -This package provides XMvn Bisect, which is a debugging tool that can -diagnose build failures by using bisection method. - %package -n %{parent}-subst Summary: XMvn Subst # Explicit javapackages-tools requires since scripts use @@ -143,13 +134,7 @@ %prep %setup -q -n %{parent}-%{version} -a1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - -# Bisect IT has no chances of working in local, offline mode, without -# network access - it needs to access remote repositories. -find -name BisectIntegrationTest.java -delete +%autopatch -p1 # Resolver IT won't work either - it tries to execute JAR file, which # relies on Class-Path in manifest, which is forbidden in Fedora... @@ -182,7 +167,7 @@ <version>%{version}</version>" %{parent}-${i} %pom_remove_parent %{parent}-${i} done -for i in bisect install resolve subst; do +for i in install resolve subst; do %pom_xpath_inject "pom:project" " <groupId>org.fedoraproject.xmvn</groupId> <version>%{version}</version>" %{parent}-tools/%{parent}-${i} @@ -204,7 +189,7 @@ for i in api core; do install -pm 0644 %{parent}-${i}/target/%{parent}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{parent}/%{parent}-${i}.jar done -for i in bisect install resolve subst; do +for i in install resolve subst; do install -pm 0644 %{parent}-tools/%{parent}-${i}/target/%{parent}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{parent}/%{parent}-${i}.jar done @@ -214,7 +199,7 @@ install -pm 0644 %{parent}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{parent}-${i}.pom %add_maven_depmap %{parent}/%{parent}-${i}.pom %{parent}/%{parent}-${i}.jar -f ${i} done -for i in bisect install resolve subst; do +for i in install resolve subst; do install -pm 0644 %{parent}-tools/%{parent}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{parent}-${i}.pom %add_maven_depmap %{parent}/%{parent}-${i}.pom %{parent}/%{parent}-${i}.jar -f ${i} done @@ -225,14 +210,13 @@ install -dm 0755 %{buildroot}%{_javadocdir}/%{parent}/${i} cp -pr %{parent}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{parent}/${i}/ done -for i in bisect install resolve subst; do +for i in install resolve subst; do install -dm 0755 %{buildroot}%{_javadocdir}/%{parent}/${i} cp -pr %{parent}-tools/%{parent}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{parent}/${i}/ done %fdupes -s %{buildroot}%{_javadocdir} # helper scripts -%jpackage_script org.fedoraproject.xmvn.tools.bisect.BisectCli "" "-Dxmvn.home=%{_datadir}/%{name}" %{parent}/%{parent}-bisect:beust-jcommander:maven-invoker:plexus/utils %{parent}-bisect %jpackage_script org.fedoraproject.xmvn.tools.install.cli.InstallerCli "" "" %{parent}/%{parent}-install:%{parent}/%{parent}-api:%{parent}/%{parent}-core:beust-jcommander:slf4j/api:slf4j/simple:objectweb-asm/asm:commons-compress %{parent}-install %jpackage_script org.fedoraproject.xmvn.tools.resolve.ResolverCli "" "" %{parent}/%{parent}-resolve:%{parent}/%{parent}-api:%{parent}/%{parent}-core:beust-jcommander %{parent}-resolve %jpackage_script org.fedoraproject.xmvn.tools.subst.SubstCli "" "" %{parent}/%{parent}-subst:%{parent}/%{parent}-api:%{parent}/%{parent}-core:beust-jcommander %{parent}-subst @@ -246,9 +230,6 @@ %files -n %{parent}-resolve -f .mfiles-resolve %{_bindir}/%{parent}-resolve -%files -n %{parent}-bisect -f .mfiles-bisect -%{_bindir}/%{parent}-bisect - %files -n %{parent}-subst -f .mfiles-subst %{_bindir}/%{parent}-subst ++++++ xmvn.spec ++++++ --- /var/tmp/diff_new_pack.sLneY3/_old 2022-05-11 09:20:15.764623575 +0200 +++ /var/tmp/diff_new_pack.sLneY3/_new 2022-05-11 09:20:15.772623583 +0200 @@ -1,7 +1,7 @@ # # spec file for package xmvn # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ Name: xmvn -Version: 3.1.0 +Version: 4.0.0 Release: 0 Summary: Local Extensions for Apache Maven License: Apache-2.0 Group: Development/Tools/Building URL: https://fedora-java.github.io/xmvn/ BuildRequires: %{name}-api = %{version} -BuildRequires: %{name}-connector-aether = %{version} +BuildRequires: %{name}-connector = %{version} BuildRequires: %{name}-core = %{version} BuildRequires: %{name}-subst BuildRequires: javapackages-tools @@ -42,7 +42,7 @@ Summary: Dependency-reduced version of XMvn Group: Development/Tools/Building Requires: %{name}-api = %{version} -Requires: %{name}-connector-aether = %{version} +Requires: %{name}-connector = %{version} Requires: %{name}-core = %{version} %requires_eq maven-lib @@ -63,7 +63,7 @@ install -d -m 755 %{buildroot}%{_datadir}/%{name} cp -aL ${maven_home}/* %{buildroot}%{_datadir}/%{name}/ -for i in api core connector-aether; do +for i in api core connector; do ln -s $(build-classpath %{name}/%{name}-${i}) %{buildroot}%{_datadir}/%{name}/lib/ext/ done ++++++ 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch ++++++ >From c2f74691a71509c3671d3bc612be285a511c53f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch> 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<Path> reactorClassPath = new ArrayList<>(); List<Path> 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 ++++++ 0001-Restore-possibility-to-build-with-Java-8.patch ++++++ >From 25029d2fc4db56e9f9a451505c8c76aaf0e8be9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch> 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 ++++++ 0001-Simple-implementation-of-toolchains-https-github.com.patch ++++++ >From acb236f878b020722512b1ce0ba20329500083c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch> 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 ++++++ 0002-Revert-Update-compiler-source-target-to-JDK-11.patch ++++++ >From cd83d67f9138ef1cada913b539c0eb90c35de585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch> 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 @@ <attribute name="test" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> 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 @@ <attribute name="test" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> 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 @@ <attribute name="test" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> 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 @@ <attribute name="test" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> 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 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.8.1</version> <configuration> - <release>11</release> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> </plugins> 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 @@ <attribute name="test" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> 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 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${compilerPluginVersion}</version> <configuration> - <release>11</release> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> <plugin> 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 @@ <attribute name="test" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> 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 @@ <attribute name="test" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> 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 @@ <attribute name="test" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> 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 ++++++ 0002-module-path-not-allowed-with-release-8.patch ++++++ >From 34ee4dad896f9f82131a090293c3a9ccaa77b729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch> 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 ++++++ 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch ++++++ >From 67ad1e7228166863edc81fe56b74abad443251df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch> 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<DependencyDescriptor> 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<String, String> 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<Artifact> getArtifacts() { - return Set.copyOf( artifacts ); + return Collections.unmodifiableSet( artifacts ); } private boolean isExternal( InputLocation location ) -- 2.36.0 ++++++ 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch ++++++ >From 4dc70921e93fdf1f34e9c02b7a9bd8890bb4ac4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch> 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 @@ </plugins> </build> </profile> + <profile> + <id>jdk9+</id> + <activation> + <jdk>[9,)</jdk> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <release>8</release> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> -- 2.36.0 ++++++ xmvn-3.1.0.tar.xz -> xmvn-4.0.0.tar.xz ++++++ ++++ 36666 lines of diff (skipped) ++++++ xmvn-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2019-11-21 14:02:20.080555084 +0100 +++ new/common.xml 2022-05-08 09:20:44.382177996 +0200 @@ -3,7 +3,7 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="3.1.0"/> + <property name="project.version" value="4.0.0"/> <property name="project.groupId" value="org.fedoraproject.xmvn"/> <property name="compiler.source" value="1.8"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmvn-api/build.xml new/xmvn-api/build.xml --- old/xmvn-api/build.xml 2019-03-22 08:22:36.089872834 +0100 +++ new/xmvn-api/build.xml 2022-05-03 16:40:52.727139083 +0200 @@ -76,7 +76,7 @@ </macrodef> <macrodef name="modello"> <attribute name="file"/> - <attribute name="version" default="3.0.0"/> + <attribute name="version" default="3.2.0"/> <sequential> <echo taskname="modello" message="Generating sources for @{file}"/> <modello-single-mode file="@{file}" version="@{version}" mode="java"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmvn-connector/build.xml new/xmvn-connector/build.xml --- old/xmvn-connector/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xmvn-connector/build.xml 2022-05-08 09:23:01.742992451 +0200 @@ -0,0 +1,251 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="xmvn-connector" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="xmvn-connector"/> + <property name="project.name" value="XMvn Connector for Maven Resolver"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src/main/java"/> + <property name="build.resourceDir" value="src/main/resources"/> + <property name="build.testOutputDir" value="${build.dir}/test-classes"/> + <property name="build.testDir" value="src/test/java"/> + <property name="build.testResourceDir" value="src/test/resources"/> + <property name="test.reports" value="${build.dir}/test-reports"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="../xmvn-api/target/classes"/> + <pathelement location="../xmvn-core/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + <path id="build.test.classpath"> + <pathelement location="../xmvn-api/target/classes"/> + <pathelement location="../xmvn-core/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <mkdir dir="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}"/> + <propertyfile file="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.properties"> + <entry key="artifactId" value="${project.artifactId}"/> + <entry key="groupId" value="${project.groupId}"/> + <entry key="version" value="${project.version}"/> + </propertyfile> + <copy file="pom.xml" tofile="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml"/> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + depends="compile" + description="Generate Plexus component.xml"> + <mkdir dir="${build.outputDir}/META-INF/plexus"/> + <property name="exec_classpath" refid="build.classpath"/> + <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + failonerror="true" + fork="true"> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="plexus" + description="Compile the test code" + unless="test.skip"> + <mkdir dir="${build.testOutputDir}"/> + <javac destdir="${build.testOutputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.testDir}"/> + </src> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + </javac> + <copy todir="${build.testOutputDir}"> + <fileset dir="${build.testResourceDir}"/> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"> + <mkdir dir="${test.reports}"/> + <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> + <sysproperty key="basedir" value="."/> + <formatter type="xml"/> + <formatter type="plain" usefile="false"/> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${build.outputDir}"/> + <pathelement location="${build.testOutputDir}"/> + </classpath> + <batchtest todir="${test.reports}" unless="test"> + <fileset dir="${build.testDir}"> + <include name="**/Test*.java"/> + <include name="**/*Test.java"/> + <include name="**/*TestCase.java"/> + <exclude name="**/*Abstract*Test.java"/> + </fileset> + </batchtest> + <batchtest todir="${test.reports}" if="test"> + <fileset dir="${build.testDir}"> + <include name="**/${test}.java"/> + <exclude name="**/*Abstract*Test.java"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + source="${compiler.source}" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + linksource="false" + breakiterator="false"> + <classpath refid="build.classpath"/> + </javadoc> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="plexus,test" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"/> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmvn-connector-aether/build.xml new/xmvn-connector-aether/build.xml --- old/xmvn-connector-aether/build.xml 2019-03-22 08:22:23.929809799 +0100 +++ new/xmvn-connector-aether/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,276 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="xmvn-connector-aether" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <include file="../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="xmvn-connector-aether"/> - <property name="project.name" value="XMvn Connector for Eclipse Aether"/> - - <property name="build.finalName" value="${project.artifactId}-${project.version}"/> - <property name="build.dir" value="target"/> - <property name="build.outputDir" value="${build.dir}/classes"/> - <property name="build.srcDir" value="src/main/java"/> - <property name="build.resourceDir" value="src/main/resources"/> - <property name="build.testOutputDir" value="${build.dir}/test-classes"/> - <property name="build.testDir" value="src/test/java"/> - <property name="build.testResourceDir" value="src/test/resources"/> - <property name="test.reports" value="${build.dir}/test-reports"/> - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <pathelement location="../xmvn-api/target/classes"/> - <pathelement location="../xmvn-core/target/classes"/> - <fileset dir="../lib"> - <!-- maven-core-3.5.0 maven-settings-3.5.0 maven-settings-builder-3.5.0 - maven-repository-metadata-3.5.0 maven-resolver-provider-3.5.0 - maven-model-3.5.0 maven-model-builder-3.5.0 maven-builder-support-3.5.0 - maven-plugin-api-3.5.0 maven-artifact-3.5.0 - maven-resolver-impl-1.0.3 maven-resolver-spi-1.0.3 maven-resolver-util-1.0.3 - maven-resolver-api-1.0.3 - maven-shared-utils-3.1.0 commons-io-2.5 org.eclipse.sisu.plexus-0.3.3 - cdi-api-1.0 jsr250-api-1.0 org.eclipse.sisu.inject-0.3.3 guice-4.0-no_aop - javax.inject-1 aopalliance-1.0 plexus-interpolation-1.24 - plexus-classworlds-2.5.2 plexus-sec-dispatcher-1.4 plexus-cipher-1.4 - commons-lang3-3.5 guava-20.0 plexus-utils-3.0.24 xbean-reflect-3.7 - google-collections-1.0 --> - <include name="**/*.jar"/> - </fileset> - </path> - <path id="build.test.classpath"> - <pathelement location="../xmvn-api/target/classes"/> - <pathelement location="../xmvn-core/target/classes"/> - <fileset dir="../lib"> - <!-- maven-core-3.5.0 maven-settings-3.5.0. maven-settings-builder-3.5.0 - maven-repository-metadata-3.5.0 maven-resolver-provider-3.5.0 - maven-model-3.5.0 maven-model-builder-3.5.0 maven-builder-support-3.5.0 - maven-plugin-api-3.5.0 maven-artifact-3.5.0 - maven-resolver-impl-1.0.3 maven-resolver-spi-1.0.3 maven-resolver-util-1.0.3 - maven-resolver-api-1.0.3. - maven-shared-utils-3.1.0 commons-io-2.5 org.eclipse.sisu.plexus-0.3.3 - cdi-api-1.0 jsr250-api-1.0 org.eclipse.sisu.inject-0.3.3 guice-4.0-no_aop - javax.inject-1 aopalliance-1.0 plexus-interpolation-1.24 - plexus-classworlds-2.5.2 plexus-sec-dispatcher-1.4 plexus-cipher-1.4 - commons-lang3-3.5 guava-20.0 plexus-utils-3.0.24 xbean-reflect-3.7 - google-collections-1.0 junit-4.12 hamcrest-core-1.3 xmlunit-1.6 - easymock-3.5 objenesis-2.6 slf4j-simple-1.7.25 slf4j-api-1.7.25 --> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <mkdir dir="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}"/> - <propertyfile file="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.properties"> - <entry key="artifactId" value="${project.artifactId}"/> - <entry key="groupId" value="${project.groupId}"/> - <entry key="version" value="${project.version}"/> - </propertyfile> - <copy file="pom.xml" tofile="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml"/> - </target> - - <!-- ====================================================================== --> - <!-- Target to generate Plexus component.xml --> - <!-- ====================================================================== --> - - <target name="plexus" - depends="compile" - description="Generate Plexus component.xml"> - <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <property name="exec_classpath" refid="build.classpath"/> - <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" - failonerror="true" - fork="true"> - <classpath> - <path refid="build.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - <arg value="-X"/> - <arg value="-s"/> - <arg value="${build.srcDir}"/> - <arg value="-c"/> - <arg value="${build.outputDir}"/> - <arg value="-m"/> - <arg value="${build.outputDir}/META-INF/plexus"/> - <arg value="-o"/> - <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </java> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="plexus" - description="Compile the test code" - unless="test.skip"> - <mkdir dir="${build.testOutputDir}"/> - <javac destdir="${build.testOutputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.testDir}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - </javac> - <copy todir="${build.testOutputDir}"> - <fileset dir="${build.testResourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"> - <mkdir dir="${test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - <pathelement location="${build.testOutputDir}"/> - </classpath> - <batchtest todir="${test.reports}" unless="test"> - <fileset dir="${build.testDir}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - <batchtest todir="${test.reports}" if="test"> - <fileset dir="${build.testDir}"> - <include name="**/${test}.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - access="protected" - source="${compiler.source}" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - linksource="false" - breakiterator="false"> - <classpath refid="build.classpath"/> - </javadoc> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="plexus,test" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"/> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmvn-connector-ivy/build.xml new/xmvn-connector-ivy/build.xml --- old/xmvn-connector-ivy/build.xml 2019-03-22 08:22:11.577745765 +0100 +++ new/xmvn-connector-ivy/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,224 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="xmvn-connector-ivy" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <include file="../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="xmvn-connector-ivy"/> - <property name="project.name" value="XMvn Connector for Apache Ivy"/> - - <property name="build.finalName" value="${project.artifactId}-${project.version}"/> - <property name="build.dir" value="target"/> - <property name="build.outputDir" value="${build.dir}/classes"/> - <property name="build.srcDir" value="src/main/java"/> - <property name="build.resourceDir" value="src/main/resources"/> - <property name="build.testOutputDir" value="${build.dir}/test-classes"/> - <property name="build.testDir" value="src/test/java"/> - <property name="build.testResourceDir" value="src/test/resources"/> - <property name="test.reports" value="${build.dir}/test-reports"/> - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <pathelement location="../xmvn-api/target/classes"/> - <fileset dir="../lib"> - <!-- slf4j-api-1.7.25 ivy-2.4.0 --> - <include name="**/*.jar"/> - </fileset> - </path> - <path id="build.test.classpath"> - <pathelement location="../xmvn-api/target/classes"/> - <fileset dir="../lib"> - <!-- slf4j-api-1.7.25 ivy-2.4.0 junit-4.12 hamcrest-core-1.3 - xmlunit-1.6 easymock-3.5 objenesis-2.6 slf4j-simple-1.7.25 --> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <mkdir dir="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}"/> - <propertyfile file="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.properties"> - <entry key="artifactId" value="${project.artifactId}"/> - <entry key="groupId" value="${project.groupId}"/> - <entry key="version" value="${project.version}"/> - </propertyfile> - <copy file="pom.xml" tofile="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml"/> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="test.skip"> - <mkdir dir="${build.testOutputDir}"/> - <javac destdir="${build.testOutputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.testDir}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - </javac> - <copy todir="${build.testOutputDir}"> - <fileset dir="${build.testResourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"> - <mkdir dir="${test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - <pathelement location="${build.testOutputDir}"/> - </classpath> - <batchtest todir="${test.reports}" unless="test"> - <fileset dir="${build.testDir}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - <batchtest todir="${test.reports}" if="test"> - <fileset dir="${build.testDir}"> - <include name="**/${test}.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - access="protected" - source="${compiler.source}" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - linksource="false" - breakiterator="false"> - <classpath refid="build.classpath"/> - </javadoc> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile,test" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"/> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmvn-tools/build.xml new/xmvn-tools/build.xml --- old/xmvn-tools/build.xml 2019-03-22 06:33:33.763502159 +0100 +++ new/xmvn-tools/build.xml 2022-05-08 09:24:24.959491469 +0200 @@ -8,7 +8,6 @@ <target name="clean" description="Clean the output directory"> <ant antfile="build.xml" dir="xmvn-resolve" target="clean"/> - <ant antfile="build.xml" dir="xmvn-bisect" target="clean"/> <ant antfile="build.xml" dir="xmvn-subst" target="clean"/> <ant antfile="build.xml" dir="xmvn-install" target="clean"/> </target> @@ -19,7 +18,6 @@ <target name="compile" description="Compile the code"> <ant antfile="build.xml" dir="xmvn-resolve" target="compile"/> - <ant antfile="build.xml" dir="xmvn-bisect" target="compile"/> <ant antfile="build.xml" dir="xmvn-subst" target="compile"/> <ant antfile="build.xml" dir="xmvn-install" target="compile"/> </target> @@ -30,7 +28,6 @@ <target name="compile-tests" description="Compile the test code"> <ant antfile="build.xml" dir="xmvn-resolve" target="compile-tests"/> - <ant antfile="build.xml" dir="xmvn-bisect" target="compile-tests"/> <ant antfile="build.xml" dir="xmvn-subst" target="compile-tests"/> <ant antfile="build.xml" dir="xmvn-install" target="compile-tests"/> </target> @@ -41,7 +38,6 @@ <target name="test" description="Run the test cases"> <ant antfile="build.xml" dir="xmvn-resolve" target="test"/> - <ant antfile="build.xml" dir="xmvn-bisect" target="test"/> <ant antfile="build.xml" dir="xmvn-subst" target="test"/> <ant antfile="build.xml" dir="xmvn-install" target="test"/> </target> @@ -52,7 +48,6 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <ant antfile="build.xml" dir="xmvn-resolve" target="javadoc"/> - <ant antfile="build.xml" dir="xmvn-bisect" target="javadoc"/> <ant antfile="build.xml" dir="xmvn-subst" target="javadoc"/> <ant antfile="build.xml" dir="xmvn-install" target="javadoc"/> </target> @@ -63,7 +58,6 @@ <target name="package" description="Package the application"> <ant antfile="build.xml" dir="xmvn-resolve" target="package"/> - <ant antfile="build.xml" dir="xmvn-bisect" target="package"/> <ant antfile="build.xml" dir="xmvn-subst" target="package"/> <ant antfile="build.xml" dir="xmvn-install" target="package"/> </target> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmvn-tools/xmvn-bisect/build.xml new/xmvn-tools/xmvn-bisect/build.xml --- old/xmvn-tools/xmvn-bisect/build.xml 2019-03-22 08:21:14.585450319 +0100 +++ new/xmvn-tools/xmvn-bisect/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,177 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="xmvn-bisect" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <include file="../../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="xmvn-bisect"/> - <property name="project.name" value="XMvn Bisect"/> - - <property name="build.finalName" value="${project.artifactId}-${project.version}"/> - <property name="build.dir" value="target"/> - <property name="build.outputDir" value="${build.dir}/classes"/> - <property name="build.srcDir" value="src/main/java"/> - <property name="build.resourceDir" value="src/main/resources"/> - <property name="build.testOutputDir" value="${build.dir}/test-classes"/> - <property name="build.testDir" value="src/test/java"/> - <property name="build.testResourceDir" value="src/test/resources"/> - <property name="test.reports" value="${build.dir}/test-reports"/> - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <fileset dir="../../lib"> - <!-- jcommander-1.64 maven-invoker-2.2 plexus-utils-3.0.24 --> - <include name="**/*.jar"/> - </fileset> - </path> - <path id="build.test.classpath"> - <fileset dir="../../lib"> - <!-- jcommander-1.64 maven-invoker-2.2 plexus-utils-3.0.24 - junit-4.12 hamcrest-core-1.3 xmlunit-1.6 easymock-3.5 - objenesis-2.6.jar slf4j-simple-1.7.25 slf4j-api-1.7.25 --> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <mkdir dir="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}"/> - <propertyfile file="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.properties"> - <entry key="artifactId" value="${project.artifactId}"/> - <entry key="groupId" value="${project.groupId}"/> - <entry key="version" value="${project.version}"/> - </propertyfile> - <copy file="pom.xml" tofile="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml"/> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="test.skip"> - <mkdir dir="${build.testOutputDir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"/> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - access="protected" - source="${compiler.source}" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - linksource="false" - breakiterator="false"> - <classpath refid="build.classpath"/> - </javadoc> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile,test" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"/> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project>