June 2024 - openSUSE Commits - openSUSE Mailing Lists

commit gitea-runner-image for openSUSE:Factory
by Source-Sync 06 Jun '24

06 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gitea-runner-image for openSUSE:Factory checked in at 2024-06-06 12:33:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gitea-runner-image (Old) and /work/SRC/openSUSE:Factory/.gitea-runner-image.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gitea-runner-image" Thu Jun 6 12:33:22 2024 rev:9 rq:1178820 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/gitea-runner-image/gitea-runner-image.changes 2024-06-05 17:40:48.206617904 +0200 +++ /work/SRC/openSUSE:Factory/.gitea-runner-image.new.24587/gitea-runner-image.changes 2024-06-06 12:33:40.870797507 +0200 @@ -1,0 +2,5 @@ +Wed Jun 5 15:13:27 UTC 2024 - Dirk Mueller <dmueller(a)suse.com> + +- Don't add artifacthub labels into labelprefix section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Dockerfile ++++++ --- /var/tmp/diff_new_pack.WXkbdm/_old 2024-06-06 12:33:41.362815437 +0200 +++ /var/tmp/diff_new_pack.WXkbdm/_new 2024-06-06 12:33:41.362815437 +0200 @@ -31,13 +31,12 @@ LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" -LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/bci-gitea-runner:%OS_VERSION_ID_SP%.%REL…" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime" LABEL org.opensuse.release-stage="released" - # endlabelprefix +LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…" RUN set -euo pipefail; zypper -n in --no-recommends osc expect obs-service-format_spec_file obs-service-source_validator typescript git openSUSE-release openSUSE-release-appliance-docker; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} COPY osc_checkout /usr/bin/osc_checkout

1 0

commit gcc-13-image for openSUSE:Factory
by Source-Sync 06 Jun '24

06 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gcc-13-image for openSUSE:Factory checked in at 2024-06-06 12:33:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc-13-image (Old) and /work/SRC/openSUSE:Factory/.gcc-13-image.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcc-13-image" Thu Jun 6 12:33:19 2024 rev:7 rq:1178817 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/gcc-13-image/gcc-13-image.changes 2024-06-05 17:40:43.466445344 +0200 +++ /work/SRC/openSUSE:Factory/.gcc-13-image.new.24587/gcc-13-image.changes 2024-06-06 12:33:35.766611501 +0200 @@ -1,0 +2,5 @@ +Wed Jun 5 15:13:27 UTC 2024 - Dirk Mueller <dmueller(a)suse.com> + +- Don't add artifacthub labels into labelprefix section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Dockerfile ++++++ --- /var/tmp/diff_new_pack.GM0KaN/_old 2024-06-06 12:33:37.038657858 +0200 +++ /var/tmp/diff_new_pack.GM0KaN/_new 2024-06-06 12:33:37.082659461 +0200 @@ -32,13 +32,12 @@ LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" -LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/gcc:13-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime" LABEL org.opensuse.release-stage="released" - # endlabelprefix +LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…" RUN set -euo pipefail; zypper -n in --no-recommends gcc13 gcc13-c++ make gawk gcc gcc-c++; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} ENV GCC_VERSION="%%gcc_version%%"

1 0

commit gcc-12-image for openSUSE:Factory
by Source-Sync 06 Jun '24

06 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gcc-12-image for openSUSE:Factory checked in at 2024-06-06 12:33:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc-12-image (Old) and /work/SRC/openSUSE:Factory/.gcc-12-image.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcc-12-image" Thu Jun 6 12:33:17 2024 rev:7 rq:1178816 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/gcc-12-image/gcc-12-image.changes 2024-06-05 17:40:40.582340354 +0200 +++ /work/SRC/openSUSE:Factory/.gcc-12-image.new.24587/gcc-12-image.changes 2024-06-06 12:33:33.262520247 +0200 @@ -1,0 +2,5 @@ +Wed Jun 5 15:13:27 UTC 2024 - Dirk Mueller <dmueller(a)suse.com> + +- Don't add artifacthub labels into labelprefix section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Dockerfile ++++++ --- /var/tmp/diff_new_pack.D54qEq/_old 2024-06-06 12:33:34.606569227 +0200 +++ /var/tmp/diff_new_pack.D54qEq/_new 2024-06-06 12:33:34.630570101 +0200 @@ -32,13 +32,12 @@ LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" -LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/gcc:12-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime" LABEL org.opensuse.release-stage="released" - # endlabelprefix +LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…" RUN set -euo pipefail; zypper -n in --no-recommends gcc12 gcc12-c++ make gawk; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} ENV GCC_VERSION="%%gcc_version%%"

1 0

commit distribution-image for openSUSE:Factory
by Source-Sync 06 Jun '24

06 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package distribution-image for openSUSE:Factory checked in at 2024-06-06 12:33:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/distribution-image (Old) and /work/SRC/openSUSE:Factory/.distribution-image.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "distribution-image" Thu Jun 6 12:33:16 2024 rev:13 rq:1178815 version:2024 Changes: -------- --- /work/SRC/openSUSE:Factory/distribution-image/distribution-image.changes 2024-06-05 17:40:35.386151198 +0200 +++ /work/SRC/openSUSE:Factory/.distribution-image.new.24587/distribution-image.changes 2024-06-06 12:33:30.158407125 +0200 @@ -1,0 +2,5 @@ +Wed Jun 5 15:13:27 UTC 2024 - Dirk Mueller <dmueller(a)suse.com> + +- Don't add artifacthub labels into labelprefix section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ distribution-image.kiwi ++++++ --- /var/tmp/diff_new_pack.RKN462/_old 2024-06-06 12:33:32.098477826 +0200 +++ /var/tmp/diff_new_pack.RKN462/_new 2024-06-06 12:33:32.138479284 +0200 @@ -40,13 +40,12 @@ <label name="org.opencontainers.image.vendor" value="openSUSE Project"/> <label name="org.opencontainers.image.source" value="%SOURCEURL%"/> <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/> - <label name="io.artifacthub.package.readme-url" value="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…"/> <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/registry:%%registry_version%%-%RELEASE%"/> <label name="org.openbuildservice.disturl" value="%DISTURL%"/> - <label name="org.opensuse.release-stage" value="released"/> <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime"/> </suse_label_helper:add_prefix> + <label name="io.artifacthub.package.readme-url" value="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…"/> </labels> <subcommand execute="serve"> <argument name="/etc/registry/config.yml"/>

1 0

commit busybox-image for openSUSE:Factory
by Source-Sync 06 Jun '24

06 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package busybox-image for openSUSE:Factory checked in at 2024-06-06 12:33:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/busybox-image (Old) and /work/SRC/openSUSE:Factory/.busybox-image.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "busybox-image" Thu Jun 6 12:33:15 2024 rev:15 rq:1178814 version:2024 Changes: -------- --- /work/SRC/openSUSE:Factory/busybox-image/busybox-image.changes 2024-06-05 17:40:32.794056838 +0200 +++ /work/SRC/openSUSE:Factory/.busybox-image.new.24587/busybox-image.changes 2024-06-06 12:33:28.882360624 +0200 @@ -1,0 +2,5 @@ +Wed Jun 5 15:13:27 UTC 2024 - Dirk Mueller <dmueller(a)suse.com> + +- Don't add artifacthub labels into labelprefix section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ busybox-image.kiwi ++++++ --- /var/tmp/diff_new_pack.SP0MWz/_old 2024-06-06 12:33:29.438380886 +0200 +++ /var/tmp/diff_new_pack.SP0MWz/_new 2024-06-06 12:33:29.442381032 +0200 @@ -39,14 +39,13 @@ <label name="org.opencontainers.image.vendor" value="openSUSE Project"/> <label name="org.opencontainers.image.source" value="%SOURCEURL%"/> <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/> - <label name="io.artifacthub.package.readme-url" value="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…"/> - <label name="io.artifacthub.package.logo-url" value="https://opensource.suse.com/bci/SLE_BCI_logomark_green.svg"/> <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE%"/> <label name="org.openbuildservice.disturl" value="%DISTURL%"/> - <label name="org.opensuse.release-stage" value="released"/> <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime"/> </suse_label_helper:add_prefix> + <label name="io.artifacthub.package.readme-url" value="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…"/> + <label name="io.artifacthub.package.logo-url" value="https://opensource.suse.com/bci/SLE_BCI_logomark_green.svg"/> </labels> <subcommand execute="/bin/sh"/> </containerconfig>

1 0

commit 389-ds-container for openSUSE:Factory
by Source-Sync 06 Jun '24

06 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 389-ds-container for openSUSE:Factory checked in at 2024-06-06 12:33:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/389-ds-container (Old) and /work/SRC/openSUSE:Factory/.389-ds-container.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "389-ds-container" Thu Jun 6 12:33:12 2024 rev:8 rq:1178811 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/389-ds-container/389-ds-container.changes 2024-06-05 17:40:25.057775214 +0200 +++ /work/SRC/openSUSE:Factory/.389-ds-container.new.24587/389-ds-container.changes 2024-06-06 12:33:24.166188757 +0200 @@ -1,0 +2,5 @@ +Wed Jun 5 15:13:27 UTC 2024 - Dirk Mueller <dmueller(a)suse.com> + +- Don't add artifacthub labels into labelprefix section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Dockerfile ++++++ --- /var/tmp/diff_new_pack.YqXTb1/_old 2024-06-06 12:33:25.006219370 +0200 +++ /var/tmp/diff_new_pack.YqXTb1/_new 2024-06-06 12:33:25.010219516 +0200 @@ -31,13 +31,12 @@ LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" -LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/389-ds:%%389ds_version%%-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime" LABEL org.opensuse.release-stage="released" - # endlabelprefix +LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…" RUN set -euo pipefail; zypper -n in --no-recommends 389-ds timezone openssl nss_synth; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} CMD ["/usr/lib/dirsrv/dscontainer", "-r"]

1 0

commit sisu for openSUSE:Factory
by Source-Sync 06 Jun '24

