From 4d04c91abe0a90236229ecf959bc608e9a818a40 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Tue, 28 Nov 2023 21:14:38 +0100 Subject: [PATCH 01/10] remove char Signed-off-by: Christoph Rueger Update template files - remove versions where possible Signed-off-by: Christoph Rueger --- .../java-service-api/$serviceName$.bndrun | 2 +- .../resources/api-help.xml | 2 +- .../resources/comp-help.xml | 5 ++--- .../resources/integration-test-help.xml | 5 ++--- .../resources/templates/api/bnd.bnd | 3 +-- .../resources/templates/ds/bnd.bnd | 7 +++---- .../resources/templates/ds/launch.bndrun | 4 ++-- .../resources/templates/integration-test/bnd.bnd | 15 +++++++-------- .../templates/launch/felix-gogo/$fileName$ | 4 ++-- 9 files changed, 21 insertions(+), 26 deletions(-) diff --git a/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun b/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun index 1cefc15433..81d2a49b4a 100644 --- a/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun +++ b/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun @@ -5,7 +5,7 @@ bnd.identity;id='org.apache.felix.gogo.runtime',\ bnd.identity;id='org.apache.felix.gogo.shell' --runfw: org.apache.felix.framework;version='[7.0.3,7.0.3]' +-runfw: org.apache.felix.framework $if(javaLevel)$ -runee: JavaSE-$javaLevel$ diff --git a/org.bndtools.templates.osgi/resources/api-help.xml b/org.bndtools.templates.osgi/resources/api-help.xml index 33f2004980..7cbbbd2248 100644 --- a/org.bndtools.templates.osgi/resources/api-help.xml +++ b/org.bndtools.templates.osgi/resources/api-help.xml @@ -1,4 +1,4 @@

Creates a project for defining an API using OSGi R6 standard annotations. The following dependencies are added to the build path:

