!15 Remove redundant depenedencies

From: @lyn1001 Reviewed-by: @wangchong1995924 Signed-off-by: @wangchong1995924
Remove redundant depenedencies
2024-03-18 06:23:30 +00:00 · 2024-03-18 11:28:08 +08:00 · 2023-05-04 08:39:15 +00:00 · 2023-05-04 15:59:53 +08:00 · 2021-03-22 15:01:52 +08:00 · 2021-03-22 14:26:50 +08:00
5 changed files with 404 additions and 194 deletions
--- a/0003-Port-to-OSGI-7.0.0.patch
+++ b/0003-Port-to-OSGI-7.0.0.patch
@ -0,0 +1,117 @@
+From e9469ae2ca9f3d64fd88e0d8aaf8ebeea7bb937d Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Fri, 12 Apr 2019 14:59:30 +0200
+Subject: [PATCH] Port to OSGI 7.0.0
+
+---
+ .../src/aQute/bnd/main/ReporterLogger.java    | 16 +++++++++
+ .../src/aQute/bnd/testing/TestingLog.java     | 35 +++++++++++++++++++
+ 2 files changed, 51 insertions(+)
+
+diff --git a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java
+index ce86cd6..735db9c 100644
+--- a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java
+++ b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java
+@@ -1,5 +1,6 @@
+ package aQute.bnd.main;
+ 
+import org.osgi.framework.Bundle;
+ import org.osgi.framework.ServiceReference;
+ import org.osgi.service.log.LogService;
+ import org.slf4j.Logger;
+@@ -8,6 +9,7 @@ import org.slf4j.LoggerFactory;
+ import aQute.service.reporter.Reporter;
+ 
+ public class ReporterLogger implements LogService {
+	private final static RuntimeException UNSUPPORTED = new UnsupportedOperationException("This method is provided for backwards compatibility");
+ 	private final static Logger	logger	= LoggerFactory.getLogger(ReporterLogger.class);
+ 
+ 	private Reporter	reporter;
+@@ -108,4 +110,18 @@ public class ReporterLogger implements LogService {
+ 		}
+ 	}
+ 
+	@Override
+	public org.osgi.service.log.Logger getLogger(String name) {throw UNSUPPORTED;}
+
+	@Override
+	public org.osgi.service.log.Logger getLogger(Class< ? > clazz) {throw UNSUPPORTED;}
+
+	@Override
+	public <L extends org.osgi.service.log.Logger> L getLogger(String name, Class<L> loggerType) {throw UNSUPPORTED;}
+
+	@Override
+	public <L extends org.osgi.service.log.Logger> L getLogger(Class< ? > clazz, Class<L> loggerType) {throw UNSUPPORTED;}
+
+	@Override
+	public <L extends org.osgi.service.log.Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {throw UNSUPPORTED;}
+ }
+diff --git a/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java b/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java
+index d9c3e78..ec7dd27 100644
+--- a/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java
+@@ -8,7 +8,9 @@ import java.util.regex.Pattern;
+ 
+ import org.osgi.framework.Bundle;
+ import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.Logger;
+ import org.osgi.service.log.LogEntry;
+import org.osgi.service.log.LogLevel;
+ import org.osgi.service.log.LogService;
+ 
+ import aQute.bnd.annotation.component.Activate;
+@@ -26,6 +28,8 @@ import aQute.bnd.testing.TestingLog.Config;
+ @Component(designate = Config.class)
+ @SuppressWarnings("rawtypes")
+ public class TestingLog implements LogService {
+	private final static RuntimeException UNSUPPORTED = new UnsupportedOperationException("This method is provided for backwards compatibility");
+
+ 	boolean			stacktrace;
+ 	boolean			direct;
+ 	int				level;
+@@ -125,6 +129,22 @@ public class TestingLog implements LogService {
+ 					return sb.toString();
+ 				}
+ 			}
+
+			@Override
+			public LogLevel getLogLevel() {throw UNSUPPORTED;}
+
+			@Override
+			public String getLoggerName() {throw UNSUPPORTED;}
+
+			@Override
+			public long getSequence() {throw UNSUPPORTED;}
+
+			@Override
+			public String getThreadInfo() {throw UNSUPPORTED;}
+
+			@Override
+			public StackTraceElement getLocation() {throw UNSUPPORTED;}
+
+ 		};
+ 		entries.add(entry);
+ 		if (direct)
+@@ -197,4 +217,19 @@ public class TestingLog implements LogService {
+ 		return n != 0;
+ 	}
+ 
+	@Override
+	public Logger getLogger(String name) {throw UNSUPPORTED;}
+
+	@Override
+	public Logger getLogger(Class< ? > clazz) {throw UNSUPPORTED;}
+
+	@Override
+	public <L extends Logger> L getLogger(String name, Class<L> loggerType) {throw UNSUPPORTED;}
+
+	@Override
+	public <L extends Logger> L getLogger(Class< ? > clazz, Class<L> loggerType) {throw UNSUPPORTED;}
+
+	@Override
+	public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {throw UNSUPPORTED;}
+
+ }
+-- 
+2.20.1
+
--- a/3.5.0.REL.tar.gz
+++ b/3.5.0.REL.tar.gz
--- a/add-maven-dependency-plugin.patch
+++ b/add-maven-dependency-plugin.patch
@ -0,0 +1,59 @@
+From 542f23cebfdd45b566fa12d7e2b5dd925e2745a1 Mon Sep 17 00:00:00 2001
+From: wang--ge <wang__ge@126.com>
+Date: Thu, 4 May 2023 11:35:33 +0800
+Subject: [PATCH] add maven dependency plugin
+
+---
+ pom.xml | 37 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 37 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index fd5d704..9cf59d8 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -1,5 +1,42 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <build>
+    <plugins>
+      <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                  <execution>
+                    <phase>prepare-package</phase>
+                    <goals>
+                      <goal>copy</goal>
+	            </goals>
+                    <configuration>
+                      <artifactItems>
+                        <artifactItem>
+                          <groupId>biz.aQute.bnd</groupId>
+                          <artifactId>biz.aQute.repository</artifactId>
+                          <version>3.5.0</version>
+                          <overWrite>false</overWrite>
+                          <outputDirectory>${project.build.directory}</outputDirectory>
+                          <destFileName></destFileName>
+                        </artifactItem>
+                        <artifactItem>
+                          <groupId>biz.aQute.bnd</groupId>
+                          <artifactId>biz.aQute.bnd.embedded-repo</artifactId>
+                          <version>4.3.0</version>
+                          <overWrite>false</overWrite>
+			  <outputDirectory>${project.build.directory}</outputDirectory>
+                          <destFileName></destFileName>
+			</artifactItem>
+                      </artifactItems>
+                    </configuration>
+                  </execution>
+                </executions>
+      </plugin>
+    </plugins>
+  </build>
+   <!-- section added by maintainer -->
+   <dependencies>
+     <!-- begin of code added by maintainer -->
+-- 
+2.33.0
+
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@ -1,23 +1,28 @@
 Name:           aqute-bnd
 Version:        3.5.0