06 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sisu for openSUSE:Factory checked in at 2024-06-06 12:33:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sisu (Old) and /work/SRC/openSUSE:Factory/.sisu.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sisu" Thu Jun 6 12:33:11 2024 rev:10 rq:1178808 version:0.9.0.M3 Changes: -------- New Changes file: --- /dev/null 2024-04-24 00:57:13.556000000 +0200 +++ /work/SRC/openSUSE:Factory/.sisu.new.24587/sisu-mojos.changes 2024-06-06 12:33:22.814139485 +0200 @@ -0,0 +1,57 @@ +------------------------------------------------------------------- +Wed Jun 5 14:00:52 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to upstream milestone 0.9.0.M3 + * Changes + + Annotate new method + + Update workflow to run on Java 21 + + Build with final Java 21 on GitHub + + Switch to JUnit5 + + Disable annotation processor by default + + Do not silently fail in case of class scanning exceptions + + Formatting issues + + Update to ASM 9.7 + + Update CONTRIBUTING.md + + Align Plexus ASM version + + Rename release profile + + Fix Jacoco coverage repots in Sonar + + Add a method to allow LifecycleManager to free keys + + Licence change: From EPL1 to EPL2 + + update documentation for exposed core extensions, fix anchors + + Trigger Sonarcloud analysis from GHA +- Build sisu-mojos as a second spec within sisu package, since the + sources of sisu-mojos, sisu-inject and sisu-plexus were joined in + the same upstream project + +------------------------------------------------------------------- +Tue Sep 19 11:11:52 UTC 2023 - Fridrich Strba <fstrba(a)suse.com> + +- Do not require maven-javadoc-plugin that we don't use + +------------------------------------------------------------------- +Wed Sep 6 13:38:16 UTC 2023 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to 0.9.0 milestone 2 + * Changes of 0.9.0.M2 + + Add m2e support + + Convert APT to MD + + Update plugin + + Align to latest Maven plugins + * Changes of 0.9.0.M1 + + On debug, emit scanned entries + + Enable Java CI workflow + + Enable CodeQL analysis + + Avoid rewriting the index if it has not changed + * Changes of 0.3.5 + + Build against CDI API 1.2 + * Changes of 0.3.4 + + Reproducible builds + * Changes of 0.3.3 + + Lifecycle maintenance + * Changes of 0.3.2 + + Java9+Jigsaw support + +------------------------------------------------------------------- +Fri May 5 08:10:40 UTC 2023 - Fridrich Strba <fstrba(a)suse.com> + +- Initial packaging with version 0.3.1 --- /work/SRC/openSUSE:Factory/sisu/sisu.changes 2024-05-16 18:33:08.839066413 +0200 +++ /work/SRC/openSUSE:Factory/.sisu.new.24587/sisu.changes 2024-06-06 12:33:22.930143713 +0200 @@ -1,0 +2,25 @@ +Wed Jun 5 14:00:52 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to upstream milestone 0.9.0.M3 + * Changes + + Annotate new method + + Update workflow to run on Java 21 + + Build with final Java 21 on GitHub + + Switch to JUnit5 + + Disable annotation processor by default + + Do not silently fail in case of class scanning exceptions + + Formatting issues + + Update to ASM 9.7 + + Update CONTRIBUTING.md + + Align Plexus ASM version + + Rename release profile + + Fix Jacoco coverage repots in Sonar + + Add a method to allow LifecycleManager to free keys + + Licence change: From EPL1 to EPL2 + + update documentation for exposed core extensions, fix anchors + + Trigger Sonarcloud analysis from GHA +- Build sisu-mojos as a second spec within sisu package, since the + sources of sisu-mojos, sisu-inject and sisu-plexus were joined in + the same upstream project + +------------------------------------------------------------------- Old: ---- sisu-inject-0.9.0.M2.tar.gz sisu-plexus-0.9.0.M2.tar.gz New: ---- _multibuild sisu-mojos.changes sisu-mojos.spec sisu-project-0.9.0.M3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sisu-mojos.spec ++++++ # # spec file for package sisu-mojos # # Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # %global reltype milestones Name: sisu-mojos Version: 0.9.0.M3 Release: 0 Summary: Sisu plugin for Apache Maven License: EPL-1.0 AND EPL-2.0 Group: Development/Libraries/Java URL: https://www.eclipse.org/sisu Source0: https://github.com/eclipse-sisu/sisu-project/archive/refs/tags/%{reltype}/%… Patch1: sisu-no-dependency-on-glassfish-servlet-api.patch Patch3: sisu-osgi-api.patch Patch4: sisu-reproducible-index.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) >= %{version} BuildRequires: mvn(org.slf4j:slf4j-nop) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) #!BuildIgnore: maven-javadoc-plugin #!BuildIgnore: maven-javadoc-plugin-bootstrap BuildArch: noarch %description The Sisu Plugin for Maven provides mojos to generate META-INF/sisu/javax.inject.Named index files for the Sisu container. %package javadoc Summary: API documentation for %{name} %description javadoc This package contains %{summary}. %prep %setup -q -n sisu-project-%{reltype}-%{version} %patch -P 1 -p1 %patch -P 3 -p1 %patch -P 4 -p2 %pom_remove_plugin -r :maven-enforcer-plugin # it is scope "import" but used only for tests that we don't run %pom_remove_dep :junit-bom pushd org.eclipse.sisu.mojos %pom_add_dep org.eclipse.sisu:org.eclipse.sisu.plexus:%{version} %pom_add_plugin org.apache.maven.plugins:maven-resources-plugin:3.3.1 %{mvn_alias} : org.sonatype.plugins: popd %build pushd org.eclipse.sisu.mojos %{mvn_build} -f -- \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} -Dmaven.compiler.release=8 \ %endif -Dsource=8 popd %install pushd org.eclipse.sisu.mojos %mvn_install popd %fdupes -s %{buildroot}%{_javadocdir} %files -f org.eclipse.sisu.mojos/.mfiles %dir %{_javadir}/%{name} %license LICENSE.txt %files javadoc -f org.eclipse.sisu.mojos/.mfiles-javadoc %license LICENSE.txt %changelog ++++++ sisu.spec ++++++ --- /var/tmp/diff_new_pack.SR24Tf/_old 2024-06-06 12:33:23.910179428 +0200 +++ /var/tmp/diff_new_pack.SR24Tf/_new 2024-06-06 12:33:23.914179573 +0200 @@ -18,19 +18,17 @@ %global reltype milestones Name: sisu -Version: 0.9.0.M2 +Version: 0.9.0.M3 Release: 0 Summary: Eclipse dependency injection framework -# sisu is EPL-1.0, bundled asm is BSD -License: BSD-3-Clause AND EPL-1.0 +License: BSD-3-Clause AND EPL-1.0 AND EPL-2.0 Group: Development/Libraries/Java URL: https://www.eclipse.org/sisu/ -Source0: https://github.com/eclipse/sisu.inject/archive/refs/tags/%{reltype}/%{versi… -Source1: https://github.com/eclipse/sisu.plexus/archive/refs/tags/%{reltype}/%{versi… -Source2: %{name}-build.tar.xz -Patch1: %{name}-no-dependency-on-glassfish-servlet-api.patch -Patch3: %{name}-osgi-api.patch -Patch4: %{name}-reproducible-index.patch +Source0: https://github.com/eclipse-sisu/sisu-project/archive/refs/tags/%{reltype}/%… +Source1: %{name}-build.tar.xz +Patch1: sisu-no-dependency-on-glassfish-servlet-api.patch +Patch3: sisu-osgi-api.patch +Patch4: sisu-reproducible-index.patch BuildRequires: ant BuildRequires: atinject BuildRequires: cdi-api @@ -82,14 +80,11 @@ This package contains %{summary}. %prep -%setup -q -c -T -tar xf %{SOURCE0} && mv sisu.inject-%{reltype}-%{version} sisu-inject -tar xf %{SOURCE1} && mv sisu.plexus-%{reltype}-%{version} sisu-plexus -tar xf %{SOURCE2} - -%patch -P 1 -%patch -P 3 -%patch -P 4 -p1 +%setup -q -n sisu-project-%{reltype}-%{version} -a1 + +%patch -P 1 -p1 +%patch -P 3 -p1 +%patch -P 4 -p2 %build mkdir -p lib @@ -112,9 +107,9 @@ %install # jar install -dm 0755 %{buildroot}%{_javadir} -install -pm 0644 %{name}-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar \ +install -pm 0644 org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar \ %{buildroot}%{_javadir}/org.eclipse.sisu.inject.jar -install -pm 0644 %{name}-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar \ +install -pm 0644 org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar \ %{buildroot}%{_javadir}/org.eclipse.sisu.plexus.jar # Compatibility symlink install -dm 0755 %{buildroot}%{_javadir}/plexus-containers @@ -122,25 +117,25 @@ # pom install -dm 0755 %{buildroot}%{_mavenpomdir} -%{mvn_install_pom} %{name}-inject/org.eclipse.sisu.inject/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom +%{mvn_install_pom} org.eclipse.sisu.inject/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom %add_maven_depmap org.eclipse.sisu.inject.pom org.eclipse.sisu.inject.jar -f inject -%{mvn_install_pom} %{name}-plexus/org.eclipse.sisu.plexus/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.plexus.pom +%{mvn_install_pom} org.eclipse.sisu.plexus/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.plexus.pom %add_maven_depmap org.eclipse.sisu.plexus.pom org.eclipse.sisu.plexus.jar -f plexus -a org.sonatype.sisu:sisu-inject-plexus,org.codehaus.plexus:plexus-container-default # javadoc for i in inject plexus; do install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i} - cp -pr %{name}-${i}/org.eclipse.sisu.${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/ + cp -pr org.eclipse.sisu.${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/ done %fdupes -s %{buildroot}%{_javadocdir} %files inject -f .mfiles-inject -%license sisu-inject/LICENSE.txt +%license LICENSE.txt %files plexus -f .mfiles-plexus %{_javadir}/plexus-containers %files javadoc -%license sisu-inject/LICENSE.txt +%license LICENSE.txt %{_javadocdir}/%{name} ++++++ _multibuild ++++++ <multibuild> <package>sisu-mojos</package> </multibuild> ++++++ sisu-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.xml new/build.xml --- old/build.xml 2024-04-09 17:46:50.654367287 +0200 +++ new/build.xml 2024-06-05 15:33:11.697277689 +0200 @@ -7,8 +7,8 @@  <target name="clean" description="Clean the output directory"> - <ant antfile="build.xml" dir="sisu-inject" target="clean"/> - <ant antfile="build.xml" dir="sisu-plexus" target="clean"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="clean"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="clean"/> </target>  @@ -16,8 +16,8 @@  <target name="compile" description="Compile the code"> - <ant antfile="build.xml" dir="sisu-inject" target="compile"/> - <ant antfile="build.xml" dir="sisu-plexus" target="compile"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="compile"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="compile"/> </target>  @@ -25,8 +25,8 @@  <target name="compile-tests" description="Compile the test code"> - <ant antfile="build.xml" dir="sisu-inject" target="compile-tests"/> - <ant antfile="build.xml" dir="sisu-plexus" target="compile-tests"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="compile-tests"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="compile-tests"/> </target>  @@ -34,8 +34,8 @@  <target name="test" description="Run the test cases"> - <ant antfile="build.xml" dir="sisu-inject" target="test"/> - <ant antfile="build.xml" dir="sisu-plexus" target="test"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="test"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="test"/> </target>  @@ -43,8 +43,8 @@  <target name="javadoc" description="Generates the Javadoc of the application"> - <ant antfile="build.xml" dir="sisu-inject" target="javadoc"/> - <ant antfile="build.xml" dir="sisu-plexus" target="javadoc"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="javadoc"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="javadoc"/> </target>  @@ -52,8 +52,8 @@  <target name="package" description="Package the application"> - <ant antfile="build.xml" dir="sisu-inject" target="package"/> - <ant antfile="build.xml" dir="sisu-plexus" target="package"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="package"/> + <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="package"/> </target> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2024-04-09 17:34:54.783027925 +0200 +++ new/common.xml 2024-06-05 15:37:08.972511687 +0200 @@ -3,7 +3,7 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="0.9.0.M2"/> + <property name="project.version" value="0.9.0.M3"/> <property name="project.groupId" value="org.eclipse.sisu"/> <property name="compiler.release" value="8"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/org.eclipse.sisu.inject/build.xml new/org.eclipse.sisu.inject/build.xml --- old/org.eclipse.sisu.inject/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/org.eclipse.sisu.inject/build.xml 2024-06-05 15:36:13.988737899 +0200 @@ -0,0 +1,139 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="org.eclipse.sisu.inject" default="package" basedir="."> + +  +  +  + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="org.eclipse.sisu.inject"/> + + <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="."/> + + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + +  +  +  + + <path id="build.classpath"> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + <path id="build.test.classpath"> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + +  +  +  + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + +  +  +  + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + release="${compiler.release}" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <copy todir="${build.outputDir}"> + <fileset dir="${build.resourceDir}"> + <include name="META-INF/**"/> + <include name="about.html"/> + <include name="overview.html"/> + <include name="plugin.xml"/> + </fileset> + </copy> + </target> + +  +  +  + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + overview="overview.html" + 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> + +  +  +  + + <target name="package" depends="compile" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Bundle-Description" value="JSR330-based container; supports classpath scanning, auto-binding, and dynamic auto-wiring"/> + <attribute name="Bundle-License" value=""Eclipse Public License, Version 1.0";link="http://www.eclipse.org/legal/epl-v10.html""/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="Sisu-Inject (Incubation)"/> + <attribute name="Bundle-SymbolicName" value="${project.artifactId};singleton:=true"/> + <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Export-Package" value="org.eclipse.sisu.bean;uses:="com.google.inject,com.google.inject.spi",org.eclipse.sisu.inject;uses:="com.google.inject,com.google.inject.spi,javax.inject,org.eclipse.sisu,org.sonatype.inject",org.eclipse.sisu.launch;uses:="com.google.inject,junit.framework,org.eclipse.sisu.inject,org.eclipse.sisu.space,org.eclipse.sisu.wire,org.junit,org.junit.jupiter.api,org.osgi.framework,org.osgi.util.tracker,org.testng.annotations",org.eclipse.sisu.osgi;uses:="org.eclipse.sisu.inject,org.osgi.framework",org.eclipse.sisu.space;uses:="com.google.inject,javax.annotation.processing,javax.lang.model,javax.lang.model.element,org.eclipse.sisu.inject,org.osgi.framework",org.eclipse.sisu.wire;uses:="com.google.inject,com.google.inject.spi",org.eclipse.sisu;uses:="javax.inject",org.sonatype.inject;x-internal:=true;uses:="javax.inject,org.eclipse.sisu""/> + <attribute name="Import-Package" value="com.google.inject.binder;version="1.3",com.google.inject.matcher;version="1.3",com.google.inject.name;version="1.3",com.google.inject.servlet;resolution:=optional,com.google.inject.spi;version="1.3",com.google.inject;version="1.3",javax.annotation.processing;resolution:=optional,javax.annotation;resolution:=optional,javax.enterprise.inject;resolution:=optional,javax.inject,javax.lang.model.element;resolution:=optional,javax.lang.model.type;resolution:=optional,javax.lang.model.util;resolution:=optional,javax.lang.model;resolution:=optional,javax.servlet.http;resolution:=optional,javax.servlet;resolution:=optional,javax.tools;resolution:=optional,junit.framework;resolution:=optional,org.eclipse.sisu.inject;resolution:=optional,org.eclipse.sisu.osgi;resolution:=optional,org.eclipse.sisu;resolution:=optional,org.junit.jupiter.api;resolution:=optional,org.junit;resolution:=optional,org.osgi .framework;version="1.5",org.osgi.util.tracker;version="1.4",org.slf4j;resolution:=optional,org.sonatype.inject;resolution:=optional,org.testng.annotations;resolution:=optional"/> + <attribute name="Main-Class" value="org.eclipse.sisu.launch.Main"/> + <attribute name="Private-Package" value="org.eclipse.sisu.space.asm"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> + </manifest> + </jar> + </target> + +  +  +  + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/org.eclipse.sisu.inject.extender/build.xml new/org.eclipse.sisu.inject.extender/build.xml --- old/org.eclipse.sisu.inject.extender/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/org.eclipse.sisu.inject.extender/build.xml 2024-06-05 15:36:04.421994607 +0200 @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="org.eclipse.sisu.inject.extender" default="package" basedir="."> + +  +  +  + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="org.eclipse.sisu.inject.extender"/> + + <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="."/> + + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + +  +  +  + + <path id="build.classpath"/> + <path id="build.test.classpath"/> + +  +  +  + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + +  +  +  + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + release="${compiler.release}" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <copy todir="${build.outputDir}"> + <fileset dir="${build.resourceDir}"> + <include name="META-INF/**"/> + <include name="about.html"/> + <include name="overview.html"/> + </fileset> + </copy> + </target> + +  +  +  + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + overview="overview.html" + 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> + +  +  +  + + <target name="package" depends="compile" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Bundle-Activator" value="org.eclipse.sisu.launch.SisuExtender"/> + <attribute name="Bundle-Description" value="JSR330-based container; supports classpath scanning, auto-binding, and dynamic auto-wiring"/> + <attribute name="Bundle-License" value=""Eclipse Public License, Version 1.0";link="http://www.eclipse.org/legal/epl-v10.html""/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="Sisu-Inject Extender (Incubation)"/> + <attribute name="Bundle-SymbolicName" value="${project.artifactId};singleton:=true"/> + <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Import-Package" value="org.eclipse.sisu.launch"/> + </manifest> + </jar> + </target> + +  +  +  + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/org.eclipse.sisu.plexus/build.xml new/org.eclipse.sisu.plexus/build.xml --- old/org.eclipse.sisu.plexus/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/org.eclipse.sisu.plexus/build.xml 2024-06-05 17:03:16.527214900 +0200 @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="org.eclipse.sisu.plexus" default="package" basedir="."> + +  +  +  + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="org.eclipse.sisu.plexus"/> + + <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="."/> + + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + +  +  +  + + <path id="build.classpath"> + <pathelement location="../org.eclipse.sisu.inject/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + +  +  +  + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + +  +  +  + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + release="${compiler.release}" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <copy todir="${build.outputDir}"> + <fileset dir="${build.resourceDir}"> + <include name="META-INF/**"/> + <include name="about.html"/> + <include name="overview.html"/> + </fileset> + </copy> + </target> + +  +  +  + + <target name="sisu" + depends="compile" + description="Generate javax.inject.Name index"> + <sequential> + <java classname="org.eclipse.sisu.space.SisuIndex" + failonerror="true" + fork="true"> + <classpath> + <path refid="build.classpath"/> + </classpath> + <arg value="${build.outputDir}"/> + </java> + <move todir="${build.outputDir}/META-INF"> + <fileset dir="META-INF"/> + </move> + </sequential> + </target> + +  +  +  + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + overview="overview.html" + 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> + +  +  +  + + <target name="package" depends="sisu" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Bundle-Description" value="Plexus-JSR330 adapter; adds Plexus support to the Sisu-Inject container"/> + <attribute name="Bundle-License" value=""Eclipse Public License, Version 1.0";link="http://www.eclipse.org/legal/epl-v10.html""/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="Sisu-Plexus (Incubation)"/> + <attribute name="Bundle-SymbolicName" value="${project.artifactId};singleton:=true"/> + <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Export-Package" value="org.codehaus.plexus.component.composition,org.codehaus.plexus.component.configurator.converters.basic;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.converters.composite;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.converters.lookup;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters",org.codehaus.plexus.component.configurator.converters.special;uses:="org.codehau s.classworlds,org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.converters;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.component.configurator;uses:="org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.factory;uses:="org.codehaus.classworlds,org.codehaus.plexus,org.codehaus.plexus.classworlds. realm,org.codehaus.plexus.component.repository",org.codehaus.plexus.component.repository.exception,org.codehaus.plexus.component.repository;uses:="org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.configuration",org.codehaus.plexus.component;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.repository",org.codehaus.plexus.configuration.xml;uses:="org.codehaus.plexus.configuration,org.codehaus.plexus.util.xml",org.codehaus.plexus.configuration,org.codehaus.plexus.context,org.codehaus.plexus.logging.console;uses:="org.codehaus.plexus.logging",org.codehaus.plexus.logging;uses:="org.codehaus.plexus.personality.plexus.lifecycle.phase,org.eclipse.sisu.bean",org.codehaus.plexus.personality.plexus.lifecycle.phase;uses:="org.codehaus.plexus,org.codehaus.plexus.component.repository.exception,org.codehaus.plexus.configuration,org.codehaus.plexus.context",org.codehaus.plexus;uses:="com.go ogle.inject,junit.framework,org.codehaus.plexus.classworlds,org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.composition,org.codehaus.plexus.component.repository,org.codehaus.plexus.component.repository.exception,org.codehaus.plexus.configuration,org.codehaus.plexus.context,org.codehaus.plexus.logging,org.eclipse.sisu.plexus",org.eclipse.sisu.plexus;uses:="com.google.inject,com.google.inject.matcher,com.google.inject.spi,javax.inject,org.codehaus.plexus.classworlds,org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.annotations,org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.component.repository,org.codehaus.plexus.configuration,org.codehaus.plexus.context,org.codehaus.plexus.logging,org.eclipse.sisu.bean,org.eclipse.sisu.inject,org.eclipse.sisu.launch,org.eclipse.sisu.space,org.osgi.framework""/> + <attribute name="Import-Package" value="com.google.inject.binder;version="1.3",com.google.inject.matcher;version="1.3",com.google.inject.name;version="1.3",com.google.inject.spi;version="1.3",com.google.inject.util;version="1.3",com.google.inject;version="1.3",javax.inject,junit.framework;resolution:=optional,org.codehaus.classworlds;version="[2.6,3)",org.codehaus.plexus.classworlds.realm;version="[2.6,3)",org.codehaus.plexus.classworlds;version="[2.6,3)",org.codehaus.plexus.component.annotations;resolution:=optional,org.codehaus.plexus.component.composition;resolution:=optional,org.codehaus.plexus.component.configurator.converters.basic;resolution:=optional,org.codehaus.plexus.component.configurator.converters.composite;resolution:=optional,org.codehaus.plexus.component.configurator.converters.lookup;resolution:=optional,org.codehaus.plexus.component.configurator.converters.special;resolutio n:=optional,org.codehaus.plexus.component.configurator.converters;resolution:=optional,org.codehaus.plexus.component.configurator.expression;resolution:=optional,org.codehaus.plexus.component.configurator;resolution:=optional,org.codehaus.plexus.component.factory;resolution:=optional,org.codehaus.plexus.component.repository.exception;resolution:=optional,org.codehaus.plexus.component.repository;resolution:=optional,org.codehaus.plexus.component;resolution:=optional,org.codehaus.plexus.configuration.xml;resolution:=optional,org.codehaus.plexus.configuration;resolution:=optional,org.codehaus.plexus.context;resolution:=optional,org.codehaus.plexus.logging.console;resolution:=optional,org.codehaus.plexus.logging;resolution:=optional,org.codehaus.plexus.personality.plexus.lifecycle.phase;resolution:=optional,org.codehaus.plexus.util,org.codehaus.plexus.util.xml,org.codehaus.plexus.util.xml.pull,org.codehaus.plexus;resolution:=optional,org.eclipse.sisu.bean;version="[0.9,1)",org .eclipse.sisu.inject;version="[0.9,1)",org.eclipse.sisu.launch;version="[0.9,1)",org.eclipse.sisu.plexus;version="[0.9,1)",org.eclipse.sisu.space;version="[0.9,1)",org.eclipse.sisu.wire;version="[0.9,1)",org.eclipse.sisu;version="[0.9,1)",org.osgi.framework;version="1.5",org.slf4j;resolution:=optional"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> + </manifest> + </jar> + </target> + +  +  +  + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/org.eclipse.sisu.plexus.extender/build.xml new/org.eclipse.sisu.plexus.extender/build.xml --- old/org.eclipse.sisu.plexus.extender/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/org.eclipse.sisu.plexus.extender/build.xml 2024-06-05 15:52:09.396393495 +0200 @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="org.eclipse.sisu.plexus.extender" default="package" basedir="."> + +  +  +  + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="org.eclipse.sisu.plexus"/> + + <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="."/> + + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + +  +  +  + + <path id="build.classpath"> + <pathelement location="../org.eclipse.sisu.inject/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + +  +  +  + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + +  +  +  + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + release="${compiler.release}" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <copy todir="${build.outputDir}"> + <fileset dir="${build.resourceDir}"> + <include name="META-INF/**"/> + <include name="about.html"/> + <include name="overview.html"/> + </fileset> + </copy> + </target> + +  +  +  + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + overview="overview.html" + 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> + +  +  +  + + <target name="package" depends="compile" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Bundle-Description" value="Plexus-JSR330 adapter; adds Plexus support to the Sisu-Inject container"/> + <attribute name="Bundle-License" value=""Eclipse Public License, Version 1.0";link="http://www.eclipse.org/legal/epl-v10.html""/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="Sisu-Plexus Extender (Incubation)"/> + <attribute name="Bundle-SymbolicName" value="${project.artifactId};singleton:=true"/> + <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Fragment-Host" value="org.eclipse.sisu.inject.extender"/> + </manifest> + </jar> + </target> + +  +  +  + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sisu-inject/build.xml new/sisu-inject/build.xml --- old/sisu-inject/build.xml 2024-04-09 20:20:18.358159676 +0200 +++ new/sisu-inject/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="sisu-inject" default="package" basedir="."> - -  -  -  - - <target name="clean" description="Clean the output directory"> - <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="clean"/> - </target> - -  -  -  - - <target name="compile" description="Compile the code"> - <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="compile"/> - </target> - -  -  -  - - <target name="compile-tests" description="Compile the test code"> - <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="compile-tests"/> - </target> - -  -  -  - - <target name="test" description="Run the test cases"> - <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="test"/> - </target> - -  -  -  - - <target name="javadoc" description="Generates the Javadoc of the application"> - <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="javadoc"/> - </target> - -  -  -  - - <target name="package" description="Package the application"> - <ant antfile="build.xml" dir="org.eclipse.sisu.inject" target="package"/> - </target> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sisu-inject/org.eclipse.sisu.inject/build.xml new/sisu-inject/org.eclipse.sisu.inject/build.xml --- old/sisu-inject/org.eclipse.sisu.inject/build.xml 2024-04-09 18:15:02.218485182 +0200 +++ new/sisu-inject/org.eclipse.sisu.inject/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="org.eclipse.sisu.inject" default="package" basedir="."> - -  -  -  - - <include file="../../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="org.eclipse.sisu.inject"/> - - <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="."/> - - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - -  -  -  - - <path id="build.classpath"> - <fileset dir="../../lib"> - <include name="**/*.jar"/> - </fileset> - </path> - <path id="build.test.classpath"> - <fileset dir="../../lib"> - <include name="**/*.jar"/> - </fileset> - </path> - -  -  -  - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - -  -  -  - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - release="${compiler.release}" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"> - <include name="META-INF/**"/> - <include name="about.html"/> - <include name="overview.html"/> - <include name="plugin.xml"/> - </fileset> - </copy> - </target> - -  -  -  - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - overview="overview.html" - 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> - -  -  -  - - <target name="package" depends="compile" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"> - <manifest> - <attribute name="Bundle-Description" value="JSR330-based container; supports classpath scanning, auto-binding, and dynamic auto-wiring"/> - <attribute name="Bundle-License" value=""Eclipse Public License, Version 1.0";link="http://www.eclipse.org/legal/epl-v10.html""/> - <attribute name="Bundle-ManifestVersion" value="2"/> - <attribute name="Bundle-Name" value="Sisu-Inject (Incubation)"/> - <attribute name="Bundle-SymbolicName" value="${project.artifactId};singleton:=true"/> - <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/> - <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.eclipse.sisu.bean;uses:="com.google.inject,com.google.inject.spi",org.eclipse.sisu.inject;uses:="com.google.inject,com.google.inject.spi,javax.inject,org.eclipse.sisu,org.sonatype.inject",org.eclipse.sisu.launch;uses:="com.google.inject,junit.framework,org.eclipse.sisu.inject,org.eclipse.sisu.space,org.eclipse.sisu.wire,org.junit,org.junit.jupiter.api,org.osgi.framework,org.osgi.util.tracker,org.testng.annotations",org.eclipse.sisu.osgi;uses:="org.eclipse.sisu.inject,org.osgi.framework",org.eclipse.sisu.space;uses:="com.google.inject,javax.annotation.processing,javax.lang.model,javax.lang.model.element,org.eclipse.sisu.inject,org.osgi.framework",org.eclipse.sisu.wire;uses:="com.google.inject,com.google.inject.spi",org.eclipse.sisu;uses:="javax.inject",org.sonatype.inject;x-internal:=true;uses:="javax.inject,org.eclipse.sisu""/> - <attribute name="Import-Package" value="com.google.inject.binder;version="1.3",com.google.inject.matcher;version="1.3",com.google.inject.name;version="1.3",com.google.inject.servlet;resolution:=optional,com.google.inject.spi;version="1.3",com.google.inject;version="1.3",javax.annotation.processing;resolution:=optional,javax.annotation;resolution:=optional,javax.enterprise.inject;resolution:=optional,javax.inject,javax.lang.model.element;resolution:=optional,javax.lang.model.type;resolution:=optional,javax.lang.model.util;resolution:=optional,javax.lang.model;resolution:=optional,javax.servlet.http;resolution:=optional,javax.servlet;resolution:=optional,javax.tools;resolution:=optional,junit.framework;resolution:=optional,org.eclipse.sisu.inject;resolution:=optional,org.eclipse.sisu.osgi;resolution:=optional,org.eclipse.sisu;resolution:=optional,org.junit.jupiter.api;resolution:=optional,org.junit;resolution:=optional,org.osgi .framework;version="1.5",org.osgi.util.tracker;version="1.4",org.slf4j;resolution:=optional,org.sonatype.inject;resolution:=optional,org.testng.annotations;resolution:=optional"/> - <attribute name="Main-Class" value="org.eclipse.sisu.launch.Main"/> - <attribute name="Private-Package" value="org.eclipse.sisu.space.asm"/> - <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> - </manifest> - </jar> - </target> - -  -  -  - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sisu-inject/org.eclipse.sisu.inject.extender/build.xml new/sisu-inject/org.eclipse.sisu.inject.extender/build.xml --- old/sisu-inject/org.eclipse.sisu.inject.extender/build.xml 2024-04-09 17:45:14.000000000 +0200 +++ new/sisu-inject/org.eclipse.sisu.inject.extender/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="org.eclipse.sisu.inject.extender" default="package" basedir="."> - -  -  -  - - <include file="../../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="org.eclipse.sisu.inject.extender"/> - - <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="."/> - - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - -  -  -  - - <path id="build.classpath"/> - <path id="build.test.classpath"/> - -  -  -  - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - -  -  -  - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - release="${compiler.release}" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"> - <include name="META-INF/**"/> - <include name="about.html"/> - <include name="overview.html"/> - </fileset> - </copy> - </target> - -  -  -  - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - overview="overview.html" - 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> - -  -  -  - - <target name="package" depends="compile" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"> - <manifest> - <attribute name="Bundle-Activator" value="org.eclipse.sisu.launch.SisuExtender"/> - <attribute name="Bundle-Description" value="JSR330-based container; supports classpath scanning, auto-binding, and dynamic auto-wiring"/> - <attribute name="Bundle-License" value=""Eclipse Public License, Version 1.0";link="http://www.eclipse.org/legal/epl-v10.html""/> - <attribute name="Bundle-ManifestVersion" value="2"/> - <attribute name="Bundle-Name" value="Sisu-Inject Extender (Incubation)"/> - <attribute name="Bundle-SymbolicName" value="${project.artifactId};singleton:=true"/> - <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/> - <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Import-Package" value="org.eclipse.sisu.launch"/> - </manifest> - </jar> - </target> - -  -  -  - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sisu-plexus/build.xml new/sisu-plexus/build.xml --- old/sisu-plexus/build.xml 2024-04-09 20:24:44.799928892 +0200 +++ new/sisu-plexus/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="sisu-plexus" default="package" basedir="."> - -  -  -  - - <target name="clean" description="Clean the output directory"> - <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="clean"/> - </target> - -  -  -  - - <target name="compile" description="Compile the code"> - <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="compile"/> - </target> - -  -  -  - - <target name="compile-tests" description="Compile the test code"> - <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="compile-tests"/> - </target> - -  -  -  - - <target name="test" description="Run the test cases"> - <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="test"/> - </target> - -  -  -  - - <target name="javadoc" description="Generates the Javadoc of the application"> - <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="javadoc"/> - </target> - -  -  -  - - <target name="package" description="Package the application"> - <ant antfile="build.xml" dir="org.eclipse.sisu.plexus" target="package"/> - </target> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sisu-plexus/org.eclipse.sisu.plexus/build.xml new/sisu-plexus/org.eclipse.sisu.plexus/build.xml --- old/sisu-plexus/org.eclipse.sisu.plexus/build.xml 2024-04-09 20:04:19.261791554 +0200 +++ new/sisu-plexus/org.eclipse.sisu.plexus/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="org.eclipse.sisu.plexus" default="package" basedir="."> - -  -  -  - - <include file="../../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="org.eclipse.sisu.plexus"/> - - <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="."/> - - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - -  -  -  - - <path id="build.classpath"> - <pathelement location="../../sisu-inject/org.eclipse.sisu.inject/target/classes"/> - <fileset dir="../../lib"> - <include name="**/*.jar"/> - </fileset> - </path> - -  -  -  - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - -  -  -  - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - release="${compiler.release}" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"> - <include name="META-INF/**"/> - <include name="about.html"/> - <include name="overview.html"/> - </fileset> - </copy> - </target> - -  -  -  - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - overview="overview.html" - 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> - -  -  -  - - <target name="package" depends="compile" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"> - <manifest> - <attribute name="Bundle-Description" value="Plexus-JSR330 adapter; adds Plexus support to the Sisu-Inject container"/> - <attribute name="Bundle-License" value=""Eclipse Public License, Version 1.0";link="http://www.eclipse.org/legal/epl-v10.html""/> - <attribute name="Bundle-ManifestVersion" value="2"/> - <attribute name="Bundle-Name" value="Sisu-Plexus (Incubation)"/> - <attribute name="Bundle-SymbolicName" value="${project.artifactId};singleton:=true"/> - <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/> - <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.codehaus.plexus.component.composition,org.codehaus.plexus.component.configurator.converters.basic;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.converters.composite;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.converters.lookup;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters",org.codehaus.plexus.component.configurator.converters.special;uses:="org.codehau s.classworlds,org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.converters;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.component.configurator;uses:="org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.configuration",org.codehaus.plexus.component.factory;uses:="org.codehaus.classworlds,org.codehaus.plexus,org.codehaus.plexus.classworlds. realm,org.codehaus.plexus.component.repository",org.codehaus.plexus.component.repository.exception,org.codehaus.plexus.component.repository;uses:="org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.configuration",org.codehaus.plexus.component;uses:="org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.repository",org.codehaus.plexus.configuration.xml;uses:="org.codehaus.plexus.configuration,org.codehaus.plexus.util.xml",org.codehaus.plexus.configuration,org.codehaus.plexus.context,org.codehaus.plexus.logging.console;uses:="org.codehaus.plexus.logging",org.codehaus.plexus.logging;uses:="org.codehaus.plexus.personality.plexus.lifecycle.phase,org.eclipse.sisu.bean",org.codehaus.plexus.personality.plexus.lifecycle.phase;uses:="org.codehaus.plexus,org.codehaus.plexus.component.repository.exception,org.codehaus.plexus.configuration,org.codehaus.plexus.context",org.codehaus.plexus;uses:="com.go ogle.inject,junit.framework,org.codehaus.plexus.classworlds,org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.composition,org.codehaus.plexus.component.repository,org.codehaus.plexus.component.repository.exception,org.codehaus.plexus.configuration,org.codehaus.plexus.context,org.codehaus.plexus.logging,org.eclipse.sisu.plexus",org.eclipse.sisu.plexus;uses:="com.google.inject,com.google.inject.matcher,com.google.inject.spi,javax.inject,org.codehaus.plexus.classworlds,org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.component.annotations,org.codehaus.plexus.component.configurator,org.codehaus.plexus.component.configurator.converters.lookup,org.codehaus.plexus.component.configurator.expression,org.codehaus.plexus.component.repository,org.codehaus.plexus.configuration,org.codehaus.plexus.context,org.codehaus.plexus.logging,org.eclipse.sisu.bean,org.eclipse.sisu.inject,org.eclipse.sisu.launch,org.eclipse.sisu.space,org.osgi.framework""/> - <attribute name="Import-Package" value="com.google.inject.binder;version="1.3",com.google.inject.matcher;version="1.3",com.google.inject.name;version="1.3",com.google.inject.spi;version="1.3",com.google.inject.util;version="1.3",com.google.inject;version="1.3",javax.inject,junit.framework;resolution:=optional,org.codehaus.classworlds;version="[2.6,3)",org.codehaus.plexus.classworlds.realm;version="[2.6,3)",org.codehaus.plexus.classworlds;version="[2.6,3)",org.codehaus.plexus.component.annotations;resolution:=optional,org.codehaus.plexus.component.composition;resolution:=optional,org.codehaus.plexus.component.configurator.converters.basic;resolution:=optional,org.codehaus.plexus.component.configurator.converters.composite;resolution:=optional,org.codehaus.plexus.component.configurator.converters.lookup;resolution:=optional,org.codehaus.plexus.component.configurator.converters.special;resolutio n:=optional,org.codehaus.plexus.component.configurator.converters;resolution:=optional,org.codehaus.plexus.component.configurator.expression;resolution:=optional,org.codehaus.plexus.component.configurator;resolution:=optional,org.codehaus.plexus.component.factory;resolution:=optional,org.codehaus.plexus.component.repository.exception;resolution:=optional,org.codehaus.plexus.component.repository;resolution:=optional,org.codehaus.plexus.component;resolution:=optional,org.codehaus.plexus.configuration.xml;resolution:=optional,org.codehaus.plexus.configuration;resolution:=optional,org.codehaus.plexus.context;resolution:=optional,org.codehaus.plexus.logging.console;resolution:=optional,org.codehaus.plexus.logging;resolution:=optional,org.codehaus.plexus.personality.plexus.lifecycle.phase;resolution:=optional,org.codehaus.plexus.util,org.codehaus.plexus.util.xml,org.codehaus.plexus.util.xml.pull,org.codehaus.plexus;resolution:=optional,org.eclipse.sisu.bean;version="[0.9,1)",org .eclipse.sisu.inject;version="[0.9,1)",org.eclipse.sisu.launch;version="[0.9,1)",org.eclipse.sisu.plexus;version="[0.9,1)",org.eclipse.sisu.space;version="[0.9,1)",org.eclipse.sisu.wire;version="[0.9,1)",org.eclipse.sisu;version="[0.9,1)",org.osgi.framework;version="1.5",org.slf4j;resolution:=optional"/> - <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> - </manifest> - </jar> - </target> - -  -  -  - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sisu-plexus/org.eclipse.sisu.plexus.extender/build.xml new/sisu-plexus/org.eclipse.sisu.plexus.extender/build.xml --- old/sisu-plexus/org.eclipse.sisu.plexus.extender/build.xml 2024-04-09 18:08:00.000000000 +0200 +++ new/sisu-plexus/org.eclipse.sisu.plexus.extender/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,125 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="org.eclipse.sisu.plexus.extender" default="package" basedir="."> - -  -  -  - - <include file="../../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="org.eclipse.sisu.plexus"/> - - <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="."/> - - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - -  -  -  - - <path id="build.classpath"/> - -  -  -  - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - -  -  -  - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - release="${compiler.release}" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"> - <include name="META-INF/**"/> - <include name="about.html"/> - <include name="overview.html"/> - </fileset> - </copy> - </target> - -  -  -  - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - overview="overview.html" - 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> - -  -  -  - - <target name="package" depends="compile" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"> - <manifest> - <attribute name="Bundle-Description" value="Plexus-JSR330 adapter; adds Plexus support to the Sisu-Inject container"/> - <attribute name="Bundle-License" value=""Eclipse Public License, Version 1.0";link="http://www.eclipse.org/legal/epl-v10.html""/> - <attribute name="Bundle-ManifestVersion" value="2"/> - <attribute name="Bundle-Name" value="Sisu-Plexus Extender (Incubation)"/> - <attribute name="Bundle-SymbolicName" value="${project.artifactId};singleton:=true"/> - <attribute name="Bundle-Vendor" value="The Eclipse Foundation"/> - <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Fragment-Host" value="org.eclipse.sisu.inject.extender"/> - </manifest> - </jar> - </target> - -  -  -  - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project>

