From 8c19e0f8a18c3fbac1525bdbf30983b30b7925fb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 17 Apr 2019 15:19:55 +0200 Subject: [PATCH 1/6] Add alias for org.osgi:org.osgi.core --- osgi-core.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/osgi-core.spec b/osgi-core.spec index f06ba2d..eea33b4 100644 --- a/osgi-core.spec +++ b/osgi-core.spec @@ -1,6 +1,6 @@ Name: osgi-core Version: 7.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OSGi Core API License: ASL 2.0 URL: https://www.osgi.org @@ -56,6 +56,8 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml . %pom_add_dep org.osgi:osgi.annotation::provided +%mvn_alias : org.osgi:org.osgi.core + %build %mvn_build @@ -71,6 +73,9 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml . %license LICENSE %changelog +* Wed Apr 17 2019 Mikolaj Izdebski - 7.0.0-2 +- Add alias for org.osgi:org.osgi.core + * Wed Mar 06 2019 Mat Booth - 7.0.0-1 - Update to OSGi R7 From 07bcebe5fd85554b3da2e53015064107b97d7933 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:26 +0200 Subject: [PATCH 2/6] Mass rebuild for javapackages-tools 201901 --- osgi-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/osgi-core.spec b/osgi-core.spec index eea33b4..3bcbfbb 100644 --- a/osgi-core.spec +++ b/osgi-core.spec @@ -1,6 +1,6 @@ Name: osgi-core Version: 7.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OSGi Core API License: ASL 2.0 URL: https://www.osgi.org @@ -73,6 +73,9 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml . %license LICENSE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 7.0.0-3 +- Mass rebuild for javapackages-tools 201901 + * Wed Apr 17 2019 Mikolaj Izdebski - 7.0.0-2 - Add alias for org.osgi:org.osgi.core From 186050f4eec1f5c07c92212d227bdcec9f0986c9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 3/6] Mass rebuild for javapackages-tools 201902 --- osgi-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/osgi-core.spec b/osgi-core.spec index 3bcbfbb..12c909c 100644 --- a/osgi-core.spec +++ b/osgi-core.spec @@ -1,6 +1,6 @@ Name: osgi-core Version: 7.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OSGi Core API License: ASL 2.0 URL: https://www.osgi.org @@ -73,6 +73,9 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml . %license LICENSE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 7.0.0-4 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 7.0.0-3 - Mass rebuild for javapackages-tools 201901 From 1cbd2ed481e11bf7762282beaba78b970aa374d5 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 15 Jan 2021 12:50:07 +0100 Subject: [PATCH 4/6] Update to upstream version 8.0.0 --- .gitignore | 1 + osgi-core.spec | 15 ++++++++++----- osgi.core-6.0.0.pom | 34 ---------------------------------- sources | 2 +- 4 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 osgi.core-6.0.0.pom diff --git a/.gitignore b/.gitignore index a56a7c9..d9bb731 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /osgi.core-6.0.0-sources.jar /osgi.core-7.0.0.jar +/osgi.core-8.0.0.jar diff --git a/osgi-core.spec b/osgi-core.spec index 12c909c..1121125 100644 --- a/osgi-core.spec +++ b/osgi-core.spec @@ -1,12 +1,14 @@ Name: osgi-core -Version: 7.0.0 -Release: 4%{?dist} +Version: 8.0.0 +Release: 1%{?dist} Summary: OSGi Core API + License: ASL 2.0 URL: https://www.osgi.org -BuildArch: noarch -Source0: https://osgi.org/download/r7/osgi.core-%{version}.jar +Source0: https://docs.osgi.org/download/r8/osgi.core-%{version}.jar + +BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -59,7 +61,7 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml . %mvn_alias : org.osgi:org.osgi.core %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -73,6 +75,9 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml . %license LICENSE %changelog +* Fri Jan 15 2021 Marian Koncek - 8.0.0-1 +- Update to upstream version 8.0.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 7.0.0-4 - Mass rebuild for javapackages-tools 201902 diff --git a/osgi.core-6.0.0.pom b/osgi.core-6.0.0.pom deleted file mode 100644 index 00e405b..0000000 --- a/osgi.core-6.0.0.pom +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - org.osgi - osgi.core - 6.0.0 - OSGi Core Release 6, Interfaces and Classes for use in compiling bundles. - org.osgi:osgi.core - http://www.osgi.org/ - - OSGi Alliance - http://www.osgi.org/ - - - - Apache License, Version 2.0 - http://opensource.org/licenses/apache2.0.php - repo - - - - https://www.osgi.org/members/git/build.git - scm:git:https://www.osgi.org/members/git/build.git - scm:git:https://www.osgi.org/members/git/build.git - - - - osgi - info@osgi.org - OSGi Alliance - OSGi Alliance - - - diff --git a/sources b/sources index 21cb30f..41dbaab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osgi.core-7.0.0.jar) = 60c5e59fc1d33bcb63a0be1151af04321bf9c6c08faa910cf1a29f74b9b58d43edc2d528182edd0884d2bd44403840d8d50b6c012411892391fe28c0a2102ffb +SHA512 (osgi.core-8.0.0.jar) = 0161f91ecb8ad102731c71ce73f96b99174b5bce2f216770226860cff8a3fcd12abec828399077a835b6765ed9bf9ec29be618de8d2a85b40d6250c00bab4404 From 2acfa2397b69377fc84c05743a09b72518244995 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 5/6] Conditionalize buildrequires in bootstrap mode --- osgi-core.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/osgi-core.spec b/osgi-core.spec index 1121125..4e34ca7 100644 --- a/osgi-core.spec +++ b/osgi-core.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: osgi-core Version: 8.0.0 Release: 1%{?dist} @@ -11,8 +13,12 @@ Source0: https://docs.osgi.org/download/r8/osgi.core-%{version}.jar BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.osgi:osgi.annotation) +%endif %description OSGi Core, Interfaces and Classes for use in compiling bundles. From 1e20715325e4039f2611a6d7df520f28939ce56a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 6/6] Turn off bootstrap mode by default --- osgi-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osgi-core.spec b/osgi-core.spec index 4e34ca7..3b889b7 100644 --- a/osgi-core.spec +++ b/osgi-core.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: osgi-core Version: 8.0.0