From 359c7841123b0f7aed37edb65984115a005249418d6bcfe9ec8f934ef18f3ae8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 May 2024 18:48:57 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-doxia?expand=0&rev=36 --- maven-doxia.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maven-doxia.spec b/maven-doxia.spec index 54cb36a..d0cd5de 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -197,6 +197,8 @@ API documentation for %{name}. # requires network rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java +%pom_change_dep -r :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus + %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-core for i in doxia-module-docbook-simple doxia-module-fml doxia-module-fo doxia-module-itext doxia-module-markdown doxia-module-xdoc doxia-module-xhtml doxia-module-xhtml5; do %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-modules/${i} From a57effbfe1751609a6922ed2ef6cdf0fd893409a47a0482594c184f7a5ac0af2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 May 2024 19:30:00 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-doxia?expand=0&rev=37 --- maven-doxia.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/maven-doxia.spec b/maven-doxia.spec index d0cd5de..54cb36a 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -197,8 +197,6 @@ API documentation for %{name}. # requires network rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java -%pom_change_dep -r :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus - %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-core for i in doxia-module-docbook-simple doxia-module-fml doxia-module-fo doxia-module-itext doxia-module-markdown doxia-module-xdoc doxia-module-xhtml doxia-module-xhtml5; do %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-modules/${i} From fe763d26ca2ca6d87485e3759d10ff4e2cc2466e9c580ced3299022e199c664a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 10 Jun 2024 16:37:32 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-doxia?expand=0&rev=38 --- maven-doxia.changes | 5 +++++ maven-doxia.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/maven-doxia.changes b/maven-doxia.changes index ef211ef..67bf9dc 100644 --- a/maven-doxia.changes +++ b/maven-doxia.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 10 16:37:25 UTC 2024 - Fridrich Strba + +- Add dependency on jakarta-inject, needed by google-guice 6.0.0 + ------------------------------------------------------------------- Tue Apr 2 17:22:22 UTC 2024 - Fridrich Strba diff --git a/maven-doxia.spec b/maven-doxia.spec index 54cb36a..35652bb 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -38,6 +38,7 @@ BuildRequires: google-guice BuildRequires: guava BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core +BuildRequires: jakarta-inject BuildRequires: javapackages-local BuildRequires: jdom2 BuildRequires: modello >= 2.0.0 @@ -221,6 +222,7 @@ build-jar-repository -s lib \ guice/google-guice \ httpcomponents/httpclient \ httpcomponents/httpcore \ + jakarta-inject \ jdom2/jdom2 \ objectweb-asm/asm \ org.eclipse.sisu.inject \ From 80ecf1403784098bb6ab479462c198c9ce43f230296655f2545c2ebaba7b1302 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 10 Jun 2024 18:00:45 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-doxia?expand=0&rev=39 --- maven-doxia-build.tar.xz | 4 ++-- maven-doxia.changes | 3 ++- maven-doxia.spec | 13 ------------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/maven-doxia-build.tar.xz b/maven-doxia-build.tar.xz index 7b7bf23..2409421 100644 --- a/maven-doxia-build.tar.xz +++ b/maven-doxia-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab05e18998e64d53317936318cbac5d2494ea4825f2d2cc025081889ab6fa285 -size 5136 +oid sha256:c0fe9b4ef80e9d0b9e1c14803213e1fab45bbc3a799816f001e6a37da93e994f +size 5328 diff --git a/maven-doxia.changes b/maven-doxia.changes index 67bf9dc..be4980f 100644 --- a/maven-doxia.changes +++ b/maven-doxia.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Mon Jun 10 16:37:25 UTC 2024 - Fridrich Strba -- Add dependency on jakarta-inject, needed by google-guice 6.0.0 +- Use plexus-metadata-generator executable directly to simplify + build classpath ------------------------------------------------------------------- Tue Apr 2 17:22:22 UTC 2024 - Fridrich Strba diff --git a/maven-doxia.spec b/maven-doxia.spec index 35652bb..420ecb1 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -213,30 +213,17 @@ done %build mkdir -p lib build-jar-repository -s lib \ - atinject \ apache-commons-text \ - commons-cli \ commons-configuration2 \ commons-lang3 \ - guava/guava \ - guice/google-guice \ httpcomponents/httpclient \ httpcomponents/httpcore \ - jakarta-inject \ - jdom2/jdom2 \ - objectweb-asm/asm \ - org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ parboiled/core \ pegdown \ - plexus-classworlds \ - plexus/cli \ plexus-containers/plexus-component-annotations \ - plexus-metadata-generator \ plexus/utils \ plexus/xml \ - qdox \ - xbean/xbean-reflect \ xmlgraphics-commons \ xmlgraphics-fop From 0ad92ffd5aad88a56428dcdbc8e4469db06dceb030beb7cec77b1efd494b8e3e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 11 Jun 2024 09:29:47 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-doxia?expand=0&rev=40 --- maven-doxia.spec | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/maven-doxia.spec b/maven-doxia.spec index 420ecb1..278cd1e 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -27,35 +27,22 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia/%{ve Source1: %{name}-build.tar.xz Patch0: 0002-Commons-configuration2.patch BuildRequires: ant -BuildRequires: apache-commons-cli -BuildRequires: apache-commons-collections BuildRequires: apache-commons-configuration2 BuildRequires: apache-commons-lang3 BuildRequires: apache-commons-text -BuildRequires: atinject BuildRequires: fdupes -BuildRequires: google-guice -BuildRequires: guava BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core -BuildRequires: jakarta-inject BuildRequires: javapackages-local -BuildRequires: jdom2 BuildRequires: modello >= 2.0.0 -BuildRequires: objectweb-asm BuildRequires: parboiled BuildRequires: pegdown -BuildRequires: plexus-classworlds -BuildRequires: plexus-cli BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils BuildRequires: plexus-xml -BuildRequires: qdox -BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: unzip -BuildRequires: xbean BuildRequires: xmlgraphics-commons BuildRequires: xmlgraphics-fop BuildRequires: xmlunit