Compare commits
10 Commits
67344b9cb3
...
1e48a447a8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1e48a447a8 | ||
|
|
f2b91fef08 | ||
|
|
1424498b0b | ||
|
|
ce42bd07df | ||
|
|
ca16416d77 | ||
|
|
0c06743222 | ||
|
|
78be4f4942 | ||
|
|
b9c08995ef | ||
|
|
d76796bd3d | ||
|
|
8399dfc73a |
75
0001-Disable-removed-commands.patch
Normal file
75
0001-Disable-removed-commands.patch
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
From c250eb3ebbb9afb650edc080708c5e4c3cccbb78 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Simacek <msimacek@redhat.com>
|
||||||
|
Date: Tue, 4 Oct 2016 18:02:26 +0200
|
||||||
|
Subject: [PATCH 1/2] Disable removed commands
|
||||||
|
|
||||||
|
---
|
||||||
|
biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 45 -------------------------------
|
||||||
|
1 file changed, 45 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
|
||||||
|
index 1cc3216..c669e4a 100644
|
||||||
|
--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
|
||||||
|
+++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
|
||||||
|
@@ -105,7 +105,6 @@ import aQute.bnd.osgi.Processor;
|
||||||
|
import aQute.bnd.osgi.Resource;
|
||||||
|
import aQute.bnd.osgi.Verifier;
|
||||||
|
import aQute.bnd.osgi.eclipse.EclipseClasspath;
|
||||||
|
-import aQute.bnd.repository.maven.provider.NexusCommand;
|
||||||
|
import aQute.bnd.service.Actionable;
|
||||||
|
import aQute.bnd.service.RepositoryPlugin;
|
||||||
|
import aQute.bnd.service.action.Action;
|
||||||
|
@@ -4064,50 +4063,6 @@ public class bnd extends Processor {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
- * Resolve command
|
||||||
|
- *
|
||||||
|
- * @throws Exception
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
- public void _resolve(ResolveCommand.ResolveOptions options) throws Exception {
|
||||||
|
- ResolveCommand rc = new ResolveCommand(this);
|
||||||
|
- String help = options._command().subCmd(options, rc);
|
||||||
|
- if (help != null)
|
||||||
|
- out.println(help);
|
||||||
|
- getInfo(rc);
|
||||||
|
- rc.close();
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- /**
|
||||||
|
- * Remote command
|
||||||
|
- *
|
||||||
|
- * @throws Exception
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
- public void _remote(RemoteCommand.RemoteOptions options) throws Exception {
|
||||||
|
- RemoteCommand rc = new RemoteCommand(this, options);
|
||||||
|
- String help = options._command().subCmd(options, rc);
|
||||||
|
- if (help != null)
|
||||||
|
- out.println(help);
|
||||||
|
- getInfo(rc);
|
||||||
|
- rc.close();
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- /**
|
||||||
|
- * Nexus commands
|
||||||
|
- *
|
||||||
|
- * @throws Exception
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
- public void _nexus(NexusCommand.NexusOptions options) throws Exception {
|
||||||
|
- NexusCommand rc = new NexusCommand(this, options);
|
||||||
|
- String help = options._command().subCmd(options, rc);
|
||||||
|
- if (help != null)
|
||||||
|
- out.println(help);
|
||||||
|
- getInfo(rc);
|
||||||
|
- rc.close();
|
||||||
|
- }
|
||||||
|
- /**
|
||||||
|
* Export a bndrun file
|
||||||
|
*/
|
||||||
|
|
||||||
|
--
|
||||||
|
2.13.5
|
||||||
|
|
||||||
25
0002-Fix-ant-compatibility.patch
Normal file
25
0002-Fix-ant-compatibility.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From bb26bdfa9f742a6ae5d39e0312aeadb8e9b48940 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Simacek <msimacek@redhat.com>
|
||||||
|
Date: Tue, 12 Sep 2017 18:11:27 +0300
|
||||||
|
Subject: [PATCH 2/2] Fix ant compatibility
|
||||||
|
|
||||||
|
---
|
||||||
|
biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
|
||||||
|
index aac8b8a..26dfe59 100644
|
||||||
|
--- a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
|
||||||
|
+++ b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
|
||||||
|
@@ -220,7 +220,7 @@ public class BndTask extends BaseTask {
|
||||||
|
if (inherit) {
|
||||||
|
Properties projectProperties = new UTF8Properties();
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
- Hashtable<Object,Object> antProps = getProject().getProperties();
|
||||||
|
+ Hashtable<String,Object> antProps = getProject().getProperties();
|
||||||
|
projectProperties.putAll(antProps);
|
||||||
|
projectProperties.putAll(builder.getProperties());
|
||||||
|
builder.setProperties(projectProperties);
|
||||||
|
--
|
||||||
|
2.13.5
|
||||||
|
|
||||||
117
0003-Port-to-OSGI-7.0.0.patch
Normal file
117
0003-Port-to-OSGI-7.0.0.patch
Normal file
@ -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
|
||||||
|
|
||||||
BIN
3.5.0.REL.tar.gz
Normal file
BIN
3.5.0.REL.tar.gz
Normal file
Binary file not shown.
42
aQute.libg-3.5.0.pom
Normal file
42
aQute.libg-3.5.0.pom
Normal file
@ -0,0 +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">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<groupId>biz.aQute.bnd</groupId>
|
||||||
|
<artifactId>aQute.libg</artifactId>
|
||||||
|
<version>3.5.0</version>
|
||||||
|
<description>A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only.</description>
|
||||||
|
<name>aQute.libg</name>
|
||||||
|
<url>http://bnd.bndtools.org/</url>
|
||||||
|
<organization>
|
||||||
|
<name>Bndtools</name>
|
||||||
|
<url>http://bndtools.org/</url>
|
||||||
|
</organization>
|
||||||
|
<licenses>
|
||||||
|
<license>
|
||||||
|
<name>Apache-2.0</name>
|
||||||
|
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
|
||||||
|
<distribution>repo</distribution>
|
||||||
|
<comments>Apache License, Version 2.0</comments>
|
||||||
|
</license>
|
||||||
|
</licenses>
|
||||||
|
<scm>
|
||||||
|
<url>https://github.com/bndtools/bnd</url>
|
||||||
|
<connection>scm:git:https://github.com/bndtools/bnd.git</connection>
|
||||||
|
<developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
|
||||||
|
<tag>3.5.0.REL</tag>
|
||||||
|
</scm>
|
||||||
|
<developers>
|
||||||
|
<developer>
|
||||||
|
<id>pkriens</id>
|
||||||
|
<email>Peter.Kriens@aQute.biz</email>
|
||||||
|
<name>Peter Kriens</name>
|
||||||
|
<organization>Bndtools</organization>
|
||||||
|
<organizationUrl>https://github.com/bndtools</organizationUrl>
|
||||||
|
<roles>
|
||||||
|
<role>architect</role>
|
||||||
|
<role>developer</role>
|
||||||
|
</roles>
|
||||||
|
<timezone>1</timezone>
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
</project>
|
||||||
59
add-maven-dependency-plugin.patch
Normal file
59
add-maven-dependency-plugin.patch
Normal file
@ -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
|
||||||
|
|
||||||
186
aqute-bnd.spec
Normal file
186
aqute-bnd.spec
Normal file
@ -0,0 +1,186 @@
|
|||||||
|
Name: aqute-bnd
|
||||||
|
Version: 3.5.0
|
||||||
|
Release: 11
|
||||||
|
Summary: BND Tool
|
||||||
|
License: ASL 2.0
|
||||||
|
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}
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description
|
||||||
|
Bnd is the engine behind a number of popular software development tools that support OSGi.
|
||||||
|
It can be found in several maven plugins, ant, gradle, and of course Eclipse (bndtools).
|
||||||
|
It actively seeks other build tool vendors to use bnd to improve the quality of the generated
|
||||||
|
OSGi metadata.
|
||||||
|
|
||||||
|
%package help
|
||||||
|
Provides: aqute-bnd-javadoc = %{version}-%{release}
|
||||||
|
Obsoletes: aqute-bnd-javadoc < %{version}-%{release}
|
||||||
|
Summary: Documentation for aqute-bnd
|
||||||
|
|
||||||
|
%description help
|
||||||
|
Documentation for aqute-bnd api.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -n bnd-%{version}.REL -p1
|
||||||
|
rm gradlew*
|
||||||
|
rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java
|
||||||
|
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: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
|
||||||
|
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||||
|
cd -
|
||||||
|
cd biz.aQute.bndlib
|
||||||
|
cp -p %{SOURCE4} pom.xml
|
||||||
|
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||||
|
%pom_add_dep org.osgi:osgi.annotation
|
||||||
|
%pom_add_dep org.osgi:osgi.core
|
||||||
|
%pom_add_dep org.osgi:osgi.cmpn
|
||||||
|
%pom_add_dep org.slf4j:slf4j-api
|
||||||
|
%pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
|
||||||
|
%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
|
||||||
|
cd -
|
||||||
|
cd biz.aQute.bnd
|
||||||
|
cp -p %{SOURCE3} pom.xml
|
||||||
|
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||||
|
%pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version}
|
||||||
|
%pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
|
||||||
|
%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
|
||||||
|
%pom_add_dep org.apache.ant:ant
|
||||||
|
%pom_add_dep org.osgi:osgi.annotation
|
||||||
|
%pom_add_dep org.osgi:osgi.core
|
||||||
|
%pom_add_dep org.osgi:osgi.cmpn
|
||||||
|
%pom_add_dep org.slf4j:slf4j-api
|
||||||
|
%pom_add_dep org.slf4j:slf4j-simple::runtime
|
||||||
|
cd -
|
||||||
|
cd maven
|
||||||
|
rm bnd-shared-maven-lib/src/main/java/aQute/bnd/maven/lib/resolve/DependencyResolver.java
|
||||||
|
%pom_remove_dep -r :biz.aQute.resolve
|
||||||
|
%pom_remove_dep -r :biz.aQute.repository
|
||||||
|
%pom_disable_module bnd-indexer-maven-plugin
|
||||||
|
%pom_disable_module bnd-export-maven-plugin
|
||||||
|
%pom_disable_module bnd-resolver-maven-plugin
|
||||||
|
%pom_disable_module bnd-testing-maven-plugin
|
||||||
|
%pom_remove_plugin -r :maven-invoker-plugin
|
||||||
|
%pom_remove_plugin -r :maven-javadoc-plugin
|
||||||
|
%pom_remove_plugin -r :flatten-maven-plugin
|
||||||
|
cd -
|
||||||
|
%mvn_alias biz.aQute.bnd:biz.aQute.bnd :bnd biz.aQute:bnd
|
||||||
|
%mvn_alias biz.aQute.bnd:biz.aQute.bndlib :bndlib biz.aQute:bndlib
|
||||||
|
%mvn_package biz.aQute.bnd:biz.aQute.bndlib bndlib
|
||||||
|
%mvn_package biz.aQute.bnd:biz.aQute.bnd.annotation bndlib
|
||||||
|
%mvn_package biz.aQute.bnd:aQute.libg bndlib
|
||||||
|
%mvn_package biz.aQute.bnd:bnd-shared-maven-lib maven
|
||||||
|
%mvn_package biz.aQute.bnd:bnd-maven-plugin maven
|
||||||
|
%mvn_package biz.aQute.bnd:bnd-baseline-maven-plugin maven
|
||||||
|
%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
|
||||||
|
%files -f .mfiles-maven
|
||||||
|
%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
|
||||||
42
biz.aQute.bnd-3.5.0.pom
Normal file
42
biz.aQute.bnd-3.5.0.pom
Normal file
@ -0,0 +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">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<groupId>biz.aQute.bnd</groupId>
|
||||||
|
<artifactId>biz.aQute.bnd</artifactId>
|
||||||
|
<version>3.5.0</version>
|
||||||
|
<description>This command line utility is the Swiss army knife of OSGi. It provides you with a breadth of tools to understand and manage OSGi based systems. This project basically uses bndlib.</description>
|
||||||
|
<name>biz.aQute.bnd</name>
|
||||||
|
<url>http://bnd.bndtools.org/</url>
|
||||||
|
<organization>
|
||||||
|
<name>Bndtools</name>
|
||||||
|
<url>http://bndtools.org/</url>
|
||||||
|
</organization>
|
||||||
|
<licenses>
|
||||||
|
<license>
|
||||||
|
<name>Apache-2.0</name>
|
||||||
|
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
|
||||||
|
<distribution>repo</distribution>
|
||||||
|
<comments>Apache License, Version 2.0</comments>
|
||||||
|
</license>
|
||||||
|
</licenses>
|
||||||
|
<scm>
|
||||||
|
<url>https://github.com/bndtools/bnd</url>
|
||||||
|
<connection>scm:git:https://github.com/bndtools/bnd.git</connection>
|
||||||
|
<developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
|
||||||
|
<tag>3.5.0.REL</tag>
|
||||||
|
</scm>
|
||||||
|
<developers>
|
||||||
|
<developer>
|
||||||
|
<id>pkriens</id>
|
||||||
|
<email>Peter.Kriens@aQute.biz</email>
|
||||||
|
<name>Peter Kriens</name>
|
||||||
|
<organization>Bndtools</organization>
|
||||||
|
<organizationUrl>https://github.com/bndtools</organizationUrl>
|
||||||
|
<roles>
|
||||||
|
<role>architect</role>
|
||||||
|
<role>developer</role>
|
||||||
|
</roles>
|
||||||
|
<timezone>1</timezone>
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
</project>
|
||||||
42
biz.aQute.bnd.annotation-3.5.0.pom
Normal file
42
biz.aQute.bnd.annotation-3.5.0.pom
Normal file
@ -0,0 +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">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<groupId>biz.aQute.bnd</groupId>
|
||||||
|
<artifactId>biz.aQute.bnd.annotation</artifactId>
|
||||||
|
<version>3.5.0</version>
|
||||||
|
<description>Contains only the annotations for bnd.</description>
|
||||||
|
<name>bnd Annotations Library</name>
|
||||||
|
<url>http://www.aQute.biz/Code/Bnd</url>
|
||||||
|
<organization>
|
||||||
|
<name>Bndtools</name>
|
||||||
|
<url>http://bndtools.org/</url>
|
||||||
|
</organization>
|
||||||
|
<licenses>
|
||||||
|
<license>
|
||||||
|
<name>Apache-2.0</name>
|
||||||
|
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
|
||||||
|
<distribution>repo</distribution>
|
||||||
|
<comments>Apache License, Version 2.0</comments>
|
||||||
|
</license>
|
||||||
|
</licenses>
|
||||||
|
<scm>
|
||||||
|
<url>https://github.com/bndtools/bnd</url>
|
||||||
|
<connection>scm:git:https://github.com/bndtools/bnd.git</connection>
|
||||||
|
<developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
|
||||||
|
<tag>3.5.0.REL</tag>
|
||||||
|
</scm>
|
||||||
|
<developers>
|
||||||
|
<developer>
|
||||||
|
<id>pkriens</id>
|
||||||
|
<email>Peter.Kriens@aQute.biz</email>
|
||||||
|
<name>Peter Kriens</name>
|
||||||
|
<organization>Bndtools</organization>
|
||||||
|
<organizationUrl>https://github.com/bndtools</organizationUrl>
|
||||||
|
<roles>
|
||||||
|
<role>architect</role>
|
||||||
|
<role>developer</role>
|
||||||
|
</roles>
|
||||||
|
<timezone>1</timezone>
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
</project>
|
||||||
38
biz.aQute.bndlib-3.5.0.pom
Normal file
38
biz.aQute.bndlib-3.5.0.pom
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
<?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">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<groupId>biz.aQute.bnd</groupId>
|
||||||
|
<artifactId>biz.aQute.bndlib</artifactId>
|
||||||
|
<version>3.5.0</version>
|
||||||
|
<description>A Swiss Army Knife for OSGi</description>
|
||||||
|
<name>bndlib</name>
|
||||||
|
<url>http://bnd.bndtools.org/</url>
|
||||||
|
<organization>
|
||||||
|
<name>Bndtools</name>
|
||||||
|
<url>http://bndtools.org/</url>
|
||||||
|
</organization>
|
||||||
|
<licenses>
|
||||||
|
<license>
|
||||||
|
<name>Apache-2.0</name>
|
||||||
|
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
|
||||||
|
<distribution>repo</distribution>
|
||||||
|
<comments>Apache License, Version 2.0</comments>
|
||||||
|
</license>
|
||||||
|
</licenses>
|
||||||
|
<scm>
|
||||||
|
<url>https://github.com/bndtools/bnd</url>
|
||||||
|
<connection>scm:git:https://github.com/bndtools/bnd.git</connection>
|
||||||
|
<developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
|
||||||
|
<tag>3.5.0.REL</tag>
|
||||||
|
</scm>
|
||||||
|
<developers>
|
||||||
|
<developer>
|
||||||
|
<id>peter.kriens@aQute.biz</id>
|
||||||
|
<email>peter.kriens@aQute.biz</email>
|
||||||
|
</developer>
|
||||||
|
<developer>
|
||||||
|
<id>njbartlett@gmail.com</id>
|
||||||
|
<email>njbartlett@gmail.com</email>
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
</project>
|
||||||
166
parent.pom
Normal file
166
parent.pom
Normal file
@ -0,0 +1,166 @@
|
|||||||
|
<?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'>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<groupId>biz.aQute.bnd</groupId>
|
||||||
|
<artifactId>parent</artifactId>
|
||||||
|
<version>2.4.0</version>
|
||||||
|
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
<name>Parent project for bnd tool suite</name>
|
||||||
|
<description>Project information for bnd.</description>
|
||||||
|
<url>http://www.aQute.biz/Code/Bnd</url>
|
||||||
|
|
||||||
|
<organization>
|
||||||
|
<name>aQute SARL</name>
|
||||||
|
<url>http://www.aQute.biz</url>
|
||||||
|
</organization>
|
||||||
|
|
||||||
|
<licenses>
|
||||||
|
<license>
|
||||||
|
<name>Apache Software License 2.0</name>
|
||||||
|
<url>http://www.opensource.org/licenses/apache2.0.php</url>
|
||||||
|
<distribution>repo</distribution>
|
||||||
|
</license>
|
||||||
|
</licenses>
|
||||||
|
|
||||||
|
<developers>
|
||||||
|
<developer>
|
||||||
|
<id>bnd</id>
|
||||||
|
<name>Peter Kriens</name>
|
||||||
|
<organization>aQute SARL</organization>
|
||||||
|
<roles>
|
||||||
|
<role>Primary Developer</role>
|
||||||
|
</roles>
|
||||||
|
</developer>
|
||||||
|
<developer>
|
||||||
|
<id>bjhargrave</id>
|
||||||
|
<name>BJ Hargrave</name>
|
||||||
|
</developer>
|
||||||
|
<developer>
|
||||||
|
<id>mcculls</id>
|
||||||
|
<name>Stuart McCulloch</name>
|
||||||
|
</developer>
|
||||||
|
<developer>
|
||||||
|
<id>njbartlett</id>
|
||||||
|
<name>Neil Bartlett</name>
|
||||||
|
<organization>Paremus</organization>
|
||||||
|
</developer>
|
||||||
|
<developer>
|
||||||
|
<id>fhuberts</id>
|
||||||
|
<name>Ferry Huberts</name>
|
||||||
|
<organization>Pelagic</organization>
|
||||||
|
</developer>
|
||||||
|
<developer>
|
||||||
|
<id>psoreide</id>
|
||||||
|
<name>PK Søreide</name>
|
||||||
|
<organization>Comactivity AB</organization>
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
<contributors>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>derheld42</id>-->
|
||||||
|
<name>Carter Smithhart</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>cchabanois</id>-->
|
||||||
|
<name>Chabanois Cédric</name>
|
||||||
|
<organization>Entropysoft</organization>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>paulbakker</id>-->
|
||||||
|
<name>Paul Bakker</name>
|
||||||
|
<organization>Luminis Technologies</organization>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>djencks</id>-->
|
||||||
|
<name>David Jencks</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>rkrzewski</id>-->
|
||||||
|
<name>Rafał Krzewski</name>
|
||||||
|
<organization>Caltha - Krzewski, Mach, Potempski Sp. J.</organization>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>xfournet</id>-->
|
||||||
|
<name>Xavier Fournet</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>crabbkw</id>-->
|
||||||
|
<name>Casey Crabb</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>david.bosschaert</id>-->
|
||||||
|
<name>David Bosschaert</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>harald.wellmann</id>-->
|
||||||
|
<name>Harald Wellmann</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>janwillem.janssen</id>-->
|
||||||
|
<name>Jan Willem Janssen</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>marcel.offermans</id>-->
|
||||||
|
<name>Marcel Offermans</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>marian.grigoras</id>-->
|
||||||
|
<name>Marian Grigoras</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>markuswolf</id>-->
|
||||||
|
<name>Markus Wolf</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>nicolas.lalevee</id>-->
|
||||||
|
<name>Nicolas Lalevée</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>pierre.labiausse</id>-->
|
||||||
|
<name>Pierre Labiausse</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>raymond.auge</id>-->
|
||||||
|
<name>Raymond Auge</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>timothyjward</id>-->
|
||||||
|
<name>Tim Ward</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>bramk</id>-->
|
||||||
|
<name>Bram de Kruijff</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>tangyong</id>-->
|
||||||
|
<name>Tang Yong</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>gamerson</id>-->
|
||||||
|
<name>Gregory Amerson</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>gnodet</id>-->
|
||||||
|
<name>Guillaume Nodet</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>marcdejonge</id>-->
|
||||||
|
<name>Marc de Jonge</name>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<!--<id>trespasserw</id>-->
|
||||||
|
<name>Roman Shevchenko</name>
|
||||||
|
</contributor>
|
||||||
|
</contributors>
|
||||||
|
|
||||||
|
<scm>
|
||||||
|
<url>https://github.com/bndtools/bnd</url>
|
||||||
|
<connection>scm:git:git://github.com/bndtools/bnd.git</connection>
|
||||||
|
<developerConnection>scm:git:ssh://github.com/bndtools/bnd.git</developerConnection>
|
||||||
|
</scm>
|
||||||
|
|
||||||
|
</project>
|
||||||
Loading…
x
Reference in New Issue
Block a user