Skip to content
This repository has been archived by the owner on Nov 15, 2022. It is now read-only.

Commit

Permalink
updated version to 1.0.0 for first release
Browse files Browse the repository at this point in the history
Signed-off-by: Jochen Hiller <j.hiller@telekom.de>
  • Loading branch information
rellermeyer authored and Jochen Hiller committed Aug 27, 2015
1 parent b926802 commit b00b834
Show file tree
Hide file tree
Showing 16 changed files with 29 additions and 15 deletions.
14 changes: 14 additions & 0 deletions build.gradle
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion distribution/mavenDeploy/pom-org.eclipse.concierge.xml
Expand Up @@ -2,5 +2,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.concierge</groupId>
<artifactId>org.eclipse.concierge</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</project>
2 changes: 1 addition & 1 deletion distribution/src/main/dist/samples/default.xargs
Expand Up @@ -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

2 changes: 1 addition & 1 deletion distribution/src/main/dist/samples/felix.xargs
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion distribution/src/main/dist/samples/webconsole.xargs
Expand Up @@ -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
Expand Up @@ -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
Expand Down
Expand Up @@ -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();
```

Expand Down
Expand Up @@ -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.

Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.concierge.shell/META-INF/MANIFEST.MF
Expand Up @@ -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
Expand Down
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -11,7 +11,7 @@

<groupId>org.eclipse.concierge</groupId>
<artifactId>concierge</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>

<name>Eclipse Concierge</name>

Expand Down

0 comments on commit b00b834

Please sign in to comment.