OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-doxia-sitetools?expand=0&rev=16

maven-doxia-sitetools.spec

@@ -33,33 +33,33 @@ BuildRequires:  apache-commons-cli
 BuildRequires:  apache-commons-collections
 BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang3
+BuildRequires:  atinject
 BuildRequires:  fdupes
+BuildRequires:  google-guice
 BuildRequires:  guava
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  jdom2
-BuildRequires:  maven-artifact
-BuildRequires:  maven-artifact-manager
 BuildRequires:  maven-doxia-core
 BuildRequires:  maven-doxia-logging-api
 BuildRequires:  maven-doxia-module-fo
 BuildRequires:  maven-doxia-module-xhtml
 BuildRequires:  maven-doxia-sink-api
 BuildRequires:  maven-lib
-BuildRequires:  maven-project
 BuildRequires:  maven-reporting-api
 BuildRequires:  modello >= 2.0.0
 BuildRequires:  objectweb-asm
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-cli
 BuildRequires:  plexus-containers-component-annotations
-BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-i18n
 BuildRequires:  plexus-interpolation
 BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-velocity
 BuildRequires:  qdox
+BuildRequires:  sisu-inject
+BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 BuildRequires:  velocity
 BuildRequires:  xbean
@@ -91,6 +91,11 @@ API documentation for %{name}.
 %setup -q -n doxia-%{subproj}-%{version} -a1
 %patch1 -p1
 
+# migrate to maven 3
+%pom_xpath_set //pom:mavenVersion 3.8.6 doxia-integration-tools
+%pom_change_dep :maven-artifact-manager :maven-core doxia-integration-tools
+%pom_change_dep :maven-project :maven-compat doxia-integration-tools
+
 # complains
 %pom_remove_plugin :apache-rat-plugin
 
@@ -111,38 +116,39 @@ rm -rf $(find -type d -name itext)
 %build
 mkdir -p lib
 build-jar-repository -s lib \
-	apache-commons-collections \
+    atinject \
-	apache-commons-lang3 \
+    apache-commons-collections \
-	commons-cli \
+    apache-commons-lang3 \
-	commons-io \
+    commons-cli \
-	guava/guava \
+    commons-io \
-	jdom2/jdom2 \
+    guava/guava \
-	maven-doxia/doxia-core \
+    guice/google-guice \
-	maven-doxia/doxia-logging-api \
+    jdom2/jdom2 \
-	maven-doxia/doxia-module-fo \
+    maven-doxia/doxia-core \
-	maven-doxia/doxia-module-xhtml \
+    maven-doxia/doxia-logging-api \
-	maven-doxia/doxia-module-xhtml5 \
+    maven-doxia/doxia-module-fo \
-	maven-doxia/doxia-sink-api \
+    maven-doxia/doxia-module-xhtml \
-	maven/maven-artifact \
+    maven-doxia/doxia-module-xhtml5 \
-	maven/maven-artifact-2.0.2 \
+    maven-doxia/doxia-sink-api \
-	maven/maven-artifact-manager \
+    maven/maven-artifact \
-	maven/maven-model \
+    maven/maven-core \
-	maven/maven-plugin-api \
+    maven/maven-plugin-api \
-	maven/maven-project \
+    maven/maven-project \
-	maven-reporting-api/maven-reporting-api \
+    maven-reporting-api/maven-reporting-api \
-	objectweb-asm/asm \
+    objectweb-asm/asm \
-	plexus-classworlds \
+    org.eclipse.sisu.inject \
-	plexus/cli \
+    org.eclipse.sisu.plexus \
-	plexus-containers/plexus-component-annotations \
+    plexus-classworlds \
-	plexus-containers/plexus-container-default \
+    plexus/cli \
-	plexus-i18n/plexus-i18n \
+    plexus-containers/plexus-component-annotations \
-	plexus/interpolation \
+    plexus-i18n/plexus-i18n \
-	plexus-metadata-generator \
+    plexus/interpolation \
-	plexus/utils \
+    plexus-metadata-generator \
-	plexus-velocity/plexus-velocity \
+    plexus/utils \
-	qdox \
+    plexus-velocity/plexus-velocity \
-	velocity \
+    qdox \
-	xbean/xbean-reflect
+    velocity \
+    xbean/xbean-reflect
 # tests can't run because of missing deps
 %{ant} -Dtest.skip=true package javadoc