RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/aqute-bnd#ea9987afa36ffc9b5b7e3a16413ed3b3a2747d36
This commit is contained in:
parent
bb6489749c
commit
5fdad721a0
11
.gitignore
vendored
11
.gitignore
vendored
@ -0,0 +1,11 @@
|
||||
/results_*
|
||||
/*.src.rpm
|
||||
/*.noarch.rpm
|
||||
/2.4.1.REL.tar.gz
|
||||
/3.2.0.REL.tar.gz
|
||||
/3.3.0.REL.tar.gz
|
||||
/3.4.0.REL.tar.gz
|
||||
/3.5.0.REL.tar.gz
|
||||
/4.3.0.REL.tar.gz
|
||||
/4.3.1.REL.tar.gz
|
||||
/*.pom
|
78
0001-Disable-removed-commands.patch
Normal file
78
0001-Disable-removed-commands.patch
Normal file
@ -0,0 +1,78 @@
|
||||
From 4ef3677674f105b633709a974f5744ad77f001b6 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/4] Disable removed commands
|
||||
|
||||
---
|
||||
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 3f21168..d6c9ccd 100644
|
||||
--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
|
||||
+++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
|
||||
@@ -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;
|
||||
-import aQute.bnd.repository.maven.provider.NexusCommand;
|
||||
import aQute.bnd.service.Actionable;
|
||||
import aQute.bnd.service.RepositoryPlugin;
|
||||
import aQute.bnd.service.action.Action;
|
||||
@@ -4213,53 +4212,6 @@ public class bnd extends Processor {
|
||||
getInfo(profiles);
|
||||
}
|
||||
|
||||
- /**
|
||||
- * 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.26.2
|
||||
|
25
0002-Fix-ant-compatibility.patch
Normal file
25
0002-Fix-ant-compatibility.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From aa2930336341f50f84a7fd8196d12edf5ca8d2ef 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/4] 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 f39f9b1..a9db014 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.26.2
|
||||
|
149
0003-Port-to-OSGI-7.0.0.patch
Normal file
149
0003-Port-to-OSGI-7.0.0.patch
Normal file
@ -0,0 +1,149 @@
|
||||
From 07705c03182b11f525f87002ae0a687961f91da2 Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
Date: Thu, 11 Jul 2019 14:29:26 +0200
|
||||
Subject: [PATCH 3/4] Port to OSGI 7.0.0
|
||||
|
||||
---
|
||||
.../src/aQute/bnd/main/ReporterLogger.java | 31 ++++++++++
|
||||
.../src/aQute/bnd/junit/ConsoleLogger.java | 62 +++++++++++++++++++
|
||||
2 files changed, 93 insertions(+)
|
||||
|
||||
diff --git a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java
|
||||
index 84dd290..287f6fb 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;
|
||||
@@ -108,4 +109,34 @@ public class ReporterLogger implements LogService {
|
||||
}
|
||||
}
|
||||
|
||||
+ @Override
|
||||
+ public org.osgi.service.log.Logger getLogger(String name) {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public org.osgi.service.log.Logger getLogger(Class<?> clazz) {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public <L extends org.osgi.service.log.Logger> L getLogger(String name, Class<L> loggerType) {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public <L extends org.osgi.service.log.Logger> L getLogger(Class<?> clazz, Class<L> loggerType) {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public <L extends org.osgi.service.log.Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {
|
||||
+ // TODO Auto-generated method stub
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
}
|
||||
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.26.2
|
||||
|
98
0004-Patch-out-twig-plugin-for-report-generation.patch
Normal file
98
0004-Patch-out-twig-plugin-for-report-generation.patch
Normal file
@ -0,0 +1,98 @@
|
||||
From b2c3aed5b82c92d13997b49c7748bab9781f8d68 Mon Sep 17 00:00:00 2001
|
||||
From: Mat Booth <mat.booth@redhat.com>
|
||||
Date: Mon, 27 Jul 2020 16:53:49 +0100
|
||||
Subject: [PATCH 4/4] Patch out twig plugin for report generation
|
||||
|
||||
---
|
||||
biz.aQute.bnd.reporter/bnd.bnd | 15 ---------------
|
||||
.../reporter/exporter/ReportExporterBuilder.java | 4 ----
|
||||
biz.aQute.bnd/bnd.bnd | 5 -----
|
||||
3 files changed, 24 deletions(-)
|
||||
|
||||
diff --git a/biz.aQute.bnd.reporter/bnd.bnd b/biz.aQute.bnd.reporter/bnd.bnd
|
||||
index 76fefa9..245a75b 100644
|
||||
--- a/biz.aQute.bnd.reporter/bnd.bnd
|
||||
+++ b/biz.aQute.bnd.reporter/bnd.bnd
|
||||
@@ -1,27 +1,12 @@
|
||||
# Set javac settings from JDT prefs
|
||||
-include: ${workspace}/cnf/includes/jdt.bnd
|
||||
|
||||
--maven-dependencies.jtwig:\
|
||||
- jtwig-core;\
|
||||
- groupId=org.jtwig;\
|
||||
- artifactId=jtwig-core;\
|
||||
- version=5.86.1.RELEASE;\
|
||||
- scope=compile,\
|
||||
- \
|
||||
- jtwig-reflection;\
|
||||
- groupId=org.jtwig;\
|
||||
- artifactId=jtwig-reflection;\
|
||||
- version=5.86.1.RELEASE;\
|
||||
- scope=compile
|
||||
-
|
||||
-buildpath: \
|
||||
osgi.annotation;version=latest;maven-scope=provided,\
|
||||
osgi.core;version=latest;maven-scope=provided,\
|
||||
aQute.libg;version=project,\
|
||||
biz.aQute.bndlib;version=latest,\
|
||||
slf4j.api;version=latest,\
|
||||
- org.jtwig:jtwig-core;version=latest,\
|
||||
- org.jtwig:jtwig-reflection;version=latest,\
|
||||
org.parboiled:parboiled-java;version=latest,\
|
||||
org.parboiled:parboiled-core;version=latest,\
|
||||
org.apache.commons.lang3;version="[3.4,4.0)",\
|
||||
diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/exporter/ReportExporterBuilder.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/exporter/ReportExporterBuilder.java
|
||||
index ca064d2..8f75a74 100644
|
||||
--- a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/exporter/ReportExporterBuilder.java
|
||||
+++ b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/exporter/ReportExporterBuilder.java
|
||||
@@ -10,7 +10,6 @@ import biz.aQute.bnd.reporter.plugins.resource.converter.PropertiesConverterPlug
|
||||
import biz.aQute.bnd.reporter.plugins.resource.converter.XmlConverterPlugin;
|
||||
import biz.aQute.bnd.reporter.plugins.serializer.JsonReportSerializerPlugin;
|
||||
import biz.aQute.bnd.reporter.plugins.serializer.XmlReportSerializerPlugin;
|
||||
-import biz.aQute.bnd.reporter.plugins.transformer.JtwigTransformerPlugin;
|
||||
import biz.aQute.bnd.reporter.plugins.transformer.XsltTransformerPlugin;
|
||||
|
||||
/**
|
||||
@@ -112,9 +111,6 @@ public class ReportExporterBuilder {
|
||||
if (processor.getPlugin(XmlReportSerializerPlugin.class) == null) {
|
||||
processor.addBasicPlugin(new XmlReportSerializerPlugin());
|
||||
}
|
||||
- if (processor.getPlugin(JtwigTransformerPlugin.class) == null) {
|
||||
- processor.addBasicPlugin(new JtwigTransformerPlugin());
|
||||
- }
|
||||
if (processor.getPlugin(XsltTransformerPlugin.class) == null) {
|
||||
processor.addBasicPlugin(new XsltTransformerPlugin());
|
||||
}
|
||||
diff --git a/biz.aQute.bnd/bnd.bnd b/biz.aQute.bnd/bnd.bnd
|
||||
index 2c91999..3ff7f09 100644
|
||||
--- a/biz.aQute.bnd/bnd.bnd
|
||||
+++ b/biz.aQute.bnd/bnd.bnd
|
||||
@@ -43,7 +43,6 @@ Private-Package: \
|
||||
aQute.bnd.enroute.commands,\
|
||||
aQute.bnd.main, \
|
||||
org.objectweb.asm.*,\
|
||||
- org.jtwig.*,\
|
||||
org.parboiled.*;-split-package:=merge-first,\
|
||||
com.github.javaparser.*,\
|
||||
!org.slf4j.impl,\
|
||||
@@ -91,8 +90,6 @@ Bundle-Description: This command line utility is the Swiss army knife of OSGi. I
|
||||
# These dependencies are not on the -buildpath so no other part of bnd can
|
||||
# use them in the source code.
|
||||
-classpath: \
|
||||
- ${repo;org.jtwig:jtwig-core;latest},\
|
||||
- ${repo;org.jtwig:jtwig-reflection;latest},\
|
||||
${repo;org.parboiled:parboiled-java;latest},\
|
||||
${repo;org.parboiled:parboiled-core;latest},\
|
||||
${repo;org.apache.commons.lang3;[3.4,4.0)},\
|
||||
@@ -106,8 +103,6 @@ Bundle-Description: This command line utility is the Swiss army knife of OSGi. I
|
||||
|
||||
|
||||
-testpath.reporter: \
|
||||
- org.jtwig:jtwig-core;version=latest,\
|
||||
- org.jtwig:jtwig-reflection;version=latest,\
|
||||
org.parboiled:parboiled-java;version=latest,\
|
||||
org.parboiled:parboiled-core;version=latest,\
|
||||
org.apache.commons.lang3;version="[3.4,4.0)",\
|
||||
--
|
||||
2.26.2
|
||||
|
391
aqute-bnd.spec
Normal file
391
aqute-bnd.spec
Normal file
@ -0,0 +1,391 @@
|
||||
|
||||
Name: aqute-bnd
|
||||
Version: 4.3.1
|
||||
Release: 1%{?dist}
|
||||
Summary: BND Tool
|
||||
# Part of jpm is under BSD, but jpm is not included in binary RPM
|
||||
License: ASL 2.0 or EPL-2.0
|
||||
URL: http://bnd.bndtools.org/
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: %{version}.REL.tar.gz
|
||||
# removes bundled jars from upstream tarball
|
||||
# run as:
|
||||
# ./repack-tarball.sh
|
||||
Source1: repack-tarball.sh
|
||||
|
||||
# A custom aggregator pom to run the build
|
||||
Source2: parent.pom
|
||||
# Poms from maven central since upstream uses gradle to build
|
||||
Source3: https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom
|
||||
Source4: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom
|
||||
Source5: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{version}/biz.aQute.bndlib-%{version}.pom
|
||||
Source6: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/%{version}/biz.aQute.bnd.annotation-%{version}.pom
|
||||
Source7: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.exporters/%{version}/biz.aQute.bnd.exporters-%{version}.pom
|
||||
Source8: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.reporter/%{version}/biz.aQute.bnd.reporter-%{version}.pom
|
||||
|
||||
# Remove support for remote and resolve commands since they bring more deps than we want
|
||||
Patch0: 0001-Disable-removed-commands.patch
|
||||
|
||||
# Fix build failure against ant
|
||||
Patch1: 0002-Fix-ant-compatibility.patch
|
||||
|
||||
# Fix unimplemented new APIs introduced in OSGi R7
|
||||
Patch2: 0003-Port-to-OSGI-7.0.0.patch
|
||||
|
||||
# Twig is dead upstream, so patch out the option to use it for reports
|
||||
Patch3: 0004-Patch-out-twig-plugin-for-report-generation.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.github.javaparser:javaparser-core) >= 3.14.16
|
||||
BuildRequires: mvn(jline:jline)
|
||||
BuildRequires: mvn(org.apache.ant:ant)
|
||||
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.apache.maven.shared:maven-mapping)
|
||||
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)
|
||||
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
|
||||
|
||||
# Explicit javapackages-tools requires since bnd script uses
|
||||
# /usr/share/java-utils/java-functions
|
||||
Requires: javapackages-tools
|
||||
|
||||
%description
|
||||
The bnd tool helps you create and diagnose OSGi bundles.
|
||||
The key functions are:
|
||||
- Show the manifest and JAR contents of a bundle
|
||||
- Wrap a JAR so that it becomes a bundle
|
||||
- Create a Bundle from a specification and a class path
|
||||
- Verify the validity of the manifest entries
|
||||
The tool is capable of acting as:
|
||||
- Command line tool
|
||||
- File format
|
||||
- Directives
|
||||
- Use of macros
|
||||
|
||||
%package -n aqute-bndlib
|
||||
Summary: BND library
|
||||
|
||||
%description -n aqute-bndlib
|
||||
%{summary}.
|
||||
|
||||
%package -n bnd-maven-plugin
|
||||
Summary: BND Maven plugin
|
||||
|
||||
%description -n bnd-maven-plugin
|
||||
%{summary}.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
|
||||
%description javadoc
|
||||
API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n bnd-%{version}.REL
|
||||
|
||||
rm gradlew*
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
sed 's/@VERSION@/%{version}/' %SOURCE2 > pom.xml
|
||||
sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info
|
||||
|
||||
# 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.cmpn
|
||||
%pom_add_dep org.osgi:osgi.core
|
||||
popd
|
||||
|
||||
# bnd
|
||||
pushd biz.aQute.bnd
|
||||
cp -p %{SOURCE4} pom.xml
|
||||
sed -i -r 's/provided/compile/' pom.xml
|
||||
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||
# add missing dep for ant tasks
|
||||
%pom_add_dep org.apache.ant:ant
|
||||
# remove support for remote and resolve commands
|
||||
rm src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java
|
||||
%pom_remove_dep :biz.aQute.resolve
|
||||
%pom_remove_dep :biz.aQute.repository
|
||||
%pom_remove_dep :biz.aQute.remote.api
|
||||
%pom_remove_dep :snakeyaml
|
||||
popd
|
||||
|
||||
# bndlib
|
||||
pushd biz.aQute.bndlib
|
||||
cp -p %{SOURCE5} 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 biz.aQute.bnd:aQute.libg:%{version}
|
||||
%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
|
||||
popd
|
||||
|
||||
# bnd.annotation
|
||||
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
|
||||
|
||||
# bnd.exporters
|
||||
pushd biz.aQute.bnd.exporters
|
||||
cp -p %{SOURCE7} 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
|
||||
|
||||
# bnd.reporter
|
||||
pushd biz.aQute.bnd.reporter
|
||||
cp -p %{SOURCE8} pom.xml
|
||||
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||
%pom_add_dep org.osgi:osgi.core
|
||||
%pom_add_dep org.osgi:osgi.cmpn
|
||||
# remove twig dep and friends (twig is dead upstream)
|
||||
rm src/biz/aQute/bnd/reporter/plugins/transformer/JtwigTransformerPlugin.java
|
||||
%pom_remove_dep org.jtwig:
|
||||
%pom_remove_dep com.googlecode.concurrentlinkedhashmap:
|
||||
%pom_remove_dep com.google.guava:
|
||||
# uneeded dependency
|
||||
%pom_remove_dep :commons-lang3
|
||||
popd
|
||||
|
||||
# maven-plugins
|
||||
mkdir -p maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib
|
||||
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
|
||||
%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
|
||||
%pom_remove_plugin -r :maven-javadoc-plugin
|
||||
|
||||
%pom_remove_plugin -r :flatten-maven-plugin
|
||||
popd
|
||||
|
||||
# Use compiler release flag when building on JDK >8 for correct cross-compiling
|
||||
%pom_xpath_inject pom:project "
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>jdk-release-flag</id>
|
||||
<activation>
|
||||
<jdk>[9,)</jdk>
|
||||
</activation>
|
||||
<properties>
|
||||
<maven.compiler.release>8</maven.compiler.release>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>"
|
||||
|
||||
%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
|
||||
%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/%{name}
|
||||
|
||||
%jpackage_script aQute.bnd.main.bnd "" "" aqute-bnd:slf4j/slf4j-api:slf4j/slf4j-simple:jline/jline:jansi/jansi:osgi-annotation:osgi-core:osgi-compendium bnd 1
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE
|
||||
%{_bindir}/bnd
|
||||
%config(noreplace) %{_sysconfdir}/ant.d/*
|
||||
|
||||
%files -n aqute-bndlib -f .mfiles-bndlib
|
||||
%license LICENSE
|
||||
|
||||
%files -n bnd-maven-plugin -f .mfiles-maven
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Tue Jul 28 2020 Mat Booth <mat.booth@redhat.com> - 4.3.1-1
|
||||
- Update to latest 4.x release
|
||||
|
||||
* Mon Jul 27 2020 Mat Booth <mat.booth@redhat.com> - 4.3.0-1
|
||||
- Update to upstream version 4.3.0
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 21 2020 Mat Booth <mat.booth@redhat.com> - 3.5.0-10
|
||||
- Fix NIO linkage error when running on Java 8 due to incorrect cross-compilation
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.5.0-9
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Apr 12 2019 Marian Koncek <mkoncek@redhat.com> - 3.5.0-6
|
||||
- Port to OSGI 7.0.0
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 3.5.0-4
|
||||
- Add requirement on javapackages-tools for bnd script.
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Oct 13 2017 Michael Simacek <msimacek@redhat.com> - 3.5.0-1
|
||||
- Update to upstream version 3.5.0
|
||||
|
||||
* Mon Oct 02 2017 Troy Dawson <tdawson@redhat.com> - 3.4.0-3
|
||||
- Cleanup spec file conditionals
|
||||
|
||||
* Sat Sep 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-2
|
||||
- Remove unneeded javadoc plugin
|
||||
|
||||
* Tue Sep 12 2017 Michael Simacek <msimacek@redhat.com> - 3.4.0-1
|
||||
- Update to upstream version 3.4.0
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Oct 10 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-5
|
||||
- Don't use legacy Ant artifact coordinates
|
||||
|
||||
* Mon Oct 10 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-4
|
||||
- Allow conditional builds without Ant tasks
|
||||
|
||||
* Mon Oct 10 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-3
|
||||
- Allow conditional builds without Maven plugin
|
||||
|
||||
* Thu Oct 06 2016 Michael Simacek <msimacek@redhat.com> - 3.3.0-2
|
||||
- Fix ant.d classpath
|
||||
|
||||
* Thu Sep 29 2016 Michael Simacek <msimacek@redhat.com> - 3.3.0-1
|
||||
- Update to upstream version 3.3.0
|
||||
- Build against osgi-{core,compendium}
|
||||
|
||||
* Tue Sep 27 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-5
|
||||
- Add felix-scr-annotations to classpath
|
||||
|
||||
* Mon Sep 26 2016 Michael Simacek <msimacek@redhat.com> - 3.2.0-4
|
||||
- Use felix-annotations
|
||||
|
||||
* Wed Sep 14 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-3
|
||||
- Build and install Maven plugins
|
||||
- Resolves: rhbz#1375904
|
||||
|
||||
* Wed Jun 1 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-2
|
||||
- Install ant.d config files
|
||||
|
||||
* Tue May 24 2016 Michael Simacek <msimacek@redhat.com> - 3.2.0-1
|
||||
- Update to upstream version 3.2.0
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jul 17 2015 Michael Simacek <msimacek@redhat.com> - 2.4.1-2
|
||||
- Fix Tool header generation
|
||||
|
||||
* Wed Jul 08 2015 Michael Simacek <msimacek@redhat.com> - 2.4.1-1
|
||||
- Update to upstream version 2.4.1
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu May 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.363-15
|
||||
- Disable javadoc doclint
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Thu May 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.363-13
|
||||
- Use .mfiles generated during build
|
||||
|
||||
* Fri May 09 2014 Jaromir Capik <jcapik@redhat.com> - 0.0.363-12
|
||||
- Fixing ambiguous base64 class
|
||||
|
||||
* Fri May 09 2014 Gil Cattaneo <puntogil@libero.it> 0.0.363-11
|
||||
- fix rhbz#991985
|
||||
- add source compatibility with ant 1.9
|
||||
- remove and rebuild from source aQute.runtime.jar
|
||||
- update to current packaging guidelines
|
||||
|
||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.0.363-10
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Wed Apr 25 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.0.363-6
|
||||
- Get rid of unusable eclipse plugins to simplify dependencies
|
||||
|
||||
* Fri Mar 02 2012 Jaromir Capik <jcapik@redhat.com> - 0.0.363-5
|
||||
- Fixing build failures on f16 and later
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.363-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Thu Sep 22 2011 Jaromir Capik <jcapik@redhat.com> - 0.0.363-3
|
||||
- Resurrection of bundled non-class files
|
||||
|
||||
* Thu Sep 22 2011 Jaromir Capik <jcapik@redhat.com> - 0.0.363-2
|
||||
- Bundled classes removed
|
||||
- jpackage-utils dependency added to the javadoc subpackage
|
||||
|
||||
* Wed Sep 21 2011 Jaromir Capik <jcapik@redhat.com> - 0.0.363-1
|
||||
- Initial version (cloned from aqute-bndlib 0.0.363)
|
46
parent.pom
Normal file
46
parent.pom
Normal file
@ -0,0 +1,46 @@
|
||||
<?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>@VERSION@</version>
|
||||
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>aQute.libg</module>
|
||||
<module>biz.aQute.bndlib</module>
|
||||
<module>biz.aQute.bnd</module>
|
||||
<module>biz.aQute.bnd.annotation</module>
|
||||
<module>biz.aQute.bnd.exporters</module>
|
||||
<module>biz.aQute.bnd.reporter</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.8.1</version>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
6
repack-tarball.sh
Executable file
6
repack-tarball.sh
Executable file
@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
VERSION=`sed -rn 's/^Version:\s*([0-9.]+)/\1/p' aqute-bnd.spec`
|
||||
wget https://github.com/bndtools/bnd/archive/$VERSION.REL.tar.gz
|
||||
gunzip $VERSION.REL.tar.gz
|
||||
tar tf $VERSION.REL.tar | grep -E '\.(.ar|exe|tar\.(gz|bz2|xz)|zip)$' | xargs tar --delete --file $VERSION.REL.tar
|
||||
gzip $VERSION.REL.tar
|
7
sources
Normal file
7
sources
Normal file
@ -0,0 +1,7 @@
|
||||
SHA512 (4.3.1.REL.tar.gz) = 103d5cba7a7f62b845c362001717eac0409b801813464252d5d4f8dd2aadd24f61e278309e92ba5dc20acc1940ba99b25b26bfa8437560169a84e34751d84ca1
|
||||
SHA512 (aQute.libg-4.3.1.pom) = 63b17d0519224e872007e5327e4743494b0654c43caab1204831f707f45a64c1691d92e0bccefc490476ab832f74dea871944251dadd037a74f0eba8ad7e640b
|
||||
SHA512 (biz.aQute.bnd-4.3.1.pom) = fa4ab223840ccb089ec2e2fc9bcf23849ead09ba9119c8e56047464bca6116c3a159b53d2b8374a057a77c9968ba852b2b10c6bd0a77e66043a4ddad761a6cb5
|
||||
SHA512 (biz.aQute.bnd.annotation-4.3.1.pom) = 24fd9ad310177edf65ad9ef3b890834dc46c7fd86071d3afef47b24a5bbc4f2d08d4d5c376b6e49699bdf38e35d719267f5ffc3e5537ddcf52fc94ab9427a0e4
|
||||
SHA512 (biz.aQute.bnd.exporters-4.3.1.pom) = 95303ed421f9514165ac8cd077ba7391852a3d195ab6603b2425fc5a5cdcd0a768ea746cfcf2d0ffa0d9c8f4de5c7a1856b361b9ddf1fd11ce69b73cde3e5f97
|
||||
SHA512 (biz.aQute.bndlib-4.3.1.pom) = ba8d535afdb94a2d74c67bd954216cccfd08a2f674dae959a9cd3df3a3d66248000b959c696b59f22b12f29f34bdda2e60a3d20880190d33f61abedef955cb91
|
||||
SHA512 (biz.aQute.bnd.reporter-4.3.1.pom) = 41181d44d01205679ea62f62dd57480a554e20b7c55470fd8d2204bbbeb6856e9728d826359c859f508f029551edfb9edb30d6a96110916e05d65eb917ee17b9
|
Loading…
Reference in New Issue
Block a user