From 281ab62e63d5b0c96a7e55cd0b99a6ba74d78eedd7c125a0be9e41280f097b3e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Sep 2023 08:00:03 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-osgi?expand=0&rev=11 --- _service | 14 ++++++++++++++ maven-osgi-0.2.0.tar.xz | 3 --- maven-osgi-0.3.0.tar.xz | 3 +++ maven-osgi.spec | 16 ++++++---------- 4 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 _service delete mode 100644 maven-osgi-0.2.0.tar.xz create mode 100644 maven-osgi-0.3.0.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..d3af1e0 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/apache/maven-osgi.git + 4e53e51ec6634c07a9bb588a47bc8ba267151241 + 0.3.0 + **/*.jar + + + *.tar + xz + + + diff --git a/maven-osgi-0.2.0.tar.xz b/maven-osgi-0.2.0.tar.xz deleted file mode 100644 index ab7cc67..0000000 --- a/maven-osgi-0.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de8dabf4663d9f801e87632a2d7cd82a954fe6f59931aab42d8ef9177969b7b7 -size 5848 diff --git a/maven-osgi-0.3.0.tar.xz b/maven-osgi-0.3.0.tar.xz new file mode 100644 index 0000000..1c4bef4 --- /dev/null +++ b/maven-osgi-0.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8808c3801777f7bc116411e0856c4cca99e5f6dfcf507d1809b663f1c4e9ba9 +size 7268 diff --git a/maven-osgi.spec b/maven-osgi.spec index 32b7323..0ea0c6b 100644 --- a/maven-osgi.spec +++ b/maven-osgi.spec @@ -1,7 +1,7 @@ # # spec file for package maven-osgi # -# 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 @@ -17,15 +17,12 @@ Name: maven-osgi -Version: 0.2.0 +Version: 0.3.0 Release: 0 Summary: Library for Maven-OSGi integration License: Apache-2.0 Group: Development/Libraries/Java URL: https://maven.apache.org/shared/maven-osgi -# svn export http://svn.apache.org/repos/asf/maven/shared/tags/maven-osgi-0.2.0 maven-osgi-0.2.0 -# find -name *.jar -delete -# tar caf maven-osgi-0.2.0.tar.xz maven-osgi-0.2.0/ Source0: %{name}-%{version}.tar.xz # ASL mandates that the licence file be included in redistributed source Source1: http://www.apache.org/licenses/LICENSE-2.0.txt @@ -35,7 +32,7 @@ BuildRequires: maven-local BuildRequires: xz BuildRequires: mvn(biz.aQute:bndlib) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) -BuildRequires: mvn(org.apache.maven:maven-project) +BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildArch: noarch @@ -55,11 +52,10 @@ API documentation for %{name}. %setup -q cp -p %{SOURCE1} LICENSE -sed -i 's/import aQute\.lib\.osgi/import aQute.bnd.osgi/g' src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java +%pom_change_dep :maven-project :maven-core:3.9.3:provided +%pom_xpath_set pom:project/pom:version %{version} -# Replace plexus-maven-plugin with plexus-component-metadata -%pom_xpath_set "pom:plugin[pom:artifactId[text()='plexus-maven-plugin']]//pom:goal[text()='descriptor']" generate-metadata -%pom_xpath_set "pom:artifactId[text()='plexus-maven-plugin']" plexus-component-metadata +sed -i 's/import aQute\.lib\.osgi/import aQute.bnd.osgi/g' src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java %build %{mvn_build} -f -- \