Bug#939601: Can't build bnd from salsa
Mechtilde Stehmann
mechtilde at debian.org
Sat Sep 7 13:45:36 BST 2019
Hello Gregor,
thanks for the hint to install grandle-debian-helper on the local machine.
I wonder why I also installed 'bnd' as a dependency. So I must have a
bnd package to install gradle-debian-helper?
There is a message about
I: using cowbuilder as pbuilder
dpkg-checkbuilddeps: error: Unmet build dependencies: libfindbugs-ant-java
W: Unmet build-dependency in source
The last message is dpkg-source: error: aborting due to unexpected
upstream changes, see /tmp/bnd_3.5.0-4.diff.icqGLK
dpkg-source: info: you can integrate the local changes with dpkg-source
--commit
gbp:error: 'git-pbuilder' failed: it exited with 2
Then it aborts. I attach the file from /tmp.
Kind regards
--
Mechtilde Stehmann
## Debian Developer
## PGP encryption welcome
## F0E3 7F3D C87A 4998 2899 39E7 F287 7BBA 141A AD7F
-------------- next part --------------
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
bnd (3.5.0-4) unstable; urgency=medium
.
* Fixed the build failure with Java 11 (Closes: #912231)
* Fixed the build failure caused by gradle-debian-helper 2.0.1
* Ignore the dependency on xml-apis
* Use salsa.debian.org Vcs-* URLs
Author: Emmanuel Bourg <ebourg at apache.org>
Bug-Debian: https://bugs.debian.org/912231
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2019-09-07
--- bnd-3.5.0.orig/aQute.libg/bnd.bnd
+++ bnd-3.5.0/aQute.libg/bnd.bnd
@@ -3,8 +3,8 @@
-buildpath: \
slf4j.api;version=latest,\
- osgi.core;version=latest,\
- osgi.cmpn;version=latest
+ org.osgi.util.function;version=latest,\
+ org.osgi.util.promise;version=latest
-testpath: \
${junit}
@@ -13,6 +13,7 @@ Export-Package: aQute.lib.*, aQute.libg.
Bundle-Description: A library to be statically linked. Contains many small utilities. This bundle \
should not be installed in a framework, it is compile only.
+-baseline: *
-sources= true
-fixupmessages.baseline: The bundle version * is too low
--- bnd-3.5.0.orig/aQute.libg/src/aQute/lib/collections/SortedList.java
+++ bnd-3.5.0/aQute.libg/src/aQute/lib/collections/SortedList.java
@@ -465,7 +465,4 @@ public class SortedList<T> implements So
return (SortedSet<T>) EMPTY;
}
- public java.util.Spliterator<T> spliterator() {
- return SortedSet.super.spliterator();
- }
}
--- bnd-3.5.0.orig/biz.aQute.bnd.gradle/build.gradle
+++ bnd-3.5.0/biz.aQute.bnd.gradle/build.gradle
@@ -15,6 +15,13 @@ dependencies {
compileOnly 'org.gradle:gradle-native:2.0'
compileOnly 'org.codehaus.groovy:groovy-all:2.3.3'
compileOnly 'org.slf4j:slf4j-api:1.7.5'
+
+ testCompile gradleTestKit()
+ testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
+ exclude module: 'groovy-all'
+ }
+ testCompile localGroovy()
+ testCompile gradleApi()
}
test {
--- bnd-3.5.0.orig/biz.aQute.bnd/bnd.bnd
+++ bnd-3.5.0/biz.aQute.bnd/bnd.bnd
@@ -36,12 +36,14 @@ Bundle-Description: This command line ut
-dependson: biz.aQute.bnd.embedded-repo
-buildpath: \
- aQute.libg;version=project,\
+ aQute.libg;version=latest,\
biz.aQute.bnd.annotation;version=project,\
biz.aQute.bndlib;version=project,\
- ant;version=latest,\
- osgi.core;version=latest,\
- osgi.cmpn;version=latest,\
+ org.apache.ant:ant;version=latest,\
+ org.osgi.service.component.annotations;version=latest,\
+ org.osgi.service.metatype.annotations;version=latest,\
+ osgi.core;version=6.0,\
+ osgi.cmpn;version=6.0,\
org.osgi.impl.bundle.bindex;version=latest,\
biz.aQute.repository;version=latest,\
biz.aQute.resolve;version=latest,\
--- bnd-3.5.0.orig/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
+++ bnd-3.5.0/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<String,Object> antProps = getProject().getProperties();
+ Hashtable<Object,Object> antProps = getProject().getProperties();
projectProperties.putAll(antProps);
projectProperties.putAll(builder.getProperties());
builder.setProperties(projectProperties);
--- bnd-3.5.0.orig/biz.aQute.bndlib/bnd.bnd
+++ bnd-3.5.0/biz.aQute.bndlib/bnd.bnd
@@ -48,11 +48,13 @@ Conditional-Package: aQute.servi
-includeresource: ${workspace}/LICENSE, img/=img/, {readme.md}
-buildpath: \
- osgi.annotation;version=latest,\
- osgi.core;version=latest,\
+ org.osgi.service.component.annotations;version=latest,\
+ org.osgi.service.metatype.annotations;version=latest,\
+ osgi.annotation;version=6.0.1,\
+ osgi.core;version=@6,\
org.osgi.util.function;version=latest,\
org.osgi.util.promise;version=latest,\
- osgi.cmpn;version=latest,\
+ osgi.cmpn;version=@6,\
aQute.libg;version=project, \
biz.aQute.bnd.annotation;version=project,\
slf4j.api;version=latest
@@ -66,6 +68,7 @@ Bundle-Icon: img/bnd-64.png;size=64
Bundle-Developers: peter.kriens at aQute.biz, njbartlett at gmail.com
Bundle-Contributors: per.kristian.soreide at comactivity.net, ferry.huberts at pelagic.nl, bj at bjhargrave.com
+-baseline: *
-fixupmessages: "Export aQute.bnd.http"
-fixupmessages.baseline: The bundle version * is too low
--- bnd-3.5.0.orig/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
+++ bnd-3.5.0/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
@@ -1166,11 +1166,8 @@ public class Project extends Processor {
File file = plugin.get(bsn, version, attrs, blocker);
// and the entry must exist
// if it does, return this as a result
- if (file != null) {
+ if (file != null)
return toContainer(bsn, range, attrs, file, blocker);
- } else {
- System.err.println("Missing: " + bsn + " " + range);
- }
}
}
}
--- bnd-3.5.0.orig/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java
+++ bnd-3.5.0/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java
@@ -485,6 +485,7 @@ public class Workspace extends Processor
}
}
}
+ error("Couldn't find biz.aQute.bnd.embedded-repo on the classpath");
return false;
} else
return false;
--- bnd-3.5.0.orig/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
+++ bnd-3.5.0/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
@@ -704,7 +704,7 @@ public class Analyzer extends Processor
main.putValue(CREATED_BY,
System.getProperty("java.version") + " (" + System.getProperty("java.vendor") + ")");
main.putValue(TOOL, "Bnd-" + getBndVersion());
- main.putValue(BND_LASTMODIFIED, "" + (System.getenv("SOURCE_DATE_EPOCH") != null ? System.getenv("SOURCE_DATE_EPOCH") + "000" : System.currentTimeMillis()));
+ main.putValue(BND_LASTMODIFIED, "" + System.currentTimeMillis());
}
String exportHeader = printClauses(exports, true);
--- bnd-3.5.0.orig/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java
+++ bnd-3.5.0/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java
@@ -487,7 +487,7 @@ public class Jar implements Closeable {
return;
JarEntry ze = new JarEntry(manifestName);
- ZipUtil.setModifiedTime(ze, System.getenv("SOURCE_DATE_EPOCH") != null ? 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")) : lastModified);
+ ZipUtil.setModifiedTime(ze, lastModified);
jout.putNextEntry(ze);
writeManifest(jout);
jout.closeEntry();
@@ -696,9 +696,6 @@ public class Jar implements Closeable {
ZipEntry ze = new ZipEntry(path);
ze.setMethod(ZipEntry.DEFLATED);
long lastModified = resource.lastModified();
- if (System.getenv("SOURCE_DATE_EPOCH") != null) {
- lastModified = 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"));
- }
if (lastModified == 0L) {
lastModified = System.currentTimeMillis();
}
@@ -721,9 +718,6 @@ public class Jar implements Closeable {
return;
createDirectories(directories, zip, path);
ZipEntry ze = new ZipEntry(path + '/');
- if (System.getenv("SOURCE_DATE_EPOCH") != null) {
- ZipUtil.setModifiedTime(ze, 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
- }
zip.putNextEntry(ze);
zip.closeEntry();
directories.add(path);
--- bnd-3.5.0.orig/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java
+++ bnd-3.5.0/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java
@@ -528,9 +528,6 @@ public class Macro {
public Object _now(String args[]) {
verifyCommand(args, _nowHelp, null, 1, 2);
Date now = new Date();
- if (System.getenv("SOURCE_DATE_EPOCH") != null) {
- now = new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
- }
if (args.length == 2) {
if ("long".equals(args[1]))
@@ -750,9 +747,6 @@ public class Macro {
public String _tstamp(String args[]) {
String format = "yyyyMMddHHmm";
long now = System.currentTimeMillis();
- if (System.getenv("SOURCE_DATE_EPOCH") != null) {
- now = 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"));
- }
TimeZone tz = TimeZone.getTimeZone("UTC");
if (args.length > 1) {
--- bnd-3.5.0.orig/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java
+++ bnd-3.5.0/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java
@@ -10,7 +10,7 @@ import aQute.bnd.header.Attrs;
import aQute.bnd.osgi.Descriptors.PackageRef;
public class Packages implements Map<PackageRef,Attrs> {
- private Map<PackageRef,Attrs> map;
+ private LinkedHashMap<PackageRef,Attrs> map;
static Map<PackageRef,Attrs> EMPTY = Collections.emptyMap();
public static enum QUERY {
@@ -19,7 +19,7 @@ public class Packages implements Map<Pac
public Packages(Packages other) {
if (other.map != null) {
- map = new java.util.TreeMap<Descriptors.PackageRef,Attrs>(other.map);
+ map = new LinkedHashMap<Descriptors.PackageRef,Attrs>(other.map);
}
}
@@ -108,7 +108,7 @@ public class Packages implements Map<Pac
public Attrs put(PackageRef key, Attrs value) {
if (map == null)
- map = new java.util.TreeMap<PackageRef,Attrs>();
+ map = new LinkedHashMap<PackageRef,Attrs>();
return map.put(key, value);
}
@@ -117,7 +117,7 @@ public class Packages implements Map<Pac
if (this.map == null) {
if (map.isEmpty())
return;
- this.map = new java.util.TreeMap<PackageRef,Attrs>();
+ this.map = new LinkedHashMap<PackageRef,Attrs>();
}
this.map.putAll(map);
}
--- bnd-3.5.0.orig/biz.aQute.junit/bnd.bnd
+++ bnd-3.5.0/biz.aQute.junit/bnd.bnd
@@ -2,8 +2,8 @@
-include: ${workspace}/cnf/eclipse/jdt.bnd
-buildpath: \
- osgi.core;version=latest,\
- osgi.cmpn;version=latest,\
+ osgi.core;version=4.2,\
+ osgi.cmpn;version=4.2,\
biz.aQute.bndlib;version=project,\
aQute.libg;version=project,\
${junit}
@@ -30,4 +30,5 @@ Bundle-Activator: aQute.junit.Activator
Embedded-Activator: aQute.junit.Activator
Bundle-Release: Use main thread for testing, optionally allowing old separate thread model
+-baseline: *
-diffpackages: !org.junit.*, *
--- bnd-3.5.0.orig/biz.aQute.launcher/bnd.bnd
+++ bnd-3.5.0/biz.aQute.launcher/bnd.bnd
@@ -5,7 +5,7 @@
-buildpath: biz.aQute.bndlib;version=project,\
aQute.libg;version=project,\
- osgi.core;version=latest,\
+ osgi.core;version=4.2,\
slf4j.api;version=latest
-testpath: \
@@ -21,3 +21,4 @@ Conditional-Package: aQute.lib*
Premain-Class: aQute.launcher.agent.LauncherAgent
+-baseline: *
--- bnd-3.5.0.orig/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
+++ bnd-3.5.0/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
@@ -385,20 +385,16 @@ public class Context extends URLClassLoa
}
@Override
- public ServiceRegistration<?> registerService(String[] clazzes, Object service, Dictionary<String,?> properties) {
+ public ServiceRegistration registerService(String[] clazzes, Object service, Dictionary properties) {
return null;
}
@Override
- public ServiceRegistration<?> registerService(String clazz, Object service, Dictionary<String,?> properties) {
+ public ServiceRegistration registerService(String clazz, Object service, Dictionary properties) {
return null;
}
- public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ? > properties) {
- return null;
- }
-
- public <S> ServiceRegistration<S> registerService(Class<S> clazz, org.osgi.framework.ServiceFactory<S> factory, Dictionary<String, ? > properties) {
+ public ServiceRegistration registerService(Class< ? > clazz, Object service, Dictionary<String, ? > properties) {
return null;
}
@@ -406,7 +402,7 @@ public class Context extends URLClassLoa
return null;
}
- public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter)
+ public <S> Collection<ServiceReference> getServiceReferences(Class<S> clazz, String filter)
throws InvalidSyntaxException {
return null;
}
@@ -428,8 +424,4 @@ public class Context extends URLClassLoa
public <A> A adapt(Class<A> type) {
return null;
}
-
- public <S> org.osgi.framework.ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
- return null;
- }
}
--- bnd-3.5.0.orig/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
+++ bnd-3.5.0/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
@@ -52,11 +52,6 @@ public class MiniFramework implements Fr
}
@Override
- public void init(FrameworkListener... listeners) throws BundleException {
- init();
- }
-
- @Override
public FrameworkEvent waitForStop(long timeout) throws InterruptedException {
long deadline = System.currentTimeMillis() + timeout;
@@ -357,12 +352,7 @@ public class MiniFramework implements Fr
return null;
}
- public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ? > properties) {
- return null;
- }
-
- @Override
- public <S> ServiceRegistration<S> registerService(Class<S> clazz, org.osgi.framework.ServiceFactory<S> factory, Dictionary<String, ? > properties) {
+ public <S> ServiceRegistration registerService(Class<S> clazz, S service, Dictionary<String, ? > properties) {
return null;
}
@@ -370,7 +360,7 @@ public class MiniFramework implements Fr
return null;
}
- public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter)
+ public <S> Collection<ServiceReference> getServiceReferences(Class<S> clazz, String filter)
throws InvalidSyntaxException {
return null;
}
@@ -392,8 +382,4 @@ public class MiniFramework implements Fr
public <A> A adapt(Class<A> type) {
return null;
}
-
- public <S> org.osgi.framework.ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
- return null;
- }
}
--- bnd-3.5.0.orig/biz.aQute.remote/bnd.bnd
+++ bnd-3.5.0/biz.aQute.remote/bnd.bnd
@@ -7,8 +7,8 @@
aQute.agent.server.port = 29998
-buildpath: \
- osgi.core;version=latest,\
- osgi.cmpn;version=latest,\
+ osgi.core;version=@6,\
+ osgi.cmpn;version=@6,\
aQute.libg;version=latest,\
biz.aQute.bndlib;version=latest,\
biz.aQute.junit;version=latest,\
@@ -29,3 +29,4 @@ Conditional-Package: aQute.lib*, aQute.c
#
-nojunit: true
+-baseline: *
--- bnd-3.5.0.orig/biz.aQute.remote/src/aQute/remote/agent/RedirectOutput.java
+++ bnd-3.5.0/biz.aQute.remote/src/aQute/remote/agent/RedirectOutput.java
@@ -32,13 +32,13 @@ public class RedirectOutput extends Prin
}
public RedirectOutput(List<AgentServer> agents, PrintStream out, boolean err) {
- super(out == null ? out = _nullOutputStream() : out);
+ super(out == null ? out = nullOutputStream() : out);
this.agents = agents;
this.out = out;
this.err = err;
}
- private static PrintStream _nullOutputStream() {
+ private static PrintStream nullOutputStream() {
return new PrintStream(new NullOutputStream());
}
--- bnd-3.5.0.orig/biz.aQute.repository/bnd.bnd
+++ bnd-3.5.0/biz.aQute.repository/bnd.bnd
@@ -11,22 +11,26 @@ jetty.libs: org.apache.geronimo.specs.ge
org.eclipse.jetty.util;version=7.6.3
-buildpath: \
- osgi.annotation;version=latest,\
- osgi.core;version=latest,\
+ osgi.annotation;version=6.0.1,\
+ osgi.core;version=@6,\
org.osgi.util.function;version=latest,\
org.osgi.util.promise;version=latest,\
aQute.libg;version=project,\
biz.aQute.bndlib;version=latest,\
org.osgi.impl.bundle.bindex;version=latest;packages=org.osgi.*.bindex.*,\
org.osgi.impl.bundle.repoindex.lib;version=latest,\
- osgi.cmpn;version=latest,\
+ osgi.cmpn;version=@6,\
+ javax.xml.stream;version=latest,\
slf4j.api;version=latest,\
+ aQute.jpm.clnt;version=latest;packages=*,\
org.tukaani.xz;version=latest,\
biz.aQute.bnd.annotation;version=latest
-testpath: \
${junit},\
${mockito},\
+ ${jetty.libs},\
+ biz.aQute.http.testservers;version=latest,\
slf4j.simple;version=latest
bindex-pkgs: \
@@ -96,3 +100,4 @@ Import-Package:\
-fixupmessages: "private references"
+-baseline: *
--- bnd-3.5.0.orig/biz.aQute.resolve/bnd.bnd
+++ bnd-3.5.0/biz.aQute.resolve/bnd.bnd
@@ -1,8 +1,8 @@
# Set javac settings from JDT prefs
-include: ${workspace}/cnf/eclipse/jdt.bnd
--buildpath: osgi.core;version=latest,\
- osgi.cmpn;version=latest, \
+-buildpath: osgi.core;version=@5,\
+ osgi.cmpn;version=@5, \
aQute.libg;version=latest,\
biz.aQute.bndlib;version=snapshot,\
biz.aQute.repository;version=snapshot,\
@@ -27,3 +27,4 @@ Conditional-Package: aQute.lib*
-fixupmessages: private references
+-baseline: *
--- bnd-3.5.0.orig/biz.aQute.tester/bnd.bnd
+++ bnd-3.5.0/biz.aQute.tester/bnd.bnd
@@ -34,7 +34,8 @@ Conditional-Package: aQute.lib*
-buildpath: \
biz.aQute.junit;version=latest;packages=aQute.junit.*, \
- osgi.core;version=latest,\
+ osgi.core;version=4.2,\
biz.aQute.bndlib;version=latest,\
${junit}
+-baseline: *
--- bnd-3.5.0.orig/cnf/eclipse/jdt.bnd
+++ bnd-3.5.0/cnf/eclipse/jdt.bnd
@@ -1,4 +1,4 @@
-include: ${project}/.settings/org.eclipse.jdt.core.prefs
-javac.source = 8
-javac.target = 8
-javac.compliance = 8
+javac.source = ${org.eclipse.jdt.core.compiler.source}
+javac.target = ${org.eclipse.jdt.core.compiler.codegen.targetPlatform}
+javac.compliance = ${org.eclipse.jdt.core.compiler.compliance}
--- bnd-3.5.0.orig/cnf/ext/junit.bnd
+++ bnd-3.5.0/cnf/ext/junit.bnd
@@ -1,3 +1,4 @@
-junit: org.apache.servicemix.bundles.junit;version=latest
-mockito:
+junit: org.apache.servicemix.bundles.junit;version="[4.11,5)"
+mockito: org.mockito.mockito-core;version="[1.9,2)",\
+ org.objenesis;version="[2.1,3)"
-runsystempackages.objenesis: sun.misc,sun.reflect
--- bnd-3.5.0.orig/cnf/ext/repositories.bnd
+++ bnd-3.5.0/cnf/ext/repositories.bnd
@@ -4,6 +4,7 @@ baselinerepo: https://dl.bintr
-plugin:\
aQute.bnd.repository.maven.provider.MavenBndRepository;\
+ releaseUrl="https://repo1.maven.org/maven2";\
index=${.}/central.mvn;\
name='Maven Central';\
readOnly=true,\
@@ -17,6 +18,7 @@ baselinerepo: https://dl.bintr
aQute.bnd.signing.JartoolSigner, \
aQute.bnd.repository.osgi.OSGiRepository; \
name='Baseline'; \
+ locations=${baselinerepo}/index.xml.gz; \
poll.time=-1; \
cache=${workspace}/cnf/cache/stable/Baseline
--- bnd-3.5.0.orig/org.osgi.impl.bundle.repoindex.api/bnd.bnd
+++ bnd-3.5.0/org.osgi.impl.bundle.repoindex.api/bnd.bnd
@@ -3,5 +3,6 @@
Export-Package: org.osgi.service.indexer
-buildpath: \
- osgi.annotation;version=latest
+ osgi.annotation;version=6.0.1
+-baseline: *
--- bnd-3.5.0.orig/org.osgi.impl.bundle.repoindex.lib/bnd.bnd
+++ bnd-3.5.0/org.osgi.impl.bundle.repoindex.lib/bnd.bnd
@@ -3,8 +3,8 @@
-buildpath: \
org.osgi.impl.bundle.repoindex.api;version=project,\
- osgi.core;version=latest,\
- osgi.cmpn;version=latest
+ osgi.core;version=4.3.1,\
+ osgi.cmpn;version=4.3.1
-testpath: \
${junit},\
${mockito}
@@ -33,3 +33,4 @@ Export-Package: \
org.osgi.service.indexer.impl.types,\
org.osgi.service.indexer.impl.util
+-baseline: *
--- bnd-3.5.0.orig/settings.gradle
+++ bnd-3.5.0/settings.gradle
@@ -6,12 +6,11 @@
buildscript {
repositories {
maven {
- url '/usr/share/maven-repo'
+ url uri(bnd_repourl)
}
}
dependencies {
- classpath fileTree(dir: 'bootstrap', include: ['*.jar'])
- classpath 'org.osgi:osgi.cmpn:debian'
+ classpath bnd_plugin
}
/* Since the files in the repository change with each build, we need to recheck for changes */
configurations.classpath {
@@ -31,10 +30,8 @@ buildscript {
def bndPlugin = files(configurations.classpath.files)
gradle.projectsLoaded { gradle ->
gradle.rootProject.buildscript {
- repositories { maven { url 'file:///usr/share/maven-repo' } }
dependencies {
- classpath fileTree(dir: 'bootstrap', include: ['*.jar'])
- classpath 'org.osgi:osgi.cmpn:debian'
+ classpath bndPlugin
}
}
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-maintainers/attachments/20190907/bc976e6d/attachment-0001.sig>
More information about the pkg-java-maintainers
mailing list