From c26281a2c5e61758eeab79cd87f45b0de59300a2a10d2ebdd91f999829c60fa7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Apr 2022 18:47:16 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=15 --- sisu.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/sisu.spec b/sisu.spec index 46fab8f..815bba7 100644 --- a/sisu.spec +++ b/sisu.spec @@ -50,8 +50,6 @@ BuildRequires: plexus-utils BuildRequires: slf4j BuildRequires: testng BuildRequires: unzip -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve BuildRequires: xz Provides: bundled(objectweb-asm) BuildArch: noarch From b9da862efbca5b78c8ecd3f54108539112ce41c68b84b28b637544ac658ef838 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 04:48:58 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=16 --- sisu.spec | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/sisu.spec b/sisu.spec index 815bba7..47b12f8 100644 --- a/sisu.spec +++ b/sisu.spec @@ -61,6 +61,7 @@ style dependency injection. %package inject Summary: Sisu inject Group: Development/Libraries/Java +Requires: mvn(javax.enterprise:cdi-api) %description inject This package contains %{summary}. @@ -68,6 +69,10 @@ This package contains %{summary}. %package plexus Summary: Sisu Plexus Group: Development/Libraries/Java +Requires: mvn(org.codehaus.plexus:plexus-classworlds) +Requires: mvn(org.codehaus.plexus:plexus-component-annotations) +Requires: mvn(org.codehaus.plexus:plexus-utils) +Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) = %{version} %description plexus This package contains %{summary}. @@ -99,10 +104,6 @@ for i in inject plexus; do %pom_xpath_set -r /pom:project/pom:version %{version} %{name}-${i} done -%{mvn_file} ":{*}" @1 -%{mvn_package} ":*{inject,plexus}" @1 -%{mvn_alias} :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus - %build mkdir -p lib build-jar-repository -s lib \ @@ -120,13 +121,20 @@ build-jar-repository -s lib \ testng %{ant} package javadoc -for i in inject plexus; do - %{mvn_artifact} %{name}-${i}/pom.xml %{name}-${i}/target/org.eclipse.sisu.${i}-%{version}.jar -done - %install -%mvn_install +# jar +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 %{name}-inject/target/org.eclipse.sisu.inject-%{version}.jar %{buildroot}%{_javadir}/org.eclipse.sisu.inject.jar +install -pm 0644 %{name}-plexus/target/org.eclipse.sisu.plexus-%{version}.jar %{buildroot}%{_javadir}/org.eclipse.sisu.plexus.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir} +install -pm 0644 %{name}-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 +install -pm 0644 %{name}-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 + +# javadoc for i in inject plexus; do install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i} cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/ From 9b2303e9310211e4426094fbffd1483c76b6ab26c016be70add2724075fe0479 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 27 Apr 2022 13:47:05 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=17 --- sisu.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sisu.changes b/sisu.changes index 1cf0fb2..3687478 100644 --- a/sisu.changes +++ b/sisu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 27 13:46:14 UTC 2022 - Fridrich Strba + +- Change to generate maven meta-data using the %%add_maven_depmap + * so that it can be built before the xmvn-tools + ------------------------------------------------------------------- Sun Mar 20 19:45:31 UTC 2022 - Fridrich Strba From bd42c6b27637dc69104c7f74e3fb60e59536e4164231e41f073770e77ec481e7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 28 Apr 2022 05:57:10 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=18 --- sisu.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sisu.spec b/sisu.spec index 47b12f8..a5b8c83 100644 --- a/sisu.spec +++ b/sisu.spec @@ -103,6 +103,7 @@ cp %{SOURCE101} sisu-plexus/pom.xml for i in inject plexus; do %pom_xpath_set -r /pom:project/pom:version %{version} %{name}-${i} done +%pom_change_dep :org.eclipse.sisu.inject org.eclipse.sisu:org.eclipse.sisu.inject:%{version} %{name}-plexus %build mkdir -p lib From 097920933850c01898e0fc7e0a2c250610f18c4ad9b55f4296ed4784a912951f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 28 Apr 2022 09:48:42 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=19 --- sisu.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sisu.spec b/sisu.spec index a5b8c83..704f34d 100644 --- a/sisu.spec +++ b/sisu.spec @@ -102,6 +102,8 @@ cp %{SOURCE101} sisu-plexus/pom.xml for i in inject plexus; do %pom_xpath_set -r /pom:project/pom:version %{version} %{name}-${i} + %pom_remove_dep :::provided: %{name}-${i} + %pom_xpath_remove pom:project/pom:build %{name}-${i} done %pom_change_dep :org.eclipse.sisu.inject org.eclipse.sisu:org.eclipse.sisu.inject:%{version} %{name}-plexus