1 0

commit modello for openSUSE:Factory
by Source-Sync 06 Jun '24

06 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package modello for openSUSE:Factory checked in at 2024-06-06 12:33:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modello (Old) and /work/SRC/openSUSE:Factory/.modello.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "modello" Thu Jun 6 12:33:09 2024 rev:18 rq:1178804 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/modello/modello-maven-plugin.changes 2024-05-16 17:18:13.174542351 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes 2024-06-06 12:33:20.578057997 +0200 @@ -1,0 +2,16 @@ +Wed Jun 5 11:27:39 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Modified patches: + * 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch + -> 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch + + remove our patch and replace it with an integrated patch that + is result of a common work between us and upstream + * 0003-Fix-Snakeyaml.patch + -> 0001-Upgrade-to-SnakeYaml-2.2-439.patch + + move to version of this patch that was integrated upsteam + * 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch + -> 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch + + rediff and put last in order because it is our patch that is + not to be integrated + +------------------------------------------------------------------- modello.changes: same change Old: ---- 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch 0003-Fix-Snakeyaml.patch New: ---- 0001-Upgrade-to-SnakeYaml-2.2-439.patch 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch BETA DEBUG BEGIN: Old:/work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes-- Modified patches: /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes: * 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes- -> 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch -- /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes-- Modified patches: /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes: * 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes- -> 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch Old:/work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes- + move to version of this patch that was integrated upsteam /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes: * 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes- -> 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch -- /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes- + move to version of this patch that was integrated upsteam /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes: * 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes- -> 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch Old:/work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes- is result of a common work between us and upstream /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes: * 0003-Fix-Snakeyaml.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes- -> 0001-Upgrade-to-SnakeYaml-2.2-439.patch -- /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes- is result of a common work between us and upstream /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes: * 0003-Fix-Snakeyaml.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes- -> 0001-Upgrade-to-SnakeYaml-2.2-439.patch BETA DEBUG END: BETA DEBUG BEGIN: New:/work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes- * 0003-Fix-Snakeyaml.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes: -> 0001-Upgrade-to-SnakeYaml-2.2-439.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes- + move to version of this patch that was integrated upsteam -- /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes- * 0003-Fix-Snakeyaml.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes: -> 0001-Upgrade-to-SnakeYaml-2.2-439.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes- + move to version of this patch that was integrated upsteam New:/work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes- * 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes: -> 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes- + remove our patch and replace it with an integrated patch that -- /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes- * 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes: -> 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes- + remove our patch and replace it with an integrated patch that New:/work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes- * 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes: -> 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello-maven-plugin.changes- + rediff and put last in order because it is our patch that is -- /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes- * 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes: -> 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch /work/SRC/openSUSE:Factory/.modello.new.24587/modello.changes- + rediff and put last in order because it is our patch that is BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modello-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.6qBsyw/_old 2024-06-06 12:33:22.222117911 +0200 +++ /var/tmp/diff_new_pack.6qBsyw/_new 2024-06-06 12:33:22.226118057 +0200 @@ -27,9 +27,9 @@ URL: https://codehaus-plexus.github.io/modello/modello-maven-plugin Source0: https://repo1.maven.org/maven2/org/codehaus/%{parent}/%{parent}/%{version}/… Source1: https://www.apache.org/licenses/LICENSE-2.0.txt -Patch0: 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch -Patch1: 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch -Patch2: 0003-Fix-Snakeyaml.patch +Patch0: 0001-Upgrade-to-SnakeYaml-2.2-439.patch +Patch1: 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch +Patch2: 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: unzip @@ -92,8 +92,7 @@ %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :sisu-maven-plugin -%pom_remove_dep :sisu-guice modello-core -%pom_add_dep com.google.inject:guice modello-core +%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 modello-core %pom_change_dep -r :velocity-engine-core :velocity ++++++ modello.spec ++++++ --- /var/tmp/diff_new_pack.6qBsyw/_old 2024-06-06 12:33:22.258119223 +0200 +++ /var/tmp/diff_new_pack.6qBsyw/_new 2024-06-06 12:33:22.258119223 +0200 @@ -26,9 +26,9 @@ Source0: https://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{na… Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Source100: %{name}-build.tar.xz -Patch0: 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch -Patch1: 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch -Patch2: 0003-Fix-Snakeyaml.patch +Patch0: 0001-Upgrade-to-SnakeYaml-2.2-439.patch +Patch1: 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch +Patch2: 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes @@ -103,9 +103,9 @@ %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :sisu-maven-plugin -%pom_remove_dep :sisu-guice modello-core -%pom_add_dep com.google.inject:guice modello-core +%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 modello-core # This builds correctly with the older velocity 1.x and avoids build cycles %pom_change_dep -r :velocity-engine-core :velocity ++++++ 0001-Upgrade-to-SnakeYaml-2.2-439.patch ++++++ ++++ 1851 lines (skipped) ++++++ 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch ++++++ From ba2e53e7b28fa126e030056921930e83a44e2494 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak <tamas(a)cservenak.net> Date: Wed, 5 Jun 2024 10:16:52 +0200 Subject: [PATCH 2/3] Update build, get rid of legacy, fix CLI (#452) Port 90352d3cd8de0382be73d5ce16b5f9d96469e39c to this PR, CLI use nop logging, rest unchanged. Fixes #434 --- modello-core/pom.xml | 84 ++++++++++++++----- .../java/org/codehaus/modello/Modello.java | 17 ++-- .../java/org/codehaus/modello/ModelloCli.java | 3 +- modello-maven-plugin/pom.xml | 38 ++++++--- pom.xml | 28 ++++--- 5 files changed, 120 insertions(+), 50 deletions(-) diff --git a/modello-core/pom.xml b/modello-core/pom.xml index 4fffa729..2af513a2 100644 --- a/modello-core/pom.xml +++ b/modello-core/pom.xml @@ -19,47 +19,89 @@ <dependency> <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.plexus</artifactId> - <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> - <classifier>no_aop</classifier> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-xml</artifactId> - </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> + <artifactId>slf4j-nop</artifactId> + <scope>runtime</scope> + <optional>true</optional> </dependency> </dependencies> <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifest> - <mainClass>org.codehaus.modello.ModelloCli</mainClass> - </manifest> - </archive> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>3.5.3</version> + <executions> + <execution> + <id>cli</id> + <goals> + <goal>shade</goal> + </goals> + <phase>package</phase> + <configuration> + <shadedClassifierName>cli</shadedClassifierName> + <createDependencyReducedPom>false</createDependencyReducedPom> + <shadedArtifactAttached>true</shadedArtifactAttached> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.SisuIndexResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <manifestEntries> + <Main-Class>org.codehaus.modello.ModelloCli</Main-Class> + <Specification-Title>${project.artifactId}</Specification-Title> + <Specification-Version>${project.version}</Specification-Version> + <Implementation-Title>${project.artifactId}</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id> + </manifestEntries> + </transformer> + </transformers> + <filters> + <filter> + <artifact>*:*</artifact> + <excludes> + <exclude>META-INF/MANIFEST.MF</exclude> + <exclude>META-INF/LICENSE</exclude> + <exclude>META-INF/LICENSE.txt</exclude> + <exclude>META-INF/DEPENDENCIES</exclude> + <exclude>META-INF/NOTICE</exclude> + <exclude>META-INF/NOTICE.txt</exclude> + <exclude>**/module-info.class</exclude> + <exclude>about.html</exclude> + <exclude>overview.html</exclude> + </excludes> + </filter> + </filters> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> diff --git a/modello-core/src/main/java/org/codehaus/modello/Modello.java b/modello-core/src/main/java/org/codehaus/modello/Modello.java index 00fb7114..62cb7eb4 100644 --- a/modello-core/src/main/java/org/codehaus/modello/Modello.java +++ b/modello-core/src/main/java/org/codehaus/modello/Modello.java @@ -22,8 +22,6 @@ package org.codehaus.modello; * SOFTWARE. */ -import javax.inject.Inject; - import java.io.Reader; import java.io.Writer; import java.util.Map; @@ -31,6 +29,9 @@ import java.util.Map; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; import org.codehaus.modello.model.ModelValidationException; +import org.codehaus.plexus.DefaultContainerConfiguration; +import org.codehaus.plexus.DefaultPlexusContainer; +import org.codehaus.plexus.PlexusConstants; /** * @author <a href="mailto:jason@maven.org">Jason van Zyl</a> @@ -39,9 +40,15 @@ import org.codehaus.modello.model.ModelValidationException; public class Modello { private final ModelloCore core; - @Inject - public Modello(ModelloCore core) { - this.core = core; + public Modello() throws ModelloException { + try { + this.core = new DefaultPlexusContainer(new DefaultContainerConfiguration() + .setClassPathScanning(PlexusConstants.SCANNING_INDEX) + .setAutoWiring(true)) + .lookup(ModelloCore.class); + } catch (Exception e) { + throw new ModelloException("Error while starting plexus.", e); + } } public void generate(Reader modelReader, String outputType, Map<String, Object> parameters) diff --git a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java index 1b4cd974..a75e4011 100644 --- a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java +++ b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java @@ -26,7 +26,6 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import org.codehaus.plexus.DefaultPlexusContainer; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.XmlStreamReader; @@ -41,7 +40,7 @@ public class ModelloCli { private static Map<String, Object> parameters; public static void main(String[] args) throws Exception { - Modello modello = new DefaultPlexusContainer().lookup(Modello.class); + Modello modello = new Modello(); parseArgumentsFromCommandLine(args); diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml index cd8d38bd..0765c379 100644 --- a/modello-maven-plugin/pom.xml +++ b/modello-maven-plugin/pom.xml @@ -19,16 +19,35 @@ </prerequisites> <dependencies> + <dependency> + <groupId>org.codehaus.modello</groupId> + <artifactId>modello-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-build-api</artifactId> + </dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>${mavenVersion}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.codehaus.modello</groupId> - <artifactId>modello-core</artifactId> - </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> @@ -41,10 +60,6 @@ <version>${mavenVersion}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> @@ -70,6 +85,7 @@ <dependency> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugin-java</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.codehaus.modello</groupId> @@ -114,11 +130,9 @@ <dependency> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugin-velocity</artifactId> +  </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-build-api</artifactId> - </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> diff --git a/pom.xml b/pom.xml index 02bcc5de..fb63107f 100644 --- a/pom.xml +++ b/pom.xml @@ -194,7 +194,8 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <jackson.version>2.17.0</jackson.version> <jdom.version>2.0.2</jdom.version> - <mavenVersion>3.5.4</mavenVersion> + <slf4j.version>1.7.36</slf4j.version> + <mavenVersion>3.6.3</mavenVersion> <!-- ! This controls the minimum java version ! and also the version which is used @@ -297,18 +298,17 @@ <dependency> <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.plexus</artifactId> - <version>0.3.5</version> + <version>0.9.0.M2</version> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> - <version>4.2.0</version> - <classifier>no_aop</classifier> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>5.1.0</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>4.0.1</version> + <version>3.5.1</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -323,12 +323,17 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.36</version> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.7.36</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -369,6 +374,9 @@ </goals> <configuration> <rules> + <requireMavenVersion> + <version>${mavenVersion}</version> + </requireMavenVersion> <requireJavaVersion> <version>${javaVersion}</version> </requireJavaVersion> @@ -438,7 +446,7 @@ <plugin> <groupId>org.codehaus.modello</groupId> <artifactId>modello-maven-plugin</artifactId> - <version>2.0.0</version> + <version>2.4.0</version> <configuration> <models> <model>src/main/mdo/modello.mdo</model> -- 2.45.1 ++++++ 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch -> 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch ++++++ --- /work/SRC/openSUSE:Factory/modello/0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch 2024-05-05 12:10:55.716187167 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.24587/0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch 2024-06-06 12:33:20.410051875 +0200 @@ -1,7 +1,7 @@ -From 8e04db4d5602a985ef4c5fa72cb862e9b4d6daf4 Mon Sep 17 00:00:00 2001 +From c692c46aa1898e80c225aaf99724207bd98d5bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba(a)bluewin.ch> Date: Fri, 12 Apr 2024 09:37:47 +0200 -Subject: [PATCH 2/3] Add support for domAsXpp3 and fail if the old Java5 +Subject: [PATCH 3/3] Add support for domAsXpp3 and fail if the old Java5 parameter is used --- @@ -46,5 +46,5 @@ } } -- -2.44.0 +2.45.1