-Release:        6
+Release:        11
 Summary:        BND Tool
 License:        ASL 2.0
-URL:            http://bnd.bndtools.org/
-Source0:        %{version}.REL.tar.gz
-Source1:        parent.pom
+URL:            https://github.com/bndtools/bnd/
+Source0:        https://github.com/bndtools/bnd/archive/refs/tags/%{version}.REL.tar.gz
+Source1:        https://repo1.maven.org/maven2/biz/aQute/bnd/parent/2.4.0/parent-2.4.0.pom#/parent.pom
 Source2:        https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom
 Source3:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom
 Source4:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{version}/biz.aQute.bndlib-%{version}.pom
 Source5:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/%{version}/biz.aQute.bnd.annotation-%{version}.pom
+Source6:        add-maven-dependency-plugin.patch
 Patch0001:      0001-Disable-removed-commands.patch
 Patch0002:      0002-Fix-ant-compatibility.patch
+Patch0003:      0003-Port-to-OSGI-7.0.0.patch
 BuildRequires:  maven-local mvn(org.osgi:osgi.annotation) mvn(org.osgi:osgi.cmpn) mvn(org.osgi:osgi.core)
 BuildRequires:  mvn(org.slf4j:slf4j-api) mvn(org.slf4j:slf4j-simple) mvn(org.apache.ant:ant) mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven:maven-artifact) mvn(org.apache.maven:maven-compat) mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api) mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin) mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.eclipse.aether:aether-api) mvn(org.sonatype.plexus:plexus-build-api)
+BuildRequires:  java-1.8.0-openjdk-devel maven 
+BuildRequires:  maven-dependency-plugin
+Requires:       java-1.8.0-openjdk
 Requires:       javapackages-tools
 Provides:       aqute-bndlib = %{version}-%{release} bnd-maven-plugin = %{version}-%{release}
 Obsoletes:      aqute-bndlib < %{version}-%{release} bnd-maven-plugin < %{version}-%{release}
@ -41,13 +46,51 @@ Documentation for aqute-bnd api.
 %autosetup -n bnd-%{version}.REL -p1
 rm gradlew*
 rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java
-sed 's/@VERSION@/%{version}/' %SOURCE1 > pom.xml
+cp %{SOURCE1} .
+sed -i 's/2.4.0/@VERSION@/' parent.pom
+sed -i '$d' parent.pom
+echo "    <modules>
+        <module>aQute.libg</module>
+        <module>biz.aQute.bndlib</module>
+        <module>biz.aQute.bnd</module>
+        <module>biz.aQute.bnd.annotation</module>
+        <module>maven</module>
+    </modules>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                    <exclude>**/packageinfo</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>" >> parent.pom
+sed 's/@VERSION@/%{version}/' parent.pom > pom.xml
 sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info
 cd aQute.libg
 cp -p %{SOURCE2} pom.xml
+cp -p %{SOURCE6} add-maven-dependency-plugin.patch
 %pom_add_parent biz.aQute.bnd:parent:%{version}
