Skip to content

Commit

Permalink
Update felix-utils to version 1.11.4 / rev 4 via SR 1120328
Browse files Browse the repository at this point in the history
https://build.opensuse.org/request/show/1120328
by user fstrba + anag+factory
source/target 8 == fix build with jdk 21
  • Loading branch information
fstrba authored and bmwiedemann committed Oct 26, 2023
1 parent 06363e8 commit 161710c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 9 deletions.
Binary file modified packages/f/felix-utils/.files
Binary file not shown.
8 changes: 8 additions & 0 deletions packages/f/felix-utils/.rev
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,12 @@
<comment>1.11.4</comment>
<requestid>790524</requestid>
</revision>
<revision rev="4" vrev="2">
<srcmd5>b1f5a7a126d04952f5eb801823760667</srcmd5>
<version>1.11.4</version>
<time>1698333287</time>
<user>anag+factory</user>
<comment>source/target 8 == fix build with jdk 21</comment>
<requestid>1120328</requestid>
</revision>
</revisionlist>
4 changes: 3 additions & 1 deletion packages/f/felix-utils/felix-utils-build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
<property name="test.reports" value="${build.dir}/test-reports"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>

<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}"/>

<!-- ====================================================================== -->
Expand Down Expand Up @@ -65,6 +66,7 @@
debug="true"
optimize="false"
deprecation="true"
release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
Expand Down
5 changes: 5 additions & 0 deletions packages/f/felix-utils/felix-utils.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 25 15:11:28 UTC 2023 - Fridrich Strba <[email protected]>

- Build with source and target levels 8

-------------------------------------------------------------------
Tue Mar 31 06:19:36 UTC 2020 - Fridrich Strba <[email protected]>

Expand Down
12 changes: 4 additions & 8 deletions packages/f/felix-utils/felix-utils.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# spec file for package felix-utils
#
# Copyright (c) 2020 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
Expand Down Expand Up @@ -30,7 +30,8 @@ Source1: %{name}-build.xml
Patch0: 0000-Port-to-osgi-cmpn.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
BuildRequires: osgi-compendium
BuildRequires: osgi-core
BuildArch: noarch
Expand Down Expand Up @@ -60,11 +61,6 @@ build-jar-repository -s lib osgi-core osgi-compendium
build-jar-repository -s lib junit hamcrest/core mockito
%endif

%pom_remove_plugin :apache-rat-plugin

%pom_remove_parent .
%pom_xpath_inject "pom:project" "<groupId>org.apache.felix</groupId>" .

%build
%{ant} \
%if %{without tests}
Expand All @@ -78,7 +74,7 @@ install -dm 0755 %{buildroot}%{_javadir}/felix
install -pm 0644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/felix/%{bundle}.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/felix
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom
%add_maven_depmap felix/%{bundle}.pom felix/%{bundle}.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
Expand Down

0 comments on commit 161710c

Please sign in to comment.