-
  • OSGi Annotation 6.0.1
    • +
  • OSGi R8 Annotation
    • \ No newline at end of file diff --git a/org.bndtools.templates.osgi/resources/comp-help.xml b/org.bndtools.templates.osgi/resources/comp-help.xml index e0c68387d3..5b1f499fca 100644 --- a/org.bndtools.templates.osgi/resources/comp-help.xml +++ b/org.bndtools.templates.osgi/resources/comp-help.xml @@ -1,8 +1,7 @@

    Creates a project for developing Components with Declarative Services. The following dependencies are added to the build path:

    -
  • OSGi Annotation 6.0.1
    • -
  • OSGi Core 5.0
    • -
  • OSGi Compendium 5.0
    • +
  • OSGi R8 Annotation
    • +
  • OSGi R8 Core

    • ... and the following are added to the test path:

  • JUnit 4
  • Hamcrest Core 1.3
    • diff --git a/org.bndtools.templates.osgi/resources/integration-test-help.xml b/org.bndtools.templates.osgi/resources/integration-test-help.xml index f88e62a96f..3f032ab9a4 100644 --- a/org.bndtools.templates.osgi/resources/integration-test-help.xml +++ b/org.bndtools.templates.osgi/resources/integration-test-help.xml @@ -1,8 +1,7 @@

    Creates a project for integration testing bundles inside an OSGi framework. The following dependencies are added to the build path:

    -
  • OSGi Annotation 6.0.1
    • -
  • OSGi Core 6.0
    • -
  • OSGi Compendium 6.0
    • +
  • OSGi R8 Annotation
    • +
  • OSGi R8 Core
  • JUnit 4
  • Mockito Core 1.9
    • \ No newline at end of file diff --git a/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd index 4e8351e5f5..bf1ac2da12 100644 --- a/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd @@ -1,10 +1,9 @@ --buildpath: osgi.annotation; version=6.0.1 +-buildpath: osgi.annotation; version=latest -baseline: * $if(javaLevel)$ javac.source: $javaLevel$ javac.target: $javaLevel$ $endif$ -Bundle-Version: 1.0.0.\${tstamp} Export-Package: $basePackageName$ diff --git a/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd index 3d1d08c3e0..f42bfee51f 100644 --- a/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd @@ -1,7 +1,7 @@ -buildpath: \ - osgi.annotation; version=6.0.1,\ - osgi.core; version=6.0,\ - osgi.cmpn; version=6.0 + osgi.annotation; version=latest,\ + osgi.core; version=latest,\ + osgi.cmpn; version=latest -testpath: \ \${junit} @@ -11,5 +11,4 @@ javac.source: $javaLevel$ javac.target: $javaLevel$ $endif$ -Bundle-Version: 0.0.0.\${tstamp} -privatepackage: $basePackageName$ diff --git a/org.bndtools.templates.osgi/resources/templates/ds/launch.bndrun b/org.bndtools.templates.osgi/resources/templates/ds/launch.bndrun index c21f6b1837..eada6a5266 100644 --- a/org.bndtools.templates.osgi/resources/templates/ds/launch.bndrun +++ b/org.bndtools.templates.osgi/resources/templates/ds/launch.bndrun @@ -1,5 +1,5 @@ -#-runfw: org.apache.felix.framework;version=5 -#-runee: JavaSE-1.8 +#-runfw: org.apache.felix.framework +#-runee: JavaSE-17 -runprovidedcapabilities: \${native_capability} diff --git a/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd index 636bfe8fe4..116d21f829 100644 --- a/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd @@ -1,9 +1,9 @@ # This is the version of JUnit that will be used at build time and run time -junit: org.apache.servicemix.bundles.junit;version="[4.11,5)" +junit: org.apache.servicemix.bundles.junit;version=latest # This is the version of Mockito that will be used at build time and run time -mockito: org.mockito.mockito-core;version="[1.9,2)",\ - org.objenesis;version="[2.1,3)" +mockito: org.mockito.mockito-core;version=latest,\ + org.objenesis;version=latest # Discover and run all test cases annotated with the @RunWith annotation Test-Cases: \${classes;CONCRETE;ANNOTATED;org.junit.runner.RunWith} @@ -12,9 +12,9 @@ Test-Cases: \${classes;CONCRETE;ANNOTATED;org.junit.runner.RunWith} -buildpath: \ \${junit},\ \${mockito},\ - osgi.annotation; version=6.0.1,\ - osgi.core; version=6.0,\ - osgi.cmpn; version=6.0 + osgi.annotation; version=latest,\ + osgi.core; version=latest,\ + osgi.cmpn; version=latest $if(javaLevel)$ javac.source: $javaLevel$ @@ -27,12 +27,11 @@ $endif$ \${junit},\ \${mockito} -Bundle-Version: 0.0.0.\${tstamp} -privatepackage: $basePackageName$ # Needed for Mockito's mocking to work -runsystempackages.objenesis: sun.misc,sun.reflect # Use Felix by default --runfw: org.apache.felix.framework;version=5 +-runfw: org.apache.felix.framework -runvm: -ea \ No newline at end of file diff --git a/org.bndtools.templates.osgi/resources/templates/launch/felix-gogo/$fileName$ b/org.bndtools.templates.osgi/resources/templates/launch/felix-gogo/$fileName$ index c3403e283f..e3737ba707 100644 --- a/org.bndtools.templates.osgi/resources/templates/launch/felix-gogo/$fileName$ +++ b/org.bndtools.templates.osgi/resources/templates/launch/felix-gogo/$fileName$ @@ -1,5 +1,5 @@ --runfw: org.apache.felix.framework;version=4 --runee: JavaSE-1.8 +-runfw: org.apache.felix.framework +-runee: JavaSE-$javaLevel$ -runprovidedcapabilities: \${native_capability} -resolve.effective: active;skip:="osgi.service" From fb3ebb4cc67c79160054e05204432b5c862d5640 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Tue, 28 Nov 2023 21:23:02 +0100 Subject: [PATCH 02/10] remove -runee: JavaSE-$javaLevel$ Signed-off-by: Christoph Rueger --- .../serviceTemplates/java-service-api/$serviceName$.bndrun | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun b/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun index 81d2a49b4a..a9296b2ce5 100644 --- a/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun +++ b/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun @@ -7,8 +7,4 @@ -runfw: org.apache.felix.framework -$if(javaLevel)$ --runee: JavaSE-$javaLevel$ -$endif$ - -resolve: beforelaunch \ No newline at end of file From 8d8edb72340ec8b53f3d9049e78153a351d2b964 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Tue, 28 Nov 2023 21:44:52 +0100 Subject: [PATCH 03/10] remove javac stuff Signed-off-by: Christoph Rueger --- org.bndtools.templates.osgi/resources/templates/api/bnd.bnd | 4 ---- org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd | 4 ---- .../resources/templates/integration-test/bnd.bnd | 4 ---- 3 files changed, 12 deletions(-) diff --git a/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd index bf1ac2da12..218366534e 100644 --- a/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd @@ -1,9 +1,5 @@ -buildpath: osgi.annotation; version=latest -baseline: * -$if(javaLevel)$ -javac.source: $javaLevel$ -javac.target: $javaLevel$ -$endif$ Export-Package: $basePackageName$ diff --git a/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd index f42bfee51f..0985d4bb6e 100644 --- a/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd @@ -6,9 +6,5 @@ -testpath: \ \${junit} -$if(javaLevel)$ -javac.source: $javaLevel$ -javac.target: $javaLevel$ -$endif$ -privatepackage: $basePackageName$ diff --git a/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd index 116d21f829..7a3b4845aa 100644 --- a/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd @@ -16,10 +16,6 @@ Test-Cases: \${classes;CONCRETE;ANNOTATED;org.junit.runner.RunWith} osgi.core; version=latest,\ osgi.cmpn; version=latest -$if(javaLevel)$ -javac.source: $javaLevel$ -javac.target: $javaLevel$ -$endif$ # We need JUnit and Mockito to resolve the test cases at runtime. # Other runtime dependencies should be added as necessary From c7aa0948e28e2688e3d50cd6f609ecdaa3952700 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Tue, 28 Nov 2023 21:50:39 +0100 Subject: [PATCH 04/10] Remove headers No Export-Package or Private-Package headers, defaults should be used. Signed-off-by: Christoph Rueger --- org.bndtools.templates.osgi/resources/templates/api/bnd.bnd | 1 - org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd | 1 - .../resources/templates/integration-test/bnd.bnd | 1 - 3 files changed, 3 deletions(-) diff --git a/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd index 218366534e..b632a8b796 100644 --- a/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd @@ -1,5 +1,4 @@ -buildpath: osgi.annotation; version=latest -baseline: * -Export-Package: $basePackageName$ diff --git a/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd index 0985d4bb6e..45a5376295 100644 --- a/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd @@ -7,4 +7,3 @@ \${junit} --privatepackage: $basePackageName$ diff --git a/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd index 7a3b4845aa..9cbc871ee0 100644 --- a/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd @@ -23,7 +23,6 @@ Test-Cases: \${classes;CONCRETE;ANNOTATED;org.junit.runner.RunWith} \${junit},\ \${mockito} --privatepackage: $basePackageName$ # Needed for Mockito's mocking to work -runsystempackages.objenesis: sun.misc,sun.reflect From 36e26387ffd284d669df817fdb3c7996200890bf Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Tue, 28 Nov 2023 21:50:57 +0100 Subject: [PATCH 05/10] use -resolve: cache Signed-off-by: Christoph Rueger --- .../serviceTemplates/java-service-api/$serviceName$.bndrun | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun b/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun index a9296b2ce5..bfaf255a53 100644 --- a/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun +++ b/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun @@ -7,4 +7,4 @@ -runfw: org.apache.felix.framework --resolve: beforelaunch \ No newline at end of file +-resolve: cache \ No newline at end of file From 277d2cbb67d143ff6566b85e1619fc36d3335c2f Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Wed, 29 Nov 2023 11:20:15 +0100 Subject: [PATCH 06/10] Remove runee Signed-off-by: Christoph Rueger --- .../resources/templates/launch/felix-gogo/$fileName$ | 1 - 1 file changed, 1 deletion(-) diff --git a/org.bndtools.templates.osgi/resources/templates/launch/felix-gogo/$fileName$ b/org.bndtools.templates.osgi/resources/templates/launch/felix-gogo/$fileName$ index e3737ba707..e4933f7023 100644 --- a/org.bndtools.templates.osgi/resources/templates/launch/felix-gogo/$fileName$ +++ b/org.bndtools.templates.osgi/resources/templates/launch/felix-gogo/$fileName$ @@ -1,5 +1,4 @@ -runfw: org.apache.felix.framework --runee: JavaSE-$javaLevel$ -runprovidedcapabilities: \${native_capability} -resolve.effective: active;skip:="osgi.service" From 4c3d8c462e85b95fad04e99c879cb76e3d8c01be Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Thu, 30 Nov 2023 20:38:44 +0100 Subject: [PATCH 07/10] Implement suggestions of review - remove version=latest - remove references to R8 - only include osgi.core Signed-off-by: Christoph Rueger --- org.bndtools.templates.osgi/resources/api-help.xml | 4 ++-- org.bndtools.templates.osgi/resources/comp-help.xml | 8 ++++---- .../resources/integration-test-help.xml | 8 ++++---- .../resources/templates/api/bnd.bnd | 2 +- .../resources/templates/ds/bnd.bnd | 4 +--- .../resources/templates/ds/launch.bndrun | 3 --- .../resources/templates/integration-test/bnd.bnd | 12 ++++-------- 7 files changed, 16 insertions(+), 25 deletions(-) diff --git a/org.bndtools.templates.osgi/resources/api-help.xml b/org.bndtools.templates.osgi/resources/api-help.xml index 7cbbbd2248..243f7c3ffb 100644 --- a/org.bndtools.templates.osgi/resources/api-help.xml +++ b/org.bndtools.templates.osgi/resources/api-help.xml @@ -1,4 +1,4 @@
    -

    Creates a project for defining an API using OSGi R6 standard annotations. The following dependencies are added to the build path:

    -
  • OSGi R8 Annotation
    • +

    Creates a project for defining an API using OSGi standard annotations. The following dependencies are added to the build path:

    +
  • OSGi Annotation
    • \ No newline at end of file diff --git a/org.bndtools.templates.osgi/resources/comp-help.xml b/org.bndtools.templates.osgi/resources/comp-help.xml index 5b1f499fca..81341689a7 100644 --- a/org.bndtools.templates.osgi/resources/comp-help.xml +++ b/org.bndtools.templates.osgi/resources/comp-help.xml @@ -1,8 +1,8 @@

    Creates a project for developing Components with Declarative Services. The following dependencies are added to the build path:

    -
  • OSGi R8 Annotation
    • -
  • OSGi R8 Core
    • +
  • OSGi Annotation
    • +
  • OSGi Core

    • ... and the following are added to the test path:

    -
  • JUnit 4
    • -
  • Hamcrest Core 1.3
    • +
  • JUnit
    • +
  • Hamcrest Core
    • \ No newline at end of file diff --git a/org.bndtools.templates.osgi/resources/integration-test-help.xml b/org.bndtools.templates.osgi/resources/integration-test-help.xml index 3f032ab9a4..f8890756aa 100644 --- a/org.bndtools.templates.osgi/resources/integration-test-help.xml +++ b/org.bndtools.templates.osgi/resources/integration-test-help.xml @@ -1,7 +1,7 @@

    Creates a project for integration testing bundles inside an OSGi framework. The following dependencies are added to the build path:

    -
  • OSGi R8 Annotation
    • -
  • OSGi R8 Core
    • -
  • JUnit 4
    • -
  • Mockito Core 1.9
    • +
  • OSGi Annotation
    • +
  • OSGi Core
    • +
  • JUnit
    • +
  • Mockito Core
    • \ No newline at end of file diff --git a/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd index b632a8b796..1ed42fb0aa 100644 --- a/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd @@ -1,4 +1,4 @@ --buildpath: osgi.annotation; version=latest +-buildpath: osgi.core -baseline: * diff --git a/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd index 45a5376295..23de08061e 100644 --- a/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd @@ -1,7 +1,5 @@ -buildpath: \ - osgi.annotation; version=latest,\ - osgi.core; version=latest,\ - osgi.cmpn; version=latest + osgi.core,\ -testpath: \ \${junit} diff --git a/org.bndtools.templates.osgi/resources/templates/ds/launch.bndrun b/org.bndtools.templates.osgi/resources/templates/ds/launch.bndrun index eada6a5266..9435ca7502 100644 --- a/org.bndtools.templates.osgi/resources/templates/ds/launch.bndrun +++ b/org.bndtools.templates.osgi/resources/templates/ds/launch.bndrun @@ -1,6 +1,3 @@ -#-runfw: org.apache.felix.framework -#-runee: JavaSE-17 - -runprovidedcapabilities: \${native_capability} -resolve.effective: active;skip:="osgi.service" diff --git a/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd index 9cbc871ee0..82460e9be1 100644 --- a/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd @@ -1,9 +1,9 @@ # This is the version of JUnit that will be used at build time and run time -junit: org.apache.servicemix.bundles.junit;version=latest +junit: org.apache.servicemix.bundles.junit # This is the version of Mockito that will be used at build time and run time -mockito: org.mockito.mockito-core;version=latest,\ - org.objenesis;version=latest +mockito: org.mockito.mockito-core,\ + org.objenesis # Discover and run all test cases annotated with the @RunWith annotation Test-Cases: \${classes;CONCRETE;ANNOTATED;org.junit.runner.RunWith} @@ -12,9 +12,7 @@ Test-Cases: \${classes;CONCRETE;ANNOTATED;org.junit.runner.RunWith} -buildpath: \ \${junit},\ \${mockito},\ - osgi.annotation; version=latest,\ - osgi.core; version=latest,\ - osgi.cmpn; version=latest + osgi.core,\ # We need JUnit and Mockito to resolve the test cases at runtime. @@ -27,6 +25,4 @@ Test-Cases: \${classes;CONCRETE;ANNOTATED;org.junit.runner.RunWith} # Needed for Mockito's mocking to work -runsystempackages.objenesis: sun.misc,sun.reflect -# Use Felix by default --runfw: org.apache.felix.framework -runvm: -ea \ No newline at end of file From a2533dc7e3765d77c8394fc80cc057010c9aba51 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Thu, 30 Nov 2023 22:35:01 +0100 Subject: [PATCH 08/10] add back annotations They are required by the sources Signed-off-by: Christoph Rueger --- org.bndtools.templates.osgi/resources/templates/api/bnd.bnd | 3 ++- org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd index 1ed42fb0aa..377427bc84 100644 --- a/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd @@ -1,4 +1,5 @@ --buildpath: osgi.core +-buildpath: osgi.core,\ + osgi.annotation -baseline: * diff --git a/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd index 23de08061e..420363b617 100644 --- a/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd @@ -1,4 +1,5 @@ -buildpath: \ + org.osgi.service.component.annotations,\ osgi.core,\ -testpath: \ From f0b3c06e93caeab8049f06fb3f7871828def51e5 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Thu, 30 Nov 2023 22:35:10 +0100 Subject: [PATCH 09/10] remove runee Signed-off-by: Christoph Rueger --- .../resources/templates/bndrun/resources/template/$fileName$ | 1 - 1 file changed, 1 deletion(-) diff --git a/org.bndtools.templates.template/resources/templates/bndrun/resources/template/$fileName$ b/org.bndtools.templates.template/resources/templates/bndrun/resources/template/$fileName$ index 0c94d7b1b1..96199f8078 100644 --- a/org.bndtools.templates.template/resources/templates/bndrun/resources/template/$fileName$ +++ b/org.bndtools.templates.template/resources/templates/bndrun/resources/template/$fileName$ @@ -1,3 +1,2 @@ --runee: JavaSE-1.8 -runprovidedcapabilities: \${native_capability} -resolve.effective: active; skip:="osgi.service" From 5c9eaf65fa4eb743a3d81934034d11dbcdf79c94 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Fri, 1 Dec 2023 09:31:13 +0100 Subject: [PATCH 10/10] Use juni + mockito macros defined in workspace template Signed-off-by: Christoph Rueger --- .../resources/templates/integration-test/bnd.bnd | 7 ------- 1 file changed, 7 deletions(-) diff --git a/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd b/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd index 82460e9be1..86e82cd1c9 100644 --- a/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/integration-test/bnd.bnd @@ -1,10 +1,3 @@ -# This is the version of JUnit that will be used at build time and run time -junit: org.apache.servicemix.bundles.junit - -# This is the version of Mockito that will be used at build time and run time -mockito: org.mockito.mockito-core,\ - org.objenesis - # Discover and run all test cases annotated with the @RunWith annotation Test-Cases: \${classes;CONCRETE;ANNOTATED;org.junit.runner.RunWith}