-%pom_add_dep org.osgi:osgi.cmpn
-%pom_add_dep org.slf4j:slf4j-api
+%pom_add_dep org.osgi:osgi.cmpn:7.0.0
+%pom_add_dep org.slf4j:slf4j-api:1.7.25
+patch -p1 < add-maven-dependency-plugin.patch
 cd -
 cd biz.aQute.bnd.annotation
 cp -p %{SOURCE5} pom.xml
@ -99,12 +142,18 @@ cd -
 %mvn_package biz.aQute.bnd:parent __noinstall
 %mvn_package biz.aQute.bnd:bnd-plugin-parent __noinstall
 %build
+cd aQute.libg
+mvn package -DskipTests -Pdist -Dtar
+cd - 
 %mvn_build -- -Dproject.build.sourceEncoding=UTF-8
+
 %install
 %mvn_install
 install -d -m 755 %{buildroot}%{_sysconfdir}/ant.d
 echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium" >%{buildroot}%{_sysconfdir}/ant.d/aqute-bnd
 %jpackage_script aQute.bnd.main.bnd "" "" aqute-bnd:slf4j/slf4j-api:slf4j/slf4j-simple:osgi-annotation:osgi-core:osgi-compendium bnd 1
+cp -arf aQute.libg/target/biz.aQute.bnd.embedded-repo-4.3.0.jar %{buildroot}%{_javadir}/%{name}/
+cp -arf aQute.libg/target/biz.aQute.repository-3.5.0.jar %{buildroot}%{_javadir}/%{name}/

 %files -f .mfiles
 %files -f .mfiles-bndlib
@ -112,9 +161,26 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %doc LICENSE
 %{_bindir}/bnd
 %config(noreplace) %{_sysconfdir}/ant.d/*
+%{_javadir}/%{name}/biz.aQute.bnd.embedded-repo-4.3.0.jar
+%{_javadir}/%{name}/biz.aQute.repository-3.5.0.jar

 %files help -f .mfiles-javadoc

 %changelog
+* Mon Mar 18 2024 liyanan <liyanan61@h-partners.com> - 3.5.0-11
+- Remove redundant depenedencies
+
+* Thu May 04 2023 Ge Wang <wang__ge@126.com> - 3.5.0-10
+- fix bnd compile failure 
+
+* Mon Mar 22 2021 lingsheng <lingsheng@huawei.com> - 3.5.0-9
+- Do not edit source directly before packaging
+
+* Wed Dec 23 2020 Ge Wang <wangge20@huawei.com> - 3.5.0-8
+- Modify homepage url and source url
+
+* Sat Sep 12 2020 yanan li <liyanan032@huawei.com> - 3.5.0-7
+- fix build fail
+
 * Fri Feb 14 likexin <likexin4@huawei.com> - 3.5.0-6
 - Package init
--- a/parent.pom
+++ b/parent.pom
@ -5,7 +5,7 @@

  <groupId>biz.aQute.bnd</groupId>
  <artifactId>parent</artifactId>
-    <version>@VERSION@</version>
+  <version>2.4.0</version>

  <packaging>pom</packaging>

@ -163,36 +163,4 @@
    <developerConnection>scm:git:ssh://github.com/bndtools/bnd.git</developerConnection>
  </scm>

-    <modules>
-        <module>aQute.libg</module>
-        <module>biz.aQute.bndlib</module>
-        <module>biz.aQute.bnd</module>
-        <module>biz.aQute.bnd.annotation</module>
-        <module>maven</module>
-    </modules>
-
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>src/</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                    <exclude>**/packageinfo</exclude>
-                </excludes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
Author	SHA1	Message	Date
openeuler-ci-bot	4d59c53e62	!15 Remove redundant depenedencies From: @lyn1001 Reviewed-by: @wangchong1995924 Signed-off-by: @wangchong1995924	2024-03-18 06:23:30 +00:00
lyn1001	e3afc0ce7d	Remove redundant depenedencies	2024-03-18 11:28:08 +08:00
openeuler-ci-bot	a8040450d2	!11 fix bnd compile failure From: @wang--ge Reviewed-by: @cherry530 Signed-off-by: @cherry530	2023-05-04 08:39:15 +00:00
wang--ge	7931483b8e	fix bnd compile failure	2023-05-04 15:59:53 +08:00
openeuler-ci-bot	1424498b0b	!5 Do not edit source directly before packaging From: @ultra_planet Reviewed-by: @maminjie,@wangchong1995924 Signed-off-by: @wangchong1995924	2021-03-22 15:01:52 +08:00
lingsheng	ce42bd07df	Do not edit source directly before packaging	2021-03-22 14:26:50 +08:00
openeuler-ci-bot	ca16416d77	!4 Modify source url From: @wang--ge Reviewed-by: @hht8,@wangchong1995924 Signed-off-by: @wangchong1995924	2020-12-24 17:46:43 +08:00
wang--ge	0c06743222	modify source url	2020-12-24 17:38:26 +08:00
openeuler-ci-bot	78be4f4942	!3 Fix build fail From: @lyn1001 Reviewed-by: @rita_dong Signed-off-by: @rita_dong	2020-09-12 17:34:42 +08:00
lyn1001	b9c08995ef	fix build fail	2020-09-12 15:04:18 +08:00