1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131
|
From: Markus Koschany <apo@debian.org>
Date: Thu, 14 May 2015 13:21:39 +0200
Subject: no ee.j2se
We already ship a full-blown JDK in Debian.
Forwarded: not-needed
--- a/aQute.libg/bnd.bnd
+++ b/aQute.libg/bnd.bnd
@@ -1,5 +1,4 @@
--buildpath: \
- ee.j2se;version=${javac.ee}
+-buildpath:
-testpath: \
com.springsource.junit
--- a/biz.aQute.bnd/bnd.bnd
+++ b/biz.aQute.bnd/bnd.bnd
@@ -43,7 +43,6 @@
biz.aQute.launcher
-buildpath: aQute.libg;version=latest,\
- ee.j2se;version=${javac.ee},\
biz.aQute.bndlib;version=project,\
org.apache.tools.ant,\
org.osgi.service.component.annotations;version=6.0.0,\
--- a/biz.aQute.bndlib.tests/bnd.bnd
+++ b/biz.aQute.bndlib.tests/bnd.bnd
@@ -10,7 +10,6 @@
osgi.core;version=@5,\
osgi.cmpn;version=@4.3.1,\
junit.osgi;version=3.8.2,\
- ee.j2se;version=${javac.ee},\
org.mockito.mockito-all;version=1.9.0
-runtrace: true
--- a/biz.aQute.jpm/bnd.bnd
+++ b/biz.aQute.jpm/bnd.bnd
@@ -24,7 +24,6 @@
Bundle-Version: 1.0.2
-buildpath: aQute.libg;version=project,\
- ee.j2se;version=${javac.ee},\
biz.aQute.bndlib;version=latest,\
aQute.jpm.clnt;version=2.1, \
lib/WinRun4J.jar;version=file
--- a/biz.aQute.launcher/bnd.bnd
+++ b/biz.aQute.launcher/bnd.bnd
@@ -4,8 +4,7 @@
-buildpath: biz.aQute.bndlib;version=project,\
aQute.libg;version=project,\
- osgi.core;version=4.3.1,\
- ee.j2se;version=${javac.ee}
+ osgi.core;version=4.3.1
-testpath: \
junit.osgi;version=3.8.2
--- a/biz.aQute.repository/bnd.bnd
+++ b/biz.aQute.repository/bnd.bnd
@@ -17,7 +17,6 @@
osgi.cmpn;version=4.3.1,\
osgi.r5;version=1.0.1,\
javax.xml.stream-1.0.1.jar;version=file,\
- ee.j2se;version=${javac.ee},\
${jetty.libs},\
aQute.jpm.bndrepo;version=1.0
-testpath: \
--- a/biz.aQute.resolve/bnd.bnd
+++ b/biz.aQute.resolve/bnd.bnd
@@ -8,7 +8,6 @@
osgi.r5;version=1.0.1,\
biz.aQute.bndlib;version=snapshot,\
biz.aQute.repository;version=snapshot,\
- ee.j2se;version=${javac.ee},\
org.apache.felix.resolver;version=1.1,\
osgi.cmpn;version=4.3.1
-testpath: \
--- a/biz.aQute.bnd.annotation/bnd.bnd
+++ b/biz.aQute.bnd.annotation/bnd.bnd
@@ -5,5 +5,4 @@
Export-Package: aQute.bnd.annotation.*
-buildpath: \
- ee.j2se;version=${javac.ee},\
biz.aQute.bndlib;version=project
--- a/biz.aQute.bnd.gradle/bnd.bnd
+++ b/biz.aQute.bnd.gradle/bnd.bnd
@@ -10,7 +10,6 @@
Bundle-Description: The bnd gradle plugin.
-buildpath: \
- ee.j2se;version=${javac.ee}, \
aQute.libg;version=latest, \
biz.aQute.bndlib;version=latest
--- a/biz.aQute.bnd.test/bnd.bnd
+++ b/biz.aQute.bnd.test/bnd.bnd
@@ -5,7 +5,6 @@
-buildpath: \
- ee.j2se;version=${javac.ee},\
aQute.libg;version=project,\
biz.aQute.bndlib;version=project,\
osgi.core;version=4.3.1,\
--- a/biz.aQute.bnd.testextension/bnd.bnd
+++ b/biz.aQute.bnd.testextension/bnd.bnd
@@ -3,5 +3,4 @@
Extension-Activator: aQute.bnd.ext.test.TestExtension
-buildpath: \
- ee.j2se;version=${javac.ee},\
biz.aQute.bndlib;version=project
--- a/org.osgi.impl.bundle.repoindex.api/bnd.bnd
+++ b/org.osgi.impl.bundle.repoindex.api/bnd.bnd
@@ -1,5 +1,4 @@
Bundle-Version: 2.0.1.${tstamp}
Export-Package: org.osgi.service.indexer
-buildpath: \
- ee.j2se;version=${javac.ee},\
biz.aQute.bnd.annotation;version=latest
--- a/org.osgi.impl.bundle.repoindex.lib/bnd.bnd
+++ b/org.osgi.impl.bundle.repoindex.lib/bnd.bnd
@@ -1,6 +1,5 @@
-buildpath: \
org.osgi.impl.bundle.repoindex.api;version=project,\
- ee.j2se;version=${javac.ee},\
osgi.core;version=4.3.1,\
osgi.cmpn;version=4.3.1
-testpath: \
|