Revert "move defaults.bnd & java.bnd to build.bnd"

This reverts commit 0d39c74.
bndtools · Nov 28, 2023 · 3a9da0a · 3a9da0a
1 parent 29fa515
commit 3a9da0a
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 43 deletions.
diff --git a/cnf/build.bnd b/cnf/build.bnd
@@ -1,49 +1,7 @@
+
 Bundle-Version:             1.0.0.${tstamp}
 
 -remoteworkspace        true
 -runfw:                 org.apache.felix.framework
 -runee:                 JavaSE-17
 
-javac.source:           17
-javac.target:           17
-javac.compliance:       17
-javac.debug:            on
-
-# the driver-variable (see https://bnd.bndtools.org/macros/driver.html) 
-# helps to build to different folders e.g. depending on if Eclipse builds 
-# or e.g. gradle builds. 
-# that avoids conflicts between gradle and eclipse build
-# target-dir: dir specifies where build places the .jar and classes
-target-dir              generated${if;${driver;eclipse};;/${driver}}
-src                     src/main/java, src/main/resources
-testsrc                 src/test/java
-bin                     ${target-dir}/classes
-testbin                 ${target-dir}/test-classes
-
--plugin.10.build: \
-    aQute.bnd.repository.maven.provider.MavenBndRepository; \
-        snapshotUrl="https://oss.sonatype.org/content/repositories/snapshots/"; \
-        releaseUrl=https://repo.maven.apache.org/maven2/; \
-        index=${.}/build.mvn; \
-        readOnly=true; \
-        name="OSGI R8 - Build"
-
--plugin.20.runtime: \
-    aQute.bnd.repository.maven.provider.MavenBndRepository; \
-        snapshotUrl="https://oss.sonatype.org/content/repositories/snapshots/"; \
-        releaseUrl="https://repo.maven.apache.org/maven2/"; \
-        index=${.}/runtime.mvn; \
-        readOnly=true; \
-        name="OSGI R8 - Runtime Distro"
-
-
--runsystemcapabilities.dflt:    ${native_capability}
-
-debug-bundles: \
-    osgi.identity;filter:='(osgi.identity=osgi.enroute.webconsole.xray.provider)',\
-    osgi.implementation;filter:='(osgi.implementation=osgi.metatype)',\
-    osgi.implementation;filter:='(osgi.implementation=osgi.event)',\
-    osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
-    osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)', \
-    osgi.identity;filter:='(osgi.identity=org.apache.felix.webconsole.plugins.ds)'
-
diff --git a/cnf/ext/defaults.bnd b/cnf/ext/defaults.bnd
@@ -0,0 +1,39 @@
+-plugin.10.build: \
+    aQute.bnd.repository.maven.provider.MavenBndRepository; \
+        snapshotUrl="https://oss.sonatype.org/content/repositories/snapshots/"; \
+        releaseUrl=https://repo.maven.apache.org/maven2/; \
+        index=${.}/build.mvn; \
+        readOnly=true; \
+        name="OSGI R8 - Build"
+
+-plugin.20.runtime: \
+    aQute.bnd.repository.maven.provider.MavenBndRepository; \
+        snapshotUrl="https://oss.sonatype.org/content/repositories/snapshots/"; \
+        releaseUrl="https://repo.maven.apache.org/maven2/"; \
+        index=${.}/runtime.mvn; \
+        readOnly=true; \
+        name="OSGI R8 - Runtime Distro"
+
+
+
+
+-runsystemcapabilities.dflt:    ${native_capability}
+
+debug-bundles: \
+    osgi.identity;filter:='(osgi.identity=osgi.enroute.webconsole.xray.provider)',\
+    osgi.implementation;filter:='(osgi.implementation=osgi.metatype)',\
+    osgi.implementation;filter:='(osgi.implementation=osgi.event)',\
+    osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
+    osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)', \
+    osgi.identity;filter:='(osgi.identity=org.apache.felix.webconsole.plugins.ds)'
+
+# the driver-variable (see https://bnd.bndtools.org/macros/driver.html) 
+# helps to build to different folders e.g. depending on if Eclipse builds 
+# or e.g. gradle builds. 
+# that avoids conflicts between gradle and eclipse build
+# target-dir: dir specifies where build places the .jar and classes
+target-dir              generated${if;${driver;eclipse};;/${driver}}
+src                     src/main/java, src/main/resources
+testsrc                 src/test/java
+bin                     ${target-dir}/classes
+testbin                 ${target-dir}/test-classes
diff --git a/cnf/ext/java.bnd b/cnf/ext/java.bnd
@@ -0,0 +1,4 @@
+javac.source:           17
+javac.target:           17
+javac.compliance:       17
+javac.debug:            on