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..bfaf255a53 100644 --- a/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun +++ b/bndtools.core/resources/unprocessed/serviceTemplates/java-service-api/$serviceName$.bndrun @@ -5,10 +5,6 @@ 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$ -$endif$ - --resolve: beforelaunch \ No newline at end of file +-resolve: cache \ No newline at end of file diff --git a/org.bndtools.templates.osgi/resources/api-help.xml b/org.bndtools.templates.osgi/resources/api-help.xml index 33f2004980..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 Annotation 6.0.1
    • +

    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 e0c68387d3..81341689a7 100644 --- a/org.bndtools.templates.osgi/resources/comp-help.xml +++ b/org.bndtools.templates.osgi/resources/comp-help.xml @@ -1,9 +1,8 @@

    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 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 f88e62a96f..f8890756aa 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
    • -
  • 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 4e8351e5f5..377427bc84 100644 --- a/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/api/bnd.bnd @@ -1,10 +1,5 @@ --buildpath: osgi.annotation; version=6.0.1 +-buildpath: osgi.core,\ + osgi.annotation -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..420363b617 100644 --- a/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd +++ b/org.bndtools.templates.osgi/resources/templates/ds/bnd.bnd @@ -1,15 +1,8 @@ -buildpath: \ - osgi.annotation; version=6.0.1,\ - osgi.core; version=6.0,\ - osgi.cmpn; version=6.0 + org.osgi.service.component.annotations,\ + osgi.core,\ -testpath: \ \${junit} -$if(javaLevel)$ -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..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;version=5 -#-runee: JavaSE-1.8 - -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 636bfe8fe4..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;version="[4.11,5)" - -# 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)" - # Discover and run all test cases annotated with the @RunWith annotation Test-Cases: \${classes;CONCRETE;ANNOTATED;org.junit.runner.RunWith} @@ -12,14 +5,8 @@ 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.core,\ -$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 @@ -27,12 +14,8 @@ $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 -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..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;version=4 --runee: JavaSE-1.8 +-runfw: org.apache.felix.framework -runprovidedcapabilities: \${native_capability} -resolve.effective: active;skip:="osgi.service" 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"