1 0

commit plexus-xml for openSUSE:Factory
by Source-Sync 06 Jun '24

06 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plexus-xml for openSUSE:Factory checked in at 2024-06-06 12:33:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plexus-xml (Old) and /work/SRC/openSUSE:Factory/.plexus-xml.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plexus-xml" Thu Jun 6 12:33:08 2024 rev:2 rq:1178803 version:3.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/plexus-xml/plexus-xml.changes 2024-03-14 17:47:38.955128783 +0100 +++ /work/SRC/openSUSE:Factory/.plexus-xml.new.24587/plexus-xml.changes 2024-06-06 12:33:18.981999833 +0200 @@ -1,0 +2,17 @@ +Wed Jun 5 11:54:36 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Update to upstream version 3.0.1 + * Bug Fixes + + Allow nulls for write elements in MXSerializer + + Remove special chars from xml output + * Dependency updates + + Bump org.codehaus.plexus:plexus from 17 to 18 + + Bump release-drafter/release-drafter from 5 to 6 + + Bump parent to 17 and updates + * Maintenance + + Switch to Junit 5 + + Switch to shared gh actions setup from master branch + * Build + + Deploy snapshots for 3.x branch + +------------------------------------------------------------------- Old: ---- plexus-xml-3.0.0.tar.gz New: ---- plexus-xml-3.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plexus-xml.spec ++++++ --- /var/tmp/diff_new_pack.uToH44/_old 2024-06-06 12:33:19.746027676 +0200 +++ /var/tmp/diff_new_pack.uToH44/_new 2024-06-06 12:33:19.750027822 +0200 @@ -17,7 +17,7 @@ Name: plexus-xml -Version: 3.0.0 +Version: 3.0.1 Release: 0 Summary: Plexus XML Utilities License: Apache-2.0 ++++++ plexus-xml-3.0.0.tar.gz -> plexus-xml-3.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/.github/release-drafter.yml new/plexus-xml-plexus-xml-3.0.1/.github/release-drafter.yml --- old/plexus-xml-plexus-xml-3.0.0/.github/release-drafter.yml 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/.github/release-drafter.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -_extends: .github -tag-template: plexus-utils-$NEXT_MINOR_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/.github/workflows/maven.yml new/plexus-xml-plexus-xml-3.0.1/.github/workflows/maven.yml --- old/plexus-xml-plexus-xml-3.0.0/.github/workflows/maven.yml 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/.github/workflows/maven.yml 2024-05-21 23:12:07.000000000 +0200 @@ -22,4 +22,12 @@ jobs: build: name: Build it - uses: codehaus-plexus/.github/.github/workflows/maven.yml(a)v0.0.5 + uses: codehaus-plexus/.github/.github/workflows/maven.yml@master + + deploy: + name: Deploy + needs: build + uses: codehaus-plexus/.github/.github/workflows/maven-deploy.yml@master + with: + branch-to-deploy: 'refs/heads/3.x' + secrets: inherit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/.github/workflows/release-drafter.yml new/plexus-xml-plexus-xml-3.0.1/.github/workflows/release-drafter.yml --- old/plexus-xml-plexus-xml-3.0.0/.github/workflows/release-drafter.yml 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/.github/workflows/release-drafter.yml 2024-05-21 23:12:07.000000000 +0200 @@ -1,12 +1,14 @@ -name: Release Drafter +name: Release Drafter 3.x on: push: branches: - - master + - 3.x jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 + with: + config-name: 'release-drafter-3.x.yml' # located in .github/ in default branch env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/pom.xml new/plexus-xml-plexus-xml-3.0.1/pom.xml --- old/plexus-xml-plexus-xml-3.0.0/pom.xml 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/pom.xml 2024-05-21 23:12:07.000000000 +0200 @@ -20,11 +20,11 @@ <parent> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus</artifactId> - <version>13</version> + <version>18</version> </parent> <artifactId>plexus-xml</artifactId> - <version>3.0.0</version> + <version>3.0.1</version> <name>Plexus XML Utilities</name> <description>A collection of various utility classes to ease working with XML in Maven 3.</description> @@ -32,8 +32,8 @@ <scm> <connection>scm:git:https://github.com/codehaus-plexus/plexus-xml.git</connection> - <developerConnection>scm:git:https://github.com/codehaus-plexus/plexus-xml.git</developerConnection> - <tag>plexus-xml-3.0.0</tag> + <developerConnection>${project.scm.connection}</developerConnection> + <tag>plexus-xml-3.0.1</tag> <url>https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/</url> </scm> <issueManagement> @@ -48,32 +48,31 @@ </distributionManagement> <properties> - <project.build.outputTimestamp>2023-09-11T17:52:31Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-05-21T21:11:54Z</project.build.outputTimestamp> </properties> <dependencies> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>4.0.0</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openjdk.jmh</groupId> <artifactId>jmh-core</artifactId> - <version>1.36</version> + <version>1.37</version> <scope>test</scope> </dependency> <dependency> <groupId>org.openjdk.jmh</groupId> <artifactId>jmh-generator-annprocess</artifactId> - <version>1.36</version> + <version>1.37</version> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>4.0.1</version> <scope>test</scope> </dependency> </dependencies> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java new/plexus-xml-plexus-xml-3.0.1/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java --- old/plexus-xml-plexus-xml-3.0.0/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java 2024-05-21 23:12:07.000000000 +0200 @@ -23,9 +23,9 @@ import java.util.regex.Pattern; /** - * Implementation of XMLWriter which emits nicely formatted documents. - * + * Implementation of XMLWriter which emits nicely formatted documents. * + * C0n control characters except <code>\n</code>, <code>\r</code>, and <code>\t</code> are omitted from output */ public class PrettyPrintXMLWriter implements XMLWriter { /** Line separator ("\n" on UNIX) */ @@ -185,7 +185,7 @@ finishTag(); if (escapeXml) { - text = escapeXml(text); + text = escapeXmlText(text); } write(StringUtils.unifyLineSeparators(text, lineSeparator)); @@ -225,10 +225,12 @@ private static final Pattern crlf = Pattern.compile(crlf_str); - private static final Pattern lowers = Pattern.compile("([\000-\037])"); + private static final Pattern lowers = Pattern.compile("([\\x00-\\x1F])"); + + private static final Pattern illegalC0Characters = Pattern.compile("([\\x00-\\x08\\x0B-\\x0C\\x0E-\\x1F])"); private static String escapeXmlAttribute(String text) { - text = escapeXml(text); + text = escapeXmlText(text); // Windows Matcher crlfmatcher = crlf.matcher(text); @@ -245,6 +247,19 @@ return b.toString(); } + + private static String escapeXmlText(String text) { + text = escapeXml(text); + + Matcher matcher = illegalC0Characters.matcher(text); + StringBuffer b = new StringBuffer(); + while (matcher.find()) { + matcher = matcher.appendReplacement(b, ""); + } + matcher.appendTail(b); + + return b.toString(); + } /** {@inheritDoc} */ @Override diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java new/plexus-xml-plexus-xml-3.0.1/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java --- old/plexus-xml-plexus-xml-3.0.0/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java 2024-05-21 23:12:07.000000000 +0200 @@ -24,6 +24,7 @@ * <li>PROPERTY_SERIALIZER_INDENTATION * <li>PROPERTY_SERIALIZER_LINE_SEPARATOR * </ul> + * C0n control characters except <code>\n</code>, <code>\r</code>, and <code>\t</code> are omitted from output */ public class MXSerializer implements XmlSerializer { protected static final String XML_URI = "http://www.w3.org/XML/1998/namespace"; @@ -853,6 +854,9 @@ // --- utility methods protected void writeAttributeValue(String value, Writer out) throws IOException { + if (value == null) { + return; + } // .[apostrophe and <, & escaped], final char quot = attributeUseApostrophe ? '\'' : '"'; final String quotEntity = attributeUseApostrophe ? "'" : """; @@ -907,6 +911,9 @@ } protected void writeElementContent(String text, Writer out) throws IOException { + if (text == null) { + return; + } // escape '<', '&', ']]>', <32 if necessary int pos = 0; for (int i = 0; i < text.length(); i++) { @@ -943,19 +950,9 @@ // out.write(';'); // pos = i + 1; } else { - throw new IllegalStateException( - "character " + Integer.toString(ch) + " is not allowed in output" + getLocation()); - // in XML 1.1 legal are [#x1-#xD7FF] - // if(ch > 0) { - // if(i > pos) out.write(text.substring(pos, i)); - // out.write("&#"); - // out.write(Integer.toString(ch)); - // out.write(';'); - // pos = i + 1; - // } else { - // throw new IllegalStateException( - // "character zero is not allowed in XML 1.1 output"+getLocation()); - // } + // skip special char + if (i > pos) out.write(text.substring(pos, i)); + pos = i + 1; } } if (seenBracket) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java 2024-05-21 23:12:07.000000000 +0200 @@ -26,13 +26,13 @@ import java.util.NoSuchElementException; import org.codehaus.plexus.util.StringUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test of {@link org.codehaus.plexus.util.xml.PrettyPrintXMLWriter} @@ -50,7 +50,7 @@ /** * setUp. */ - @Before + @BeforeEach public void setUp() { initWriter(); } @@ -58,7 +58,7 @@ /** * tearDown. */ - @After + @AfterEach public void tearDown() { writer = null; w = null; @@ -175,7 +175,7 @@ public void testIssue51DetectJava7ConcatenationBug() throws IOException { File dir = new File("target/test-xml"); if (!dir.exists()) { - assertTrue("cannot create directory test-xml", dir.mkdir()); + assertTrue(dir.mkdir(), "cannot create directory test-xml"); } File xmlFile = new File(dir, "test-issue-51.xml"); OutputStreamWriter osw = new OutputStreamWriter(Files.newOutputStream(xmlFile.toPath()), "UTF-8"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlStreamReaderTest.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlStreamReaderTest.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlStreamReaderTest.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlStreamReaderTest.java 2024-05-21 23:12:07.000000000 +0200 @@ -21,9 +21,12 @@ import java.io.InputStream; import java.io.SequenceInputStream; -import junit.framework.ComparisonFailure; -import junit.framework.TestCase; import org.codehaus.plexus.util.IOUtil; +import org.junit.jupiter.api.Test; +import org.opentest4j.AssertionFailedError; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * XmlStreamReaderTest class. @@ -32,7 +35,7 @@ * @version $Id: $Id * @since 3.4.0 */ -public class XmlStreamReaderTest extends TestCase { +public class XmlStreamReaderTest { /** french */ private static final String TEXT_LATIN1 = "eacute: \u00E9"; @@ -111,6 +114,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testNoXmlHeader() throws IOException { String xml = "<text>text with no XML header</text>"; checkXmlContent(xml, "UTF-8"); @@ -122,6 +126,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testDefaultEncoding() throws IOException { checkXmlStreamReader(TEXT_UNICODE, null, "UTF-8"); checkXmlStreamReader(TEXT_UNICODE, null, "UTF-8", BOM_UTF8); @@ -132,6 +137,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testUTF8Encoding() throws IOException { checkXmlStreamReader(TEXT_UNICODE, "UTF-8"); checkXmlStreamReader(TEXT_UNICODE, "UTF-8", BOM_UTF8); @@ -142,6 +148,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testUTF16Encoding() throws IOException { checkXmlStreamReader(TEXT_UNICODE, "UTF-16", "UTF-16BE", null); checkXmlStreamReader(TEXT_UNICODE, "UTF-16", "UTF-16LE", BOM_UTF16LE); @@ -153,6 +160,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testUTF16BEEncoding() throws IOException { checkXmlStreamReader(TEXT_UNICODE, "UTF-16BE"); } @@ -162,6 +170,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testUTF16LEEncoding() throws IOException { checkXmlStreamReader(TEXT_UNICODE, "UTF-16LE"); } @@ -171,6 +180,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testLatin1Encoding() throws IOException { checkXmlStreamReader(TEXT_LATIN1, "ISO-8859-1"); } @@ -180,6 +190,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testLatin7Encoding() throws IOException { checkXmlStreamReader(TEXT_LATIN7, "ISO-8859-7"); } @@ -189,6 +200,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testLatin15Encoding() throws IOException { checkXmlStreamReader(TEXT_LATIN15, "ISO-8859-15"); } @@ -198,6 +210,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testEUC_JPEncoding() throws IOException { checkXmlStreamReader(TEXT_EUC_JP, "EUC-JP"); } @@ -207,6 +220,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testEBCDICEncoding() throws IOException { checkXmlStreamReader("simple text in EBCDIC", "CP1047"); } @@ -216,13 +230,13 @@ * * @throws java.io.IOException if any. */ + @Test public void testInappropriateEncoding() throws IOException { - try { - checkXmlStreamReader(TEXT_UNICODE, "ISO-8859-2"); - fail("Check should have failed, since some characters are not available in the specified encoding"); - } catch (ComparisonFailure cf) { - // expected failure, since the encoding does not contain some characters - } + // expected failure, since the encoding does not contain some characters + assertThrows( + AssertionFailedError.class, + () -> checkXmlStreamReader(TEXT_UNICODE, "ISO-8859-2"), + "Check should have failed, since some characters are not available in the specified encoding"); } /** @@ -230,6 +244,7 @@ * * @throws java.io.IOException if any. */ + @Test public void testEncodingAttribute() throws IOException { String xml = "<?xml version='1.0' encoding='US-ASCII'?><element encoding='attribute value'/>"; checkXmlContent(xml, "US-ASCII"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlStreamWriterTest.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlStreamWriterTest.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlStreamWriterTest.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlStreamWriterTest.java 2024-05-21 23:12:07.000000000 +0200 @@ -19,9 +19,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * XmlStreamWriterTest class. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java 2024-05-21 23:12:07.000000000 +0200 @@ -27,10 +27,9 @@ import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * Test the {@link org.codehaus.plexus.util.xml.XmlUtil} class. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java 2024-05-21 23:12:07.000000000 +0200 @@ -21,12 +21,11 @@ import java.io.Writer; import org.codehaus.plexus.util.StringUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * XmlWriterUtilTest class. @@ -47,7 +46,7 @@ * * @throws java.lang.Exception if any. */ - @Before + @BeforeEach public void setUp() throws Exception { output = new ByteArrayOutputStream(); writer = WriterFactory.newXmlWriter(output); @@ -59,7 +58,7 @@ * * @throws java.lang.Exception if any. */ - @After + @AfterEach public void tearDown() throws Exception { xmlWriter = null; writer = null; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java 2024-05-21 23:12:07.000000000 +0200 @@ -23,11 +23,9 @@ import org.codehaus.plexus.util.xml.pull.MXParser; import org.codehaus.plexus.util.xml.pull.XmlPullParser; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * Test the Xpp3DomBuilder. @@ -52,7 +50,7 @@ Xpp3Dom expectedDom = createExpectedDom(); - assertEquals("check DOMs match", expectedDom, dom); + assertEquals(expectedDom, dom, "check DOMs match"); } /** @@ -66,12 +64,11 @@ Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(domString), true); - assertEquals("test with trimming on", "element1", dom.getChild("el1").getValue()); + assertEquals("element1", dom.getChild("el1").getValue(), "test with trimming on"); dom = Xpp3DomBuilder.build(new StringReader(domString), false); - assertEquals( - "test with trimming off", " element1\n ", dom.getChild("el1").getValue()); + assertEquals(" element1\n ", dom.getChild("el1").getValue(), "test with trimming off"); } /** @@ -116,10 +113,10 @@ eventType = parser.next(); } - assertEquals("Check DOM matches", expectedDom, dom); - assertFalse("Check closing root was consumed", rootClosed); - assertTrue("Check continued to parse configuration", configurationClosed); - assertTrue("Check continued to parse newRoot", newRootClosed); + assertEquals(expectedDom, dom, "Check DOM matches"); + assertFalse(rootClosed, "Check closing root was consumed"); + assertTrue(configurationClosed, "Check continued to parse configuration"); + assertTrue(newRootClosed, "Check continued to parse newRoot"); } /** @@ -149,15 +146,13 @@ public void testEscapingInContent() throws IOException, XmlPullParserException { Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(getEncodedString())); - assertEquals("Check content value", "\"text\"", dom.getChild("el").getValue()); - assertEquals( - "Check content value", "\"text\"", dom.getChild("ela").getValue()); - assertEquals( - "Check content value", "\"text\"", dom.getChild("elb").getValue()); + assertEquals("\"text\"", dom.getChild("el").getValue(), "Check content value"); + assertEquals("\"text\"", dom.getChild("ela").getValue(), "Check content value"); + assertEquals("\"text\"", dom.getChild("elb").getValue(), "Check content value"); StringWriter w = new StringWriter(); Xpp3DomWriter.write(w, dom); - assertEquals("Compare stringified DOMs", getExpectedString(), w.toString()); + assertEquals(getExpectedString(), w.toString(), "Compare stringified DOMs"); } /** @@ -171,12 +166,12 @@ String s = getAttributeEncodedString(); Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(s)); - assertEquals("Check attribute value", "<foo>", dom.getChild("el").getAttribute("att")); + assertEquals("<foo>", dom.getChild("el").getAttribute("att"), "Check attribute value"); StringWriter w = new StringWriter(); Xpp3DomWriter.write(w, dom); String newString = w.toString(); - assertEquals("Compare stringified DOMs", newString, s); + assertEquals(newString, s, "Compare stringified DOMs"); } /** @@ -194,16 +189,16 @@ }; Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(createDomString()), true, ilb); Xpp3Dom expectedDom = createExpectedDom(); - assertEquals("root input location", expectedDom.getInputLocation(), dom.getInputLocation()); + assertEquals(expectedDom.getInputLocation(), dom.getInputLocation(), "root input location"); for (int i = 0; i < dom.getChildCount(); i++) { Xpp3Dom elt = dom.getChild(i); Xpp3Dom expectedElt = expectedDom.getChild(i); - assertEquals(elt.getName() + " input location", expectedElt.getInputLocation(), elt.getInputLocation()); + assertEquals(expectedElt.getInputLocation(), elt.getInputLocation(), elt.getName() + " input location"); if ("el2".equals(elt.getName())) { Xpp3Dom el3 = elt.getChild(0); Xpp3Dom expectedEl3 = expectedElt.getChild(0); - assertEquals(el3.getName() + " input location", expectedEl3.getInputLocation(), el3.getInputLocation()); + assertEquals(expectedEl3.getInputLocation(), el3.getInputLocation(), el3.getName() + " input location"); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java 2024-05-21 23:12:07.000000000 +0200 @@ -22,14 +22,9 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParser; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; /** * Xpp3DomTest class. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomUtilsTest.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomUtilsTest.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomUtilsTest.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomUtilsTest.java 2024-05-21 23:12:07.000000000 +0200 @@ -21,9 +21,9 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParser; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Xpp3DomUtilsTest class. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomWriterTest.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomWriterTest.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomWriterTest.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomWriterTest.java 2024-05-21 23:12:07.000000000 +0200 @@ -18,9 +18,9 @@ import java.io.StringWriter; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Xpp3DomWriterTest class. @@ -41,7 +41,7 @@ Xpp3DomWriter.write(writer, createXpp3Dom()); - assertEquals("Check if output matches", createExpectedXML(true), writer.toString()); + assertEquals(createExpectedXML(true), writer.toString(), "Check if output matches"); } /** @@ -53,7 +53,7 @@ Xpp3DomWriter.write(new PrettyPrintXMLWriter(writer), createXpp3Dom(), false); - assertEquals("Check if output matches", createExpectedXML(false), writer.toString()); + assertEquals(createExpectedXML(false), writer.toString(), "Check if output matches"); } private String createExpectedXML(boolean escape) { @@ -82,6 +82,12 @@ buf.append(LS); buf.append(" </el6>"); buf.append(LS); + if (escape) { + buf.append(" <el8>special-char-</el8>"); + } else { + buf.append(" <el8>special-char-" + (char) 7 + "</el8>"); + } + buf.append(LS); buf.append("</root>"); return buf.toString(); @@ -95,7 +101,7 @@ dom.addChild(el1); Xpp3Dom el2 = new Xpp3Dom("el2"); - el2.setAttribute("att2", "attribute2\nnextline"); + el2.setAttribute("att2", "attribute2\nnextline" + (char) 7); dom.addChild(el2); Xpp3Dom el3 = new Xpp3Dom("el3"); @@ -119,6 +125,10 @@ el7.setValue("element7\n&\"\'<>"); el6.addChild(el7); + Xpp3Dom el8 = new Xpp3Dom("el8"); + el8.setValue("special-char-" + (char) 7); + + dom.addChild(el8); return dom; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production24_Test.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production24_Test.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production24_Test.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production24_Test.java 2024-05-21 23:12:07.000000000 +0200 @@ -5,11 +5,11 @@ import java.io.IOException; import java.io.Reader; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test class that execute a particular set of tests associated to a TESCASES tag from the XML W3C Conformance Tests. @@ -30,7 +30,7 @@ /** * setUp. */ - @Before + @BeforeEach public void setUp() { parser = new MXParser(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production2_Test.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production2_Test.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production2_Test.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production2_Test.java 2024-05-21 23:12:07.000000000 +0200 @@ -12,11 +12,11 @@ import java.nio.file.Files; import java.nio.file.Paths; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test class that execute a particular set of tests associated to a TESCASES tag from the XML W3C Conformance Tests. @@ -37,7 +37,7 @@ /** * setUp. */ - @Before + @BeforeEach public void setUp() { parser = new MXParser(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production32_Test.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production32_Test.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production32_Test.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production32_Test.java 2024-05-21 23:12:07.000000000 +0200 @@ -5,11 +5,11 @@ import java.io.IOException; import java.io.Reader; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test class that execute a particular set of tests associated to a TESCASES tag from the XML W3C Conformance Tests. @@ -30,7 +30,7 @@ /** * setUp. */ - @Before + @BeforeEach public void setUp() { parser = new MXParser(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production66_Test.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production66_Test.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production66_Test.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production66_Test.java 2024-05-21 23:12:07.000000000 +0200 @@ -6,11 +6,11 @@ import java.io.IOException; import java.io.Reader; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test class that execute a particular set of tests associated to a TESCASES tag from the XML W3C Conformance Tests. @@ -31,7 +31,7 @@ /** * setUp. */ - @Before + @BeforeEach public void setUp() { parser = new MXParser(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production80_Test.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production80_Test.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production80_Test.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production80_Test.java 2024-05-21 23:12:07.000000000 +0200 @@ -5,11 +5,11 @@ import java.io.IOException; import java.io.Reader; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test class that execute a particular set of tests associated to a TESCASES tag from the XML W3C Conformance Tests. @@ -30,7 +30,7 @@ /** * setUp. */ - @Before + @BeforeEach public void setUp() { parser = new MXParser(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java 2024-05-21 23:12:07.000000000 +0200 @@ -27,12 +27,12 @@ import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.xml.ReaderFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * MXParserTest class. @@ -890,8 +890,8 @@ } private static void assertPosition(int row, int col, MXParser parser) { - assertEquals("Current line", row, parser.getLineNumber()); - assertEquals("Current column", col, parser.getColumnNumber()); + assertEquals(row, parser.getLineNumber(), "Current line"); + assertEquals(col, parser.getColumnNumber(), "Current column"); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/MXSerializerTest.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/MXSerializerTest.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/MXSerializerTest.java 1970-01-01 01:00:00.000000000 +0100 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/MXSerializerTest.java 2024-05-21 23:12:07.000000000 +0200 @@ -0,0 +1,74 @@ +package org.codehaus.plexus.util.xml.pull; + +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.Arrays; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class MXSerializerTest { + + @Test + void testSerialize() throws Exception { + + StringWriter writer = new StringWriter(); + + MXSerializer sr = new MXSerializer(); + sr.setOutput(writer); + + sr.startDocument(null, Boolean.TRUE); + sr.startTag(null, "root"); + for (int i : Arrays.asList(8, 9, 10, 11, 13, 15)) { + sr.startTag(null, "char"); + sr.text(Character.getName(i) + ": " + ((char) i)); + sr.endTag(null, "char"); + } + + sr.endTag(null, "root"); + sr.endDocument(); + assertEquals(expectedOutput(), writer.toString()); + } + + @Test + void testDeserialize() throws Exception { + MXParser parser = new MXParser(); + parser.setInput(new StringReader(expectedOutput())); + int eventType = parser.getEventType(); + + while (eventType != XmlPullParser.END_DOCUMENT) { + eventType = parser.next(); + } + } + + private String expectedOutput() { + StringBuilder out = new StringBuilder(); + out.append("<?xml version=\"1.0\" standalone=\"yes\"?>"); + out.append("<root>"); + out.append("<char>BACKSPACE: </char>"); + out.append("<char>CHARACTER TABULATION: \t</char>"); + out.append("<char>LINE FEED (LF): \n</char>"); + out.append("<char>LINE TABULATION: </char>"); + out.append("<char>CARRIAGE RETURN (CR): \r</char>"); + out.append("<char>SHIFT IN: </char>"); + out.append("</root>"); + return out.toString(); + } + + /** + * Tests MJAVADOC-793. + */ + @Test + public void testWriteNullValues() throws IOException { + // should be no-ops + new MXSerializer().writeElementContent(null, null); + new MXSerializer().writeAttributeValue(null, null); + final StringWriter stringWriter = new StringWriter(); + new MXSerializer().writeElementContent(null, stringWriter); + assertEquals("", stringWriter.toString()); + new MXSerializer().writeAttributeValue(null, stringWriter); + assertEquals("", stringWriter.toString()); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/eduni_misc_Test_BjoernHoehrmannviaHST2013_09_18_Test.java new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/eduni_misc_Test_BjoernHoehrmannviaHST2013_09_18_Test.java --- old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/eduni_misc_Test_BjoernHoehrmannviaHST2013_09_18_Test.java 2023-09-11 19:52:41.000000000 +0200 +++ new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/eduni_misc_Test_BjoernHoehrmannviaHST2013_09_18_Test.java 2024-05-21 23:12:07.000000000 +0200 @@ -8,11 +8,11 @@ import java.io.Reader; import java.nio.charset.StandardCharsets; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test class that execute a particular set of tests associated to a TESCASES tag from the XML W3C Conformance Tests. @@ -32,7 +32,7 @@ /** * setUp. */ - @Before + @BeforeEach public void setUp() { parser = new MXParser(); } ++++++ plexus-xml-build.xml ++++++ --- /var/tmp/diff_new_pack.uToH44/_old 2024-06-06 12:33:19.898033216 +0200 +++ /var/tmp/diff_new_pack.uToH44/_new 2024-06-06 12:33:19.902033362 +0200 @@ -8,7 +8,7 @@ <property name="project.groupId" value="org.codehaus.plexus"/> <property name="project.artifactId" value="plexus-xml"/> - <property name="project.version" value="3.0.0"/> + <property name="project.version" value="3.0.1"/> <property name="compiler.release" value="8"/> <property name="compiler.source" value="1.${compiler.release}"/>

