Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-plugin-tools for
openSUSE:Factory checked in at 2023-09-04 22:52:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-plugin-tools (Old)
and /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-plugin-tools"
Mon Sep 4 22:52:41 2023 rev:9 rq:1108705 version:3.6.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-plugin-tools/maven-plugin-plugin-bootstrap.changes
2023-07-25 11:53:35.386326015 +0200
+++
/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1766/maven-plugin-plugin-bootstrap.changes
2023-09-04 22:52:56.566411321 +0200
@@ -1,0 +2,5 @@
+Sun Sep 3 11:06:31 UTC 2023 - Fridrich Strba <[email protected]>
+
+- Download sources from https://repo1.maven.org
+
+-------------------------------------------------------------------
maven-plugin-plugin.changes: same change
--- /work/SRC/openSUSE:Factory/maven-plugin-tools/maven-plugin-tools.changes
2023-07-25 11:53:35.430326273 +0200
+++
/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1766/maven-plugin-tools.changes
2023-09-04 22:52:56.602412592 +0200
@@ -1,0 +2,11 @@
+Sun Sep 3 11:06:31 UTC 2023 - Fridrich Strba <[email protected]>
+
+- Download sources from https://repo1.maven.org
+
+-------------------------------------------------------------------
+Sun Sep 3 05:52:11 UTC 2023 - Fridrich Strba <[email protected]>
+
+- Fix build with javapackages-local 6.2.0
+ * com.sun:tools is not resolved from system any more
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-plugin-plugin-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.lzwOvV/_old 2023-09-04 22:52:58.886493331 +0200
+++ /var/tmp/diff_new_pack.lzwOvV/_new 2023-09-04 22:52:58.934495028 +0200
@@ -24,8 +24,8 @@
Summary: Maven Plugin Plugin
License: Apache-2.0
Group: Development/Libraries/Java
-URL: http://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
+URL: https://maven.apache.org/plugin-tools/
+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 @@
%{mvn_file} :%{artifactId} %{base_name}/%{artifactId}
pushd %{artifactId}
-%ant \
+%{ant} \
-Dtest.skip=true \
jar
popd
-%mvn_artifact pom.xml
-%mvn_artifact %{artifactId}/pom.xml
%{artifactId}/target/%{artifactId}-%{version}.jar
+%{mvn_artifact} pom.xml
+%{mvn_artifact} %{artifactId}/pom.xml
%{artifactId}/target/%{artifactId}-%{version}.jar
%install
%mvn_install
++++++ maven-plugin-plugin.spec ++++++
--- /var/tmp/diff_new_pack.lzwOvV/_old 2023-09-04 22:52:59.194504218 +0200
+++ /var/tmp/diff_new_pack.lzwOvV/_new 2023-09-04 22:52:59.246506056 +0200
@@ -23,8 +23,8 @@
Summary: Maven Plugin Plugin
License: Apache-2.0
Group: Development/Libraries/Java
-URL: http://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
+URL: https://maven.apache.org/plugin-tools/
+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.spec ++++++
--- /var/tmp/diff_new_pack.lzwOvV/_old 2023-09-04 22:52:59.518515671 +0200
+++ /var/tmp/diff_new_pack.lzwOvV/_new 2023-09-04 22:52:59.562517227 +0200
@@ -22,8 +22,8 @@
Summary: Maven Plugin Tools
License: Apache-2.0
Group: Development/Libraries/Java
-URL: http://maven.apache.org/plugin-tools/
-Source0:
http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
+URL: https://maven.apache.org/plugin-tools/
+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
@@ -37,7 +37,7 @@
BuildRequires: google-guice
BuildRequires: guava
BuildRequires: java-devel >= 1.8
-BuildRequires: javapackages-local
+BuildRequires: javapackages-local >= 6
BuildRequires: jdom2
BuildRequires: junit
BuildRequires: maven-lib
@@ -59,9 +59,6 @@
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 @@
%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 \
@@ -211,25 +204,25 @@
velocity \
xbean/xbean-reflect
- ln -s $(xmvn-resolve com.sun:tools) lib/
-
%{ant} \
-Dtest.skip=true \
package javadoc
-%mvn_artifact pom.xml
-%mvn_artifact maven-script/pom.xml
-
-mkdir -p target/site/apidocs
+%install
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
+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 \
@@ -238,14 +231,13 @@
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
@@ -273,7 +265,8 @@
%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
