From 925a718d545b8c81050716c24c782a7a64d338dacd5d238043e0c552cc822b33 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Sep 2023 11:17:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=43 --- maven-plugin-plugin-bootstrap.spec | 40 ++---------------------------- maven-plugin-plugin.spec | 13 ++++------ maven-plugin-tools-build.tar.xz | 4 +-- 3 files changed, 9 insertions(+), 48 deletions(-) diff --git a/maven-plugin-plugin-bootstrap.spec b/maven-plugin-plugin-bootstrap.spec index 33ba513..39793c8 100644 --- a/maven-plugin-plugin-bootstrap.spec +++ b/maven-plugin-plugin-bootstrap.spec @@ -33,36 +33,19 @@ Patch0: 0002-Remove-dependency-on-jtidy.patch # We generated those ones outside the rpm build for a bootstrap package. Patch20: maven-plugin-plugin-bootstrap-resouces.patch BuildRequires: ant -BuildRequires: apache-commons-cli -BuildRequires: atinject -BuildRequires: google-guice -BuildRequires: guava BuildRequires: javapackages-local -BuildRequires: jdom2 -BuildRequires: maven-doxia-logging-api -BuildRequires: maven-doxia-sink-api -BuildRequires: maven-doxia-sitetools BuildRequires: maven-lib BuildRequires: maven-plugin-annotations BuildRequires: maven-plugin-registry BuildRequires: maven-plugin-tools-api BuildRequires: maven-plugin-tools-generators -BuildRequires: maven-reporting-api -BuildRequires: maven-reporting-impl BuildRequires: maven-resolver-api -BuildRequires: objectweb-asm BuildRequires: plexus-build-api -BuildRequires: plexus-classworlds -BuildRequires: plexus-cli -BuildRequires: plexus-containers-component-annotations -BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils BuildRequires: plexus-velocity -BuildRequires: qdox BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: unzip -BuildRequires: velocity BuildRequires: xmvn-install BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-annotations) @@ -100,44 +83,25 @@ artifact metadata and a generic help goal. %build mkdir -p lib build-jar-repository -s lib \ - atinject \ - commons-cli \ - guava/guava \ - guice/google-guice \ - jdom2/jdom2 \ - maven-doxia/doxia-logging-api \ - maven-doxia/doxia-sink-api \ - maven-doxia-sitetools/doxia-site-renderer \ maven/maven-artifact \ - maven/maven-compat \ maven/maven-core \ maven/maven-model \ maven/maven-plugin-api \ - maven/maven-plugin-registry \ maven/maven-repository-metadata \ maven/maven-settings \ maven-plugin-tools/maven-plugin-annotations \ maven-plugin-tools/maven-plugin-tools-api \ maven-plugin-tools/maven-plugin-tools-generators \ - maven-reporting-api/maven-reporting-api \ - maven-reporting-impl/maven-reporting-impl \ maven-resolver/maven-resolver-api \ - objectweb-asm/asm \ org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ - plexus-classworlds \ - plexus/cli \ - plexus-containers/plexus-component-annotations \ - plexus-metadata-generator \ plexus/plexus-build-api \ plexus/utils \ - plexus-velocity/plexus-velocity \ - qdox \ - velocity + plexus-velocity/plexus-velocity %{mvn_file} :%{artifactId} %{base_name}/%{artifactId} pushd %{artifactId} -%{ant} -v \ +%{ant} \ -Dtest.skip=true \ jar popd diff --git a/maven-plugin-plugin.spec b/maven-plugin-plugin.spec index 377db96..88dfa03 100644 --- a/maven-plugin-plugin.spec +++ b/maven-plugin-plugin.spec @@ -29,8 +29,6 @@ Patch0: 0002-Remove-dependency-on-jtidy.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: unzip -BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) -BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-annotations) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-ant) @@ -39,20 +37,19 @@ BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-beanshell) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-generators) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) -BuildRequires: mvn(org.apache.maven.surefire:maven-surefire-common) +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-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-repository-metadata) -BuildRequires: mvn(org.apache.velocity:velocity) -BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.codehaus.plexus:plexus-velocity) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) Obsoletes: %{name}-bootstrap #!BuildRequires: maven-compiler-plugin-bootstrap #!BuildRequires: maven-jar-plugin-bootstrap -#!BuildRequires: maven-javadoc-plugin-bootstrap #!BuildRequires: maven-plugin-plugin-bootstrap #!BuildRequires: maven-resources-plugin-bootstrap #!BuildRequires: maven-surefire-plugin-bootstrap diff --git a/maven-plugin-tools-build.tar.xz b/maven-plugin-tools-build.tar.xz index 9123b67..4c28d76 100644 --- a/maven-plugin-tools-build.tar.xz +++ b/maven-plugin-tools-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f750e3253eaed5462ac9094512c4823bcfab462154538ff202333aa7a5fe2cd -size 4860 +oid sha256:1454e8da1b64e7cdba4f30cae9534f35e4213c6ca448abef8bb7d8fae918325f +size 4868