diff --git a/cnf/build.bnd b/cnf/build.bnd index 756129c..f08f8aa 100644 --- a/cnf/build.bnd +++ b/cnf/build.bnd @@ -1,76 +1,2 @@ -# Configure Repositories --plugin.1.R7.API: \ - aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ - snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ - releaseUrls=https://repo.maven.apache.org/maven2/; \ - revision=org.osgi.enroute:osgi-api:7.0.0; \ - readOnly=true; \ - name="OSGi R7 API" --plugin.2.Enterprise.API: \ - aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ - snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ - releaseUrls=https://repo.maven.apache.org/maven2/; \ - revision=org.osgi.enroute:enterprise-api:7.0.0; \ - readOnly=true; \ - name="Enterprise Java APIs" --plugin.3.R7.Impl: \ - aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ - snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ - releaseUrls=https://repo.maven.apache.org/maven2/; \ - revision=org.osgi.enroute:impl-index:7.0.0; \ - readOnly=true; \ - name="OSGi R7 Reference Implementations" --plugin.4.Test: \ - aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ - snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ - releaseUrls=https://repo.maven.apache.org/maven2/; \ - revision=org.osgi.enroute:test-bundles:7.0.0; \ - readOnly=true; \ - name="Testing Bundles" --plugin.5.Debug: \ - aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ - snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ - releaseUrls=https://repo.maven.apache.org/maven2/; \ - revision=org.osgi.enroute:debug-bundles:7.0.0; \ - readOnly=true; \ - name="Debug Bundles" --plugin.6.Central: \ - aQute.bnd.repository.maven.provider.MavenBndRepository; \ - releaseUrl=https://repo.maven.apache.org/maven2/; \ - index=${.}/central.maven; \ - readOnly=true; \ - name="Maven Central" --plugin.7.Local: \ - aQute.bnd.deployer.repository.LocalIndexedRepo; \ - name = Local; \ - pretty = true; \ - local = ${build}/local - --plugin.8.Templates: \ - aQute.bnd.deployer.repository.LocalIndexedRepo; \ - name = Templates; \ - pretty = true; \ - local = ${build}/templates - --plugin.9.Release: \ - aQute.bnd.deployer.repository.LocalIndexedRepo; \ - name = Release; \ - pretty = true; \ - local = ${build}/release - --releaserepo: Release --baselinerepo: Release - -# Always use contracts --contract: * - -# Set Git revision information in the manifests of built bundles -Git-Descriptor: ${system-allow-fail;git describe --dirty --always} -Git-SHA: ${system-allow-fail;git rev-list -1 HEAD} - -# JUnit -junit: org.apache.servicemix.bundles.junit; version=4.12 -mockito: org.mockito.mockito-core; version=2.13.0 -mockito-deps: org.objenesis; version=2.6.0,\ - net.bytebuddy.byte-buddy; version=1.7.9,\ - net.bytebuddy.byte-buddy-agent; version=1.7.9 +# All settings moved to the bnd files in the ext directory. +# bnd files found there will be included automatically. diff --git a/cnf/central.maven b/cnf/central.maven deleted file mode 100644 index 22e35f9..0000000 --- a/cnf/central.maven +++ /dev/null @@ -1,2 +0,0 @@ -# List repository contents using GAV coordinates - diff --git a/cnf/ext/central.maven b/cnf/ext/central.maven new file mode 100644 index 0000000..c603376 --- /dev/null +++ b/cnf/ext/central.maven @@ -0,0 +1,4 @@ +# List repository contents using GAV coordinates +org.bndtools:org.bndtools.templates.osgi:5.2.0 +org.bndtools:org.bndtools.templates.template:5.2.0 + diff --git a/cnf/ext/osgi_repos.bnd b/cnf/ext/osgi_repos.bnd new file mode 100644 index 0000000..620ecbc --- /dev/null +++ b/cnf/ext/osgi_repos.bnd @@ -0,0 +1,55 @@ +# Configure Repositories +-plugin.1.R7.API: \ + aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ + snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ + releaseUrls=https://repo.maven.apache.org/maven2/; \ + revision=org.osgi.enroute:osgi-api:7.0.0; \ + readOnly=true; \ + name="OSGi R7 API" +-plugin.2.Enterprise.API: \ + aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ + snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ + releaseUrls=https://repo.maven.apache.org/maven2/; \ + revision=org.osgi.enroute:enterprise-api:7.0.0; \ + readOnly=true; \ + name="Enterprise Java APIs" +-plugin.3.R7.Impl: \ + aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ + snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ + releaseUrls=https://repo.maven.apache.org/maven2/; \ + revision=org.osgi.enroute:impl-index:7.0.0; \ + readOnly=true; \ + name="OSGi R7 Reference Implementations" +-plugin.4.Test: \ + aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ + snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ + releaseUrls=https://repo.maven.apache.org/maven2/; \ + revision=org.osgi.enroute:test-bundles:7.0.0; \ + readOnly=true; \ + name="Testing Bundles" +-plugin.5.Debug: \ + aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ + snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ + releaseUrls=https://repo.maven.apache.org/maven2/; \ + revision=org.osgi.enroute:debug-bundles:7.0.0; \ + readOnly=true; \ + name="Debug Bundles" + +-plugin.6.Central: \ + aQute.bnd.repository.maven.provider.MavenBndRepository; \ + releaseUrl=https://repo.maven.apache.org/maven2/; \ + index=${.}/central.maven; \ + readOnly=true; \ + name="Maven Central" + +-plugin.7.Local: \ + aQute.bnd.deployer.repository.LocalIndexedRepo; \ + name = Local; \ + pretty = true; \ + local = ${build}/local + +-plugin.9.Release: \ + aQute.bnd.deployer.repository.LocalIndexedRepo; \ + name = Release; \ + pretty = true; \ + local = ${build}/release \ No newline at end of file diff --git a/cnf/ext/settings.bnd b/cnf/ext/settings.bnd new file mode 100644 index 0000000..b4f2adf --- /dev/null +++ b/cnf/ext/settings.bnd @@ -0,0 +1,16 @@ +-releaserepo: Release +-baselinerepo: Release + +# Always use contracts +-contract: * + +# Set Git revision information in the manifests of built bundles +Git-Descriptor: ${system-allow-fail;git describe --dirty --always} +Git-SHA: ${system-allow-fail;git rev-list -1 HEAD} + +# JUnit +junit: org.apache.servicemix.bundles.junit; version=4.12 +mockito: org.mockito.mockito-core; version=2.13.0 +mockito-deps: org.objenesis; version=2.6.0,\ + net.bytebuddy.byte-buddy; version=1.7.9,\ + net.bytebuddy.byte-buddy-agent; version=1.7.9 diff --git a/cnf/local/index.xml b/cnf/local/index.xml index 0bfa6dc..a63c5b0 100644 --- a/cnf/local/index.xml +++ b/cnf/local/index.xml @@ -1,3 +1,2 @@ - - - \ No newline at end of file + + diff --git a/cnf/local/index.xml.sha b/cnf/local/index.xml.sha index 001203e..167af31 100644 --- a/cnf/local/index.xml.sha +++ b/cnf/local/index.xml.sha @@ -1 +1 @@ -8de8e8866152096f0c4ea5ddd6ed1d633b4d1a6edfbd823245cb57f6639732fd \ No newline at end of file +a216ef7e3142d3246fd1fec4c5a62a311b405f60a92b2ba406c657b5e1bacb7c \ No newline at end of file diff --git a/cnf/release/index.xml b/cnf/release/index.xml index c89dffc..12d6b83 100644 --- a/cnf/release/index.xml +++ b/cnf/release/index.xml @@ -1,3 +1,2 @@ - - - \ No newline at end of file + + diff --git a/cnf/release/index.xml.sha b/cnf/release/index.xml.sha index f2b26bf..a0c146a 100644 --- a/cnf/release/index.xml.sha +++ b/cnf/release/index.xml.sha @@ -1 +1 @@ -262a924c4164db96f2409bfbe8d20793eb0c91a51c3dcd7c2160cde2bac8a492 \ No newline at end of file +fcf54414ff013c2fb884470011789ea6855b6c77e1bb804c4c4f81968b50d675 \ No newline at end of file diff --git a/cnf/templates/index.xml b/cnf/templates/index.xml deleted file mode 100644 index 4c76493..0000000 --- a/cnf/templates/index.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cnf/templates/index.xml.sha b/cnf/templates/index.xml.sha deleted file mode 100644 index c363d86..0000000 --- a/cnf/templates/index.xml.sha +++ /dev/null @@ -1 +0,0 @@ -61275256eb23a6404cfbbb35fee55ecba044ba36319684fd106af299857d019e \ No newline at end of file diff --git a/cnf/templates/org.bndtools.templates.osgi/org.bndtools.templates.osgi-7.0.0.jar b/cnf/templates/org.bndtools.templates.osgi/org.bndtools.templates.osgi-7.0.0.jar deleted file mode 100644 index 792c596..0000000 Binary files a/cnf/templates/org.bndtools.templates.osgi/org.bndtools.templates.osgi-7.0.0.jar and /dev/null differ