OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=39

maven-plugin-plugin-bootstrap.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Sep  3 11:06:31 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Download sources from https://repo1.maven.org
+
 -------------------------------------------------------------------
 Mon Jul 24 21:05:56 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

maven-plugin-plugin-bootstrap.spec

@@ -24,8 +24,8 @@ Release:        0
 Summary:        Maven Plugin Plugin
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/plugin-tools/
+URL:            https://maven.apache.org/plugin-tools/
-Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
 Source1:        %{base_name}-build.tar.xz
 Patch0:         0001-Avoid-duplicate-MOJO-parameters.patch
 Patch1:         0002-Deal-with-nulls-from-getComment.patch
@@ -120,12 +120,12 @@ build-jar-repository -s lib \
 
 %{mvn_file} :%{artifactId} %{base_name}/%{artifactId}
 pushd %{artifactId}
-%ant \
+%{ant} \
 	-Dtest.skip=true \
 	jar
 popd
-%mvn_artifact pom.xml
+%{mvn_artifact} pom.xml
-%mvn_artifact %{artifactId}/pom.xml %{artifactId}/target/%{artifactId}-%{version}.jar
+%{mvn_artifact} %{artifactId}/pom.xml %{artifactId}/target/%{artifactId}-%{version}.jar
 
 %install
 %mvn_install

maven-plugin-plugin.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Sep  3 11:06:31 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Download sources from https://repo1.maven.org
+
 -------------------------------------------------------------------
 Mon Jul 24 21:05:56 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

maven-plugin-plugin.spec

@@ -23,8 +23,8 @@ Release:        0
 Summary:        Maven Plugin Plugin
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/plugin-tools/
+URL:            https://maven.apache.org/plugin-tools/
-Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
 Patch0:         0001-Avoid-duplicate-MOJO-parameters.patch
 Patch1:         0002-Deal-with-nulls-from-getComment.patch
 Patch2:         0003-Port-to-plexus-utils-3.0.24.patch

maven-plugin-tools.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Sep  3 11:06:31 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Download sources from https://repo1.maven.org
+
 -------------------------------------------------------------------
 Sun Sep  3 05:52:11 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

maven-plugin-tools.spec

@@ -22,8 +22,8 @@ Release:        0
 Summary:        Maven Plugin Tools
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/plugin-tools/
+URL:            https://maven.apache.org/plugin-tools/
-Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Source1:        %{name}-build.tar.xz
 Patch0:         0001-Avoid-duplicate-MOJO-parameters.patch
 Patch1:         0002-Deal-with-nulls-from-getComment.patch
@@ -59,9 +59,6 @@ BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 BuildRequires:  velocity
 BuildRequires:  xbean
-BuildRequires:  xmvn-install
-BuildRequires:  xmvn-resolve
-BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildArch:      noarch
 
 %description
@@ -172,10 +169,6 @@ API documentation for %{name}.
 
 %pom_remove_dep net.sf.jtidy:jtidy maven-plugin-tools-generators
 
-%{mvn_package} :maven-plugin-tools __noinstall
-%{mvn_package} :maven-script __noinstall
-%{mvn_package} :{*} @1
-
 %build
 mkdir -p lib
 build-jar-repository -s lib \
@@ -215,19 +208,21 @@ build-jar-repository -s lib \
 	-Dtest.skip=true \
 	package javadoc
 
-%mvn_artifact pom.xml
+%install
-%mvn_artifact maven-script/pom.xml
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
-
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-mkdir -p target/site/apidocs
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 for i in \
 	maven-plugin-annotations \
 	maven-plugin-tools-annotations \
 	maven-plugin-tools-api \
 	maven-plugin-tools-generators \
 	maven-plugin-tools-java; do
-  %{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar
+  install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
+  %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
   if [ -d ${i}/target/site/apidocs ]; then
-    cp -r ${i}/target/site/apidocs target/site/apidocs/${i}
+    cp -r ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
   fi
 done
 for i in \
@@ -236,14 +231,13 @@ for i in \
 	maven-plugin-tools-model \
 	maven-script-ant \
 	maven-script-beanshell; do
-  %{mvn_artifact} maven-script/${i}/pom.xml maven-script/${i}/target/${i}-%{version}.jar
+  install -pm 0644 maven-script/${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
+  %{mvn_install_pom} maven-script/${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
   if [ -d maven-script/${i}/target/site/apidocs ]; then
-    cp -r maven-script/${i}/target/site/apidocs target/site/apidocs/${i}
+    cp -r maven-script/${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
   fi
 done
-
-%install
-%mvn_install
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files -n maven-plugin-annotations -f .mfiles-maven-plugin-annotations
@@ -271,7 +265,8 @@ done
 %files -n maven-script-beanshell -f .mfiles-maven-script-beanshell
 %license LICENSE NOTICE
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc
+%{_javadocdir}/%{name}
 %license LICENSE NOTICE
 
 %changelog