Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plexus-cipher for openSUSE:Factory
checked in at 2023-10-26 17:13:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plexus-cipher (Old)
and /work/SRC/openSUSE:Factory/.plexus-cipher.new.24901 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-cipher"
Thu Oct 26 17:13:30 2023 rev:4 rq:1120329 version:2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/plexus-cipher/plexus-cipher.changes
2022-05-25 20:35:36.964315877 +0200
+++ /work/SRC/openSUSE:Factory/.plexus-cipher.new.24901/plexus-cipher.changes
2023-10-26 17:14:16.815963187 +0200
@@ -1,0 +2,5 @@
+Wed Oct 25 15:16:02 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Build with source and target levels 8
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plexus-cipher.spec ++++++
--- /var/tmp/diff_new_pack.lkiWy2/_old 2023-10-26 17:14:17.267979788 +0200
+++ /var/tmp/diff_new_pack.lkiWy2/_new 2023-10-26 17:14:17.267979788 +0200
@@ -1,7 +1,7 @@
#
# spec file for package plexus-cipher
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,11 +28,9 @@
BuildRequires: ant
BuildRequires: atinject
BuildRequires: fdupes
-BuildRequires: java-devel >= 1.7
-BuildRequires: javapackages-local
+BuildRequires: java-devel >= 1.8
+BuildRequires: javapackages-local >= 6
BuildRequires: sisu-inject
-BuildRequires: xmvn-install
-BuildRequires: xmvn-resolve
BuildArch: noarch
%description
@@ -52,29 +50,30 @@
# replace %{version}-SNAPSHOT with %{version}
%pom_xpath_set pom:project/pom:version %{version}
-%pom_remove_parent .
-%pom_xpath_inject pom:project "<groupId>org.codehaus.plexus</groupId>"
-%pom_change_dep -r -f ::::: :::::
-
-%mvn_file : plexus/%{name}
-
%build
mkdir -p lib
build-jar-repository -s lib atinject org.eclipse.sisu.inject
-%ant compile
-%ant jar javadoc
-
-%mvn_artifact pom.xml target/%{name}-%{version}.jar
-%mvn_alias :{*} org.sonatype.plexus:@1
+%{ant} compile
+%{ant} jar javadoc
%install
-%mvn_install
+# jar
+install -dm 0755 %{buildroot}%{_javadir}/plexus
+install -pm 0644 target/%{name}-%{version}.jar
%{buildroot}%{_javadir}/plexus/%{name}.jar
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/%{name}.pom
+%add_maven_depmap plexus/%{name}.pom plexus/%{name}.jar -a
org.sonatype.plexus:%{name}
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles
%license LICENSE.txt NOTICE.txt
-%files javadoc -f .mfiles-javadoc
+%files javadoc
+%{_javadocdir}/%{name}
%license LICENSE.txt NOTICE.txt
++++++ plexus-cipher-build.xml ++++++
--- /var/tmp/diff_new_pack.lkiWy2/_old 2023-10-26 17:14:17.303981110 +0200
+++ /var/tmp/diff_new_pack.lkiWy2/_new 2023-10-26 17:14:17.307981257 +0200
@@ -15,7 +15,8 @@
<property name="project.url"
value="https://github.com/codehaus-plexus/plexus-cipher"/>
<property name="project.organization.name" value="Sonatype, Inc."/>
- <property name="compiler.source" value="1.7"/>
+ <property name="compiler.release" value="8"/>
+ <property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName"
value="${project.artifactId}-${project.version}"/>
@@ -53,6 +54,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
