Compare commits
No commits in common. "c8-stream-201801" and "c8-stream-201902" have entirely different histories.
c8-stream-
...
c8-stream-
@ -1 +1 @@
|
||||
3022433101e6246b2ddce69ddd7c3153b41462cf SOURCES/3.5.0.REL.tar.gz
|
||||
86b993498bffd8f33d112c644cf9c9061070c318 SOURCES/4.3.0.REL.tar.gz
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/3.5.0.REL.tar.gz
|
||||
SOURCES/4.3.0.REL.tar.gz
|
||||
|
||||
@ -4,14 +4,14 @@ 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(-)
|
||||
biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 48 -----------------------
|
||||
1 file changed, 48 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
|
||||
index 3f21168..d6c9ccd 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;
|
||||
@@ -110,7 +110,6 @@ import aQute.bnd.osgi.Processor;
|
||||
import aQute.bnd.osgi.Resource;
|
||||
import aQute.bnd.osgi.Verifier;
|
||||
import aQute.bnd.osgi.eclipse.EclipseClasspath;
|
||||
@ -19,10 +19,11 @@ index 1cc3216..c669e4a 100644
|
||||
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 {
|
||||
@@ -4213,53 +4212,6 @@ public class bnd extends Processor {
|
||||
getInfo(profiles);
|
||||
}
|
||||
|
||||
/**
|
||||
- /**
|
||||
- * Resolve command
|
||||
- *
|
||||
- * @throws Exception
|
||||
@ -30,7 +31,8 @@ index 1cc3216..c669e4a 100644
|
||||
-
|
||||
- public void _resolve(ResolveCommand.ResolveOptions options) throws Exception {
|
||||
- ResolveCommand rc = new ResolveCommand(this);
|
||||
- String help = options._command().subCmd(options, rc);
|
||||
- String help = options._command()
|
||||
- .subCmd(options, rc);
|
||||
- if (help != null)
|
||||
- out.println(help);
|
||||
- getInfo(rc);
|
||||
@ -45,7 +47,8 @@ index 1cc3216..c669e4a 100644
|
||||
-
|
||||
- public void _remote(RemoteCommand.RemoteOptions options) throws Exception {
|
||||
- RemoteCommand rc = new RemoteCommand(this, options);
|
||||
- String help = options._command().subCmd(options, rc);
|
||||
- String help = options._command()
|
||||
- .subCmd(options, rc);
|
||||
- if (help != null)
|
||||
- out.println(help);
|
||||
- getInfo(rc);
|
||||
@ -60,16 +63,16 @@ index 1cc3216..c669e4a 100644
|
||||
-
|
||||
- public void _nexus(NexusCommand.NexusOptions options) throws Exception {
|
||||
- NexusCommand rc = new NexusCommand(this, options);
|
||||
- String help = options._command().subCmd(options, rc);
|
||||
- String help = options._command()
|
||||
- .subCmd(options, rc);
|
||||
- if (help != null)
|
||||
- out.println(help);
|
||||
- getInfo(rc);
|
||||
- rc.close();
|
||||
- }
|
||||
- /**
|
||||
|
||||
/**
|
||||
* Export a bndrun file
|
||||
*/
|
||||
|
||||
--
|
||||
2.13.5
|
||||
2.21.0
|
||||
|
||||
|
||||
@ -8,18 +8,18 @@ Subject: [PATCH 2/2] Fix ant compatibility
|
||||
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
|
||||
index dd438a5..6b714be 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<Object, Object> antProps = getProject().getProperties();
|
||||
+ Hashtable<String,Object> antProps = getProject().getProperties();
|
||||
projectProperties.putAll(antProps);
|
||||
projectProperties.putAll(builder.getProperties());
|
||||
builder.setProperties(projectProperties);
|
||||
--
|
||||
2.13.5
|
||||
2.20.1
|
||||
|
||||
|
||||
102
SOURCES/0003-Port-to-OSGI-7.0.0.patch
Normal file
102
SOURCES/0003-Port-to-OSGI-7.0.0.patch
Normal file
@ -0,0 +1,102 @@
|
||||
From 64a36cbc8d7c8234dfa2af8670c2e1ea4a5c3909 Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
Date: Thu, 11 Jul 2019 14:29:26 +0200
|
||||
Subject: [PATCH] Port to OSGI 7.0.0
|
||||
|
||||
---
|
||||
.../src/aQute/bnd/junit/ConsoleLogger.java | 62 +++++++++++++++++++
|
||||
1 file changed, 62 insertions(+)
|
||||
|
||||
diff --git a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java
|
||||
index 9c2591f..569b20e 100644
|
||||
--- a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java
|
||||
+++ b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java
|
||||
@@ -15,9 +15,11 @@ import org.osgi.framework.ServiceFactory;
|
||||
import org.osgi.framework.ServiceReference;
|
||||
import org.osgi.framework.ServiceRegistration;
|
||||
import org.osgi.service.log.LogEntry;
|
||||
+import org.osgi.service.log.LogLevel;
|
||||
import org.osgi.service.log.LogListener;
|
||||
import org.osgi.service.log.LogReaderService;
|
||||
import org.osgi.service.log.LogService;
|
||||
+import org.osgi.service.log.Logger;
|
||||
|
||||
@Deprecated // see biz.aQute.bnd.remote.junit
|
||||
public class ConsoleLogger implements LogReaderService {
|
||||
@@ -76,6 +78,36 @@ public class ConsoleLogger implements LogReaderService {
|
||||
return time;
|
||||
}
|
||||
|
||||
+ @Override
|
||||
+ public LogLevel getLogLevel() {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public String getLoggerName() {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public long getSequence() {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public String getThreadInfo() {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public StackTraceElement getLocation() {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
}
|
||||
|
||||
public class Facade implements LogService {
|
||||
@@ -112,6 +144,36 @@ public class ConsoleLogger implements LogReaderService {
|
||||
|
||||
}
|
||||
|
||||
+ @Override
|
||||
+ public Logger getLogger(String name) {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public Logger getLogger(Class<?> clazz) {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public <L extends Logger> L getLogger(String name, Class<L> loggerType) {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public <L extends Logger> L getLogger(Class<?> clazz, Class<L> loggerType) {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
}
|
||||
|
||||
public ConsoleLogger(BundleContext context) {
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -3,27 +3,33 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>aQute.libg</artifactId>
|
||||
<version>3.5.0</version>
|
||||
<version>4.3.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>
|
||||
<url>https://bnd.bndtools.org/</url>
|
||||
<organization>
|
||||
<name>Bndtools</name>
|
||||
<url>http://bndtools.org/</url>
|
||||
<url>https://bndtools.org/</url>
|
||||
</organization>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache-2.0</name>
|
||||
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
|
||||
<url>https://opensource.org/licenses/Apache-2.0</url>
|
||||
<distribution>repo</distribution>
|
||||
<comments>Apache License, Version 2.0</comments>
|
||||
</license>
|
||||
<license>
|
||||
<name>EPL-2.0</name>
|
||||
<url>https://opensource.org/licenses/EPL-2.0</url>
|
||||
<distribution>repo</distribution>
|
||||
<comments>Eclipse Public 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>
|
||||
<tag>4.3.0.REL</tag>
|
||||
</scm>
|
||||
<developers>
|
||||
<developer>
|
||||
@ -39,4 +45,30 @@
|
||||
<timezone>1</timezone>
|
||||
</developer>
|
||||
</developers>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>osgi.annotation</artifactId>
|
||||
<version>7.0.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.25</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>org.osgi.util.function</artifactId>
|
||||
<version>1.1.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>org.osgi.util.promise</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@ -1,42 +0,0 @@
|
||||
<?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>
|
||||
110
SOURCES/biz.aQute.bnd-4.3.0.pom
Normal file
110
SOURCES/biz.aQute.bnd-4.3.0.pom
Normal file
@ -0,0 +1,110 @@
|
||||
<?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>4.3.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>https://bnd.bndtools.org/</url>
|
||||
<organization>
|
||||
<name>Bndtools</name>
|
||||
<url>https://bndtools.org/</url>
|
||||
</organization>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache-2.0</name>
|
||||
<url>https://opensource.org/licenses/Apache-2.0</url>
|
||||
<distribution>repo</distribution>
|
||||
<comments>Apache License, Version 2.0</comments>
|
||||
</license>
|
||||
<license>
|
||||
<name>EPL-2.0</name>
|
||||
<url>https://opensource.org/licenses/EPL-2.0</url>
|
||||
<distribution>repo</distribution>
|
||||
<comments>Eclipse Public 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>4.3.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>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bndlib</artifactId>
|
||||
<version>4.3.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.resolve</artifactId>
|
||||
<version>4.3.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.repository</artifactId>
|
||||
<version>4.3.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bnd.exporters</artifactId>
|
||||
<version>4.3.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bnd.reporter</artifactId>
|
||||
<version>4.3.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.remote.api</artifactId>
|
||||
<version>4.3.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.yaml</groupId>
|
||||
<artifactId>snakeyaml</artifactId>
|
||||
<version>1.15</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.25</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-simple</artifactId>
|
||||
<version>1.7.25</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jline</groupId>
|
||||
<artifactId>jline</artifactId>
|
||||
<version>2.14.6</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@ -3,27 +3,33 @@
|
||||
<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>
|
||||
<version>4.3.0</version>
|
||||
<description>bnd Annotations Library</description>
|
||||
<name>biz.aQute.bnd.annotation</name>
|
||||
<url>https://bnd.bndtools.org/</url>
|
||||
<organization>
|
||||
<name>Bndtools</name>
|
||||
<url>http://bndtools.org/</url>
|
||||
<url>https://bndtools.org/</url>
|
||||
</organization>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache-2.0</name>
|
||||
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
|
||||
<url>https://opensource.org/licenses/Apache-2.0</url>
|
||||
<distribution>repo</distribution>
|
||||
<comments>Apache License, Version 2.0</comments>
|
||||
</license>
|
||||
<license>
|
||||
<name>EPL-2.0</name>
|
||||
<url>https://opensource.org/licenses/EPL-2.0</url>
|
||||
<distribution>repo</distribution>
|
||||
<comments>Eclipse Public 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>
|
||||
<tag>4.3.0.REL</tag>
|
||||
</scm>
|
||||
<developers>
|
||||
<developer>
|
||||
@ -39,4 +45,12 @@
|
||||
<timezone>1</timezone>
|
||||
</developer>
|
||||
</developers>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>osgi.annotation</artifactId>
|
||||
<version>7.0.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@ -1,38 +0,0 @@
|
||||
<?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>
|
||||
70
SOURCES/biz.aQute.bndlib-4.3.0.pom
Normal file
70
SOURCES/biz.aQute.bndlib-4.3.0.pom
Normal file
@ -0,0 +1,70 @@
|
||||
<?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>4.3.0</version>
|
||||
<description>bndlib: A Swiss Army Knife for OSGi</description>
|
||||
<name>biz.aQute.bndlib</name>
|
||||
<url>https://bnd.bndtools.org/</url>
|
||||
<organization>
|
||||
<name>Bndtools</name>
|
||||
<url>https://bndtools.org/</url>
|
||||
</organization>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache-2.0</name>
|
||||
<url>https://opensource.org/licenses/Apache-2.0</url>
|
||||
<distribution>repo</distribution>
|
||||
<comments>Apache License, Version 2.0</comments>
|
||||
</license>
|
||||
<license>
|
||||
<name>EPL-2.0</name>
|
||||
<url>https://opensource.org/licenses/EPL-2.0</url>
|
||||
<distribution>repo</distribution>
|
||||
<comments>Eclipse Public 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>4.3.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>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>osgi.annotation</artifactId>
|
||||
<version>7.0.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>org.osgi.util.function</artifactId>
|
||||
<version>1.1.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>org.osgi.util.promise</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.25</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@ -186,10 +186,10 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.5.1</version>
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
%bcond_without ant_tasks
|
||||
%bcond_without maven_plugin
|
||||
|
||||
Name: aqute-bnd
|
||||
Version: 3.5.0
|
||||
Release: 4%{?dist}
|
||||
Version: 4.3.0
|
||||
Release: 2%{?dist}
|
||||
Summary: BND Tool
|
||||
# Part of jpm is under BSD, but jpm is not included in binary RPM
|
||||
License: ASL 2.0
|
||||
@ -24,28 +21,25 @@ Source6: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annot
|
||||
|
||||
Patch0: 0001-Disable-removed-commands.patch
|
||||
Patch1: 0002-Fix-ant-compatibility.patch
|
||||
Patch2: 0003-Port-to-OSGI-7.0.0.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-mapping)
|
||||
BuildRequires: mvn(org.apache.maven:maven-artifact)
|
||||
BuildRequires: mvn(org.apache.maven:maven-compat)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.eclipse.aether:aether-api)
|
||||
BuildRequires: mvn(org.osgi:osgi.annotation)
|
||||
BuildRequires: mvn(org.osgi:osgi.cmpn)
|
||||
BuildRequires: mvn(org.osgi:osgi.core)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-simple)
|
||||
%if %{with ant_tasks}
|
||||
BuildRequires: mvn(org.apache.ant:ant)
|
||||
%endif
|
||||
%if %{with maven_plugin}
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.maven:maven-artifact)
|
||||
BuildRequires: mvn(org.apache.maven:maven-compat)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.eclipse.aether:aether-api)
|
||||
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
|
||||
%endif
|
||||
|
||||
# Explicit javapackages-tools requires since bnd script uses
|
||||
# /usr/share/java-utils/java-functions
|
||||
Requires: javapackages-tools
|
||||
@ -69,13 +63,11 @@ Summary: BND library
|
||||
%description -n aqute-bndlib
|
||||
%{summary}.
|
||||
|
||||
%if %{with maven_plugin}
|
||||
%package -n bnd-maven-plugin
|
||||
Summary: BND Maven plugin
|
||||
|
||||
%description -n bnd-maven-plugin
|
||||
%{summary}.
|
||||
%endif
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
@ -90,6 +82,7 @@ rm gradlew*
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
# the commands pull in more dependencies than we want (felix-resolver, jetty)
|
||||
rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java
|
||||
@ -97,70 +90,60 @@ rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java
|
||||
sed 's/@VERSION@/%{version}/' %SOURCE2 > pom.xml
|
||||
sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info
|
||||
|
||||
%if %{without ant_tasks}
|
||||
rm -rf biz.aQute.bnd/src/aQute/bnd/ant
|
||||
%endif
|
||||
|
||||
%if %{without maven_plugin}
|
||||
%pom_disable_module maven
|
||||
%endif
|
||||
|
||||
# libg
|
||||
pushd aQute.libg
|
||||
cp -p %{SOURCE3} pom.xml
|
||||
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||
%pom_remove_dep :org.osgi.util.function
|
||||
%pom_remove_dep :org.osgi.util.promise
|
||||
%pom_add_dep org.osgi:osgi.core
|
||||
%pom_add_dep org.osgi:osgi.cmpn
|
||||
%pom_add_dep org.slf4j:slf4j-api
|
||||
popd
|
||||
|
||||
# bndlib.annotations
|
||||
pushd biz.aQute.bnd.annotation
|
||||
cp -p %{SOURCE6} pom.xml
|
||||
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||
%pom_add_dep org.osgi:osgi.core
|
||||
%pom_add_dep org.osgi:osgi.cmpn
|
||||
popd
|
||||
|
||||
# bndlib
|
||||
pushd biz.aQute.bndlib
|
||||
cp -p %{SOURCE5} pom.xml
|
||||
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||
|
||||
%pom_add_dep org.osgi:osgi.annotation
|
||||
%pom_remove_dep :org.osgi.util.function
|
||||
%pom_remove_dep :org.osgi.util.promise
|
||||
%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}
|
||||
popd
|
||||
|
||||
# bnd
|
||||
cp -r biz.aQute.bnd.exporters/src/aQute/bnd/exporter biz.aQute.bnd/src/aQute/bnd/
|
||||
pushd biz.aQute.bnd
|
||||
cp -p %{SOURCE4} 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}
|
||||
%if %{with ant_tasks}
|
||||
%pom_add_dep org.apache.ant:ant
|
||||
%endif
|
||||
%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
|
||||
%pom_remove_dep :biz.aQute.resolve
|
||||
%pom_remove_dep :biz.aQute.repository
|
||||
%pom_remove_dep :biz.aQute.bnd.exporters
|
||||
%pom_remove_dep :biz.aQute.bnd.reporter
|
||||
%pom_remove_dep :biz.aQute.remote.api
|
||||
%pom_remove_dep :snakeyaml
|
||||
%pom_remove_dep :jline
|
||||
popd
|
||||
|
||||
# maven-plugins
|
||||
cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/configuration maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib
|
||||
pushd 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_remove_dep -r :biz.aQute.bnd.maven
|
||||
# Unavailable reactor dependency - org.osgi.impl.bundle.repoindex.cli
|
||||
%pom_disable_module bnd-indexer-maven-plugin
|
||||
# Requires unbuilt parts of bnd
|
||||
%pom_disable_module bnd-export-maven-plugin
|
||||
%pom_disable_module bnd-reporter-maven-plugin
|
||||
%pom_disable_module bnd-resolver-maven-plugin
|
||||
%pom_disable_module bnd-run-maven-plugin
|
||||
%pom_disable_module bnd-testing-maven-plugin
|
||||
# Integration tests require Internet access
|
||||
%pom_remove_plugin -r :maven-invoker-plugin
|
||||
@ -169,14 +152,12 @@ rm bnd-shared-maven-lib/src/main/java/aQute/bnd/maven/lib/resolve/DependencyReso
|
||||
%pom_remove_plugin -r :flatten-maven-plugin
|
||||
popd
|
||||
|
||||
|
||||
%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
|
||||
@ -188,31 +169,40 @@ popd
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%if %{with ant_tasks}
|
||||
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/%{name}
|
||||
%endif
|
||||
|
||||
%jpackage_script aQute.bnd.main.bnd "" "" aqute-bnd:slf4j/slf4j-api:slf4j/slf4j-simple:osgi-annotation:osgi-core:osgi-compendium bnd 1
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE
|
||||
%{_bindir}/bnd
|
||||
%if %{with ant_tasks}
|
||||
%config(noreplace) %{_sysconfdir}/ant.d/*
|
||||
%endif
|
||||
|
||||
%files -n aqute-bndlib -f .mfiles-bndlib
|
||||
%license LICENSE
|
||||
|
||||
%if %{with maven_plugin}
|
||||
%files -n bnd-maven-plugin -f .mfiles-maven
|
||||
%endif
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.0-2
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Wed Oct 09 2019 Marian Koncek <mkoncek@redhat.com> - 4.3.0-1
|
||||
- Update to upstream version 4.3.0
|
||||
|
||||
* Thu Jul 04 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.0-1
|
||||
- Update to upstream version 4.2.0
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.0-6
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Fri Apr 12 2019 Marian Koncek <mkoncek@redhat.com> - 3.5.0-5
|
||||
- Port to OSGI 7.0.0
|
||||
|
||||
* Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 3.5.0-4
|
||||
- Add requirement on javapackages-tools for bnd script.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user