1 0

commit gap-smallsemi for openSUSE:Factory
by Source-Sync 06 Jun '24

06 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gap-smallsemi for openSUSE:Factory checked in at 2024-06-06 12:33:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gap-smallsemi (Old) and /work/SRC/openSUSE:Factory/.gap-smallsemi.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gap-smallsemi" Thu Jun 6 12:33:05 2024 rev:2 rq:1178795 version:0.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gap-smallsemi/gap-smallsemi.changes 2023-12-28 23:01:05.949643721 +0100 +++ /work/SRC/openSUSE:Factory/.gap-smallsemi.new.24587/gap-smallsemi.changes 2024-06-06 12:33:17.581948812 +0200 @@ -1,0 +2,9 @@ +Wed Jun 5 16:34:15 UTC 2024 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 0.7.0 + * Some refactoring of the code related to enumerators and + iterators, and including a bug fix related to the data files + for order 8 + (https://github.com/gap-packages/smallsemi/issues/34) + +------------------------------------------------------------------- Old: ---- smallsemi-0.6.13.tar.gz New: ---- smallsemi-0.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gap-smallsemi.spec ++++++ --- /var/tmp/diff_new_pack.4zooyj/_old 2024-06-06 12:33:18.481981611 +0200 +++ /var/tmp/diff_new_pack.4zooyj/_new 2024-06-06 12:33:18.481981611 +0200 @@ -1,7 +1,7 @@ # # spec file for package gap-smallsemi # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,15 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: gap-smallsemi -Version: 0.6.13 +Version: 0.7.0 Release: 0 Summary: GAP data library of semigroups of small size -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Scientific/Math URL: https://gap-packages.github.io/smallsemi/ #Git-Clone: https://github.com/gap-packages/smallsemi ++++++ smallsemi-0.6.13.tar.gz -> smallsemi-0.7.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/gap-smallsemi/smallsemi-0.6.13.tar.gz /work/SRC/openSUSE:Factory/.gap-smallsemi.new.24587/smallsemi-0.7.0.tar.gz differ: char 5, line 1

1 0