From b00b8342e86d2c9bdd9b6d54a9a18e5d08697837 Mon Sep 17 00:00:00 2001 From: jrellerme Date: Tue, 25 Aug 2015 16:34:18 -0500 Subject: [PATCH] updated version to 1.0.0 for first release Signed-off-by: Jochen Hiller --- build.gradle | 14 ++++++++++++++ .../mavenDeploy/pom-org.eclipse.concierge.xml | 2 +- distribution/src/main/dist/samples/default.xargs | 2 +- distribution/src/main/dist/samples/felix.xargs | 2 +- .../src/main/dist/samples/webconsole.xargs | 2 +- .../markdown/docs/concierge-commandline.markdown | 2 +- .../src/markdown/docs/concierge-embedding.markdown | 2 +- .../docs/contributor/build-concierge.markdown | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.concierge.shell/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- pom.xml | 2 +- 16 files changed, 29 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index db2c624..288e801 100644 --- a/build.gradle +++ b/build.gradle @@ -6,17 +6,31 @@ // Make complete fresh build: ./gradlew clean build publish assembleMainDist installDist // Build and publish to local Maven repo: ./gradlew clean build publishToMavenLocal +buildscript { + repositories { + maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' } + jcenter() + } + + dependencies { + classpath "org.akhikhl.wuff:wuff-plugin:0.0.13-SNAPSHOT" + } +} plugins { // TODO jhi create p2 repo with this tool? // see: https://github.com/stempler/bnd-platform // id 'org.standardout.bnd-platform' version '1.2.0' + // see: https://github.com/akhikhl/wuff-sandbox/tree/master/007_repository + // id: '' // see: https://github.com/netzwerg/gradle-release-plugin id 'ch.netzwerg.release' version '1.1.0' } // only include in top level project +// apply plugin: 'org.standardout.bnd-platform' +apply plugin: 'org.akhikhl.wuff.eclipse-repository' apply plugin: 'ch.netzwerg.release' def qualifier = buildTime() diff --git a/distribution/mavenDeploy/pom-org.eclipse.concierge.xml b/distribution/mavenDeploy/pom-org.eclipse.concierge.xml index f29731d..fc04184 100644 --- a/distribution/mavenDeploy/pom-org.eclipse.concierge.xml +++ b/distribution/mavenDeploy/pom-org.eclipse.concierge.xml @@ -2,5 +2,5 @@ 4.0.0 org.eclipse.concierge org.eclipse.concierge - 0.9.0-SNAPSHOT + 1.0.0-SNAPSHOT diff --git a/distribution/src/main/dist/samples/default.xargs b/distribution/src/main/dist/samples/default.xargs index f46c700..403d85c 100644 --- a/distribution/src/main/dist/samples/default.xargs +++ b/distribution/src/main/dist/samples/default.xargs @@ -4,5 +4,5 @@ -Dorg.osgi.framework.storage.clean=onFirstInit # load shell bundle --istart bundles/org.eclipse.concierge.shell-0.9.0.*.jar +-istart bundles/org.eclipse.concierge.shell-1.0.0.*.jar diff --git a/distribution/src/main/dist/samples/felix.xargs b/distribution/src/main/dist/samples/felix.xargs index 6d2a8fb..d06a44d 100644 --- a/distribution/src/main/dist/samples/felix.xargs +++ b/distribution/src/main/dist/samples/felix.xargs @@ -10,7 +10,7 @@ -Drepo=http://www.us.apache.org/dist/felix # load bundles --istart bundles/org.eclipse.concierge.shell-0.9.0.*.jar +-istart bundles/org.eclipse.concierge.shell-1.0.0.*.jar -istart ${repo}/org.apache.felix.log-1.0.1.jar -istart ${repo}/org.apache.felix.scr-1.8.0.jar -istart ${repo}/org.apache.felix.eventadmin-1.4.2.jar diff --git a/distribution/src/main/dist/samples/webconsole.xargs b/distribution/src/main/dist/samples/webconsole.xargs index 32d13af..42ba04e 100644 --- a/distribution/src/main/dist/samples/webconsole.xargs +++ b/distribution/src/main/dist/samples/webconsole.xargs @@ -10,6 +10,6 @@ -Drepo=http://www.us.apache.org/dist/felix # load bundles --istart bundles/org.eclipse.concierge.shell-0.9.0.*.jar +-istart bundles/org.eclipse.concierge.shell-1.0.0.*.jar -istart ${repo}/org.apache.felix.httplite.complete-0.1.4.jar -istart ${repo}/org.apache.felix.webconsole-4.2.8-all.jar diff --git a/distribution/src/markdown/docs/concierge-commandline.markdown b/distribution/src/markdown/docs/concierge-commandline.markdown index 5915d3a..92c35e1 100644 --- a/distribution/src/markdown/docs/concierge-commandline.markdown +++ b/distribution/src/markdown/docs/concierge-commandline.markdown @@ -53,7 +53,7 @@ an event admin, configuration admin and metatype: -Drepo=http://www.us.apache.org/dist/felix # load bundles - -istart bundles/org.eclipse.concierge.shell-0.9.0.*.jar + -istart bundles/org.eclipse.concierge.shell-1.0.0.*.jar -istart ${repo}/org.apache.felix.log-1.0.1.jar -istart ${repo}/org.apache.felix.scr-1.8.0.jar -istart ${repo}/org.apache.felix.eventadmin-1.4.2.jar diff --git a/distribution/src/markdown/docs/concierge-embedding.markdown b/distribution/src/markdown/docs/concierge-embedding.markdown index ecfd133..e244d15 100644 --- a/distribution/src/markdown/docs/concierge-embedding.markdown +++ b/distribution/src/markdown/docs/concierge-embedding.markdown @@ -26,7 +26,7 @@ Once you have created and started the Framework instance, you can interact with ``` BundleContext context = concierge.getBundleContext(); -Bundle shell = context.installBundle("file:org.eclipse.concierge.shell-0.9.0.jar")); +Bundle shell = context.installBundle("file:org.eclipse.concierge.shell-1.0.0.jar")); shell.start(); ``` diff --git a/distribution/src/markdown/docs/contributor/build-concierge.markdown b/distribution/src/markdown/docs/contributor/build-concierge.markdown index 12c9598..343ab8d 100644 --- a/distribution/src/markdown/docs/contributor/build-concierge.markdown +++ b/distribution/src/markdown/docs/contributor/build-concierge.markdown @@ -28,7 +28,7 @@ This will clean workspace, build and run tests, and will create a distribution f ## Versioning -The framework and the bundles jars will be named to Bundle-SymbolicName and Bundle-Version, e.g. `org.eclipse.concierge-0.9.0.20141230122000.jar`. The Manifest.MF will specify the `Bundle-Version: 0.9.0.qualifier`, qualifier will be replaced by the current build date/time (MANIFEST driven approach). The version maintenance is up to the individual bundles/framework dependent on compatibility of changes. +The framework and the bundles jars will be named to Bundle-SymbolicName and Bundle-Version, e.g. `org.eclipse.concierge-1.0.0.20141230122000.jar`. The Manifest.MF will specify the `Bundle-Version: 1.0.0.qualifier`, qualifier will be replaced by the current build date/time (MANIFEST driven approach). The version maintenance is up to the individual bundles/framework dependent on compatibility of changes. The version for the distribution will be defined in `version.txt` in root directory. The used release plugin will automatically read in this file and use it as `project.version` property. When this file will have a `-SNAPSHOT` ending, it will be considered as a SNAPSHOT version. When doing a release (by calling `./gradlew release`) it will remove SNAPSHOT, make a release build, create a tag in git, and increase the version to next number. diff --git a/org.eclipse.concierge.extension.permission/META-INF/MANIFEST.MF b/org.eclipse.concierge.extension.permission/META-INF/MANIFEST.MF index d860c76..0969406 100644 --- a/org.eclipse.concierge.extension.permission/META-INF/MANIFEST.MF +++ b/org.eclipse.concierge.extension.permission/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.concierge.extension.permission Bundle-Name: Eclipse Concierge Permission Extension Fragment -Bundle-Version: 0.9.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: Eclipse.org/Concierge Bundle-License: http://www.eclipse.org/legal/epl-v10.html diff --git a/org.eclipse.concierge.service.packageadmin/META-INF/MANIFEST.MF b/org.eclipse.concierge.service.packageadmin/META-INF/MANIFEST.MF index be21c77..3a180bf 100644 --- a/org.eclipse.concierge.service.packageadmin/META-INF/MANIFEST.MF +++ b/org.eclipse.concierge.service.packageadmin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.concierge.service.packageadmin Bundle-Name: Eclipse Concierge PackageAdmin Service -Bundle-Version: 0.9.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.concierge.compat.packageadmin.Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: Eclipse.org/Concierge diff --git a/org.eclipse.concierge.service.permission/META-INF/MANIFEST.MF b/org.eclipse.concierge.service.permission/META-INF/MANIFEST.MF index 6aaba0b..f90b7ae 100644 --- a/org.eclipse.concierge.service.permission/META-INF/MANIFEST.MF +++ b/org.eclipse.concierge.service.permission/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.concierge.service.permission Bundle-Name: Eclipse Concierge Permission Service -Bundle-Version: 0.9.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: Eclipse.org/Concierge Bundle-License: http://www.eclipse.org/legal/epl-v10.html diff --git a/org.eclipse.concierge.service.startlevel/META-INF/MANIFEST.MF b/org.eclipse.concierge.service.startlevel/META-INF/MANIFEST.MF index bc34154..79b7d27 100644 --- a/org.eclipse.concierge.service.startlevel/META-INF/MANIFEST.MF +++ b/org.eclipse.concierge.service.startlevel/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.concierge.service.startlevel Bundle-Name: Eclipse Concierge StartLevel Service -Bundle-Version: 0.9.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.concierge.compat.startlevel.Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: Eclipse.org/Concierge diff --git a/org.eclipse.concierge.service.xmlparser/META-INF/MANIFEST.MF b/org.eclipse.concierge.service.xmlparser/META-INF/MANIFEST.MF index af79da0..bf7d4a2 100644 --- a/org.eclipse.concierge.service.xmlparser/META-INF/MANIFEST.MF +++ b/org.eclipse.concierge.service.xmlparser/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.concierge.service.xmlparser Bundle-Name: Eclipse Concierge XmlParser Service -Bundle-Version: 0.9.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.concierge.service.xmlparser.internal.Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: Eclipse.org/Concierge diff --git a/org.eclipse.concierge.shell/META-INF/MANIFEST.MF b/org.eclipse.concierge.shell/META-INF/MANIFEST.MF index 0a1e9ec..2351b56 100644 --- a/org.eclipse.concierge.shell/META-INF/MANIFEST.MF +++ b/org.eclipse.concierge.shell/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.concierge.shell Bundle-Name: Eclipse Concierge Shell -Bundle-Version: 0.9.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.concierge.shell.ShellActivator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: Eclipse.org/Concierge diff --git a/org.eclipse.concierge.tests.integration/META-INF/MANIFEST.MF b/org.eclipse.concierge.tests.integration/META-INF/MANIFEST.MF index 724e7e9..07e7b14 100644 --- a/org.eclipse.concierge.tests.integration/META-INF/MANIFEST.MF +++ b/org.eclipse.concierge.tests.integration/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.concierge.tests.integration Bundle-Name: Eclipse Concierge Integration Tests -Bundle-Version: 0.9.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: Eclipse.org/Concierge Bundle-License: http://www.eclipse.org/legal/epl-v10.html diff --git a/pom.xml b/pom.xml index a807fd9..5f52572 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.eclipse.concierge concierge - 0.9.0-SNAPSHOT + 1.0.0-SNAPSHOT Eclipse Concierge