Fixed build to generate the build number into FRAMEWORK_VERSION

Change-Id: Ifbeb09228dd3bcfefbc7256fc73a07af75191487
Signed-off-by: Jochen Hiller <j.hiller@telekom.de>

.gitignore

@@ -2,3 +2,4 @@
 /.metadata/
 /.gradle/
 /tmp/
+/build/

distribution/publish/publish.sh

@@ -4,7 +4,8 @@
 # chmod u+x ./distribution/publish/publish.sh
 # ./distribution/publish/publish.sh
 
-set -x
+# enable for "debugging" of script
+# set -x
 
 version=`cat version.txt`
 echo "VERSION=$version"
@@ -20,9 +21,11 @@ PUBLISH_LOG=$UPLOAD_BASE/publish.log
 echo "UPLOAD_LOCATION=$UPLOAD_LOCATION"
 echo "PUBLISH_LOG=$PUBLISH_LOG"
 
+# current time in UTC with Timezone information
 now=`date -u '+%Y-%m-%d %H:%M:%S %Z'`
 echo "$now: publishing last successful build for $version" >>$PUBLISH_LOG
 
+# copy latest build artifacts (tar.gz, zip)
 echo -n "$BUILD_TYPE/" >>$PUBLISH_LOG
 echo `(cd ./distribution/build/distributions/ ; ls *.tar.gz)` >>$PUBLISH_LOG
 cp ./distribution/build/distributions/*.tar.gz $UPLOAD_LOCATION

org.eclipse.concierge.tests.integration/README.md

@@ -0,0 +1,17 @@
+# Eclipse Concierge Integration Tests
+
+This Java project contains integration tests with bundles from different projects to run on Concierge OSGi framework.
+
+
+Actually there a lot of tests using a proprietary way to download and install bundle in Concierge. It is not yet integrated in regular build as it requires manual changes to get all these tests running against latest versions.
+
+We filed a bug to check if pax-exam is another option to write such kind of integration tests.
+
+## References
+
+* "Use pax-exam for Concierge integration tests? ": https://bugs.eclipse.org/bugs/show_bug.cgi?id=480566
+* Pax-exam documentation: https://ops4j1.jira.com/wiki/display/PAXEXAM4/Documentation
+* Maven repo with pax-exam: http://mvnrepository.com/artifact/org.ops4j.pax.exam
+* more information about pax-exam
+  * http://veithen.github.io/alta/examples/pax-exam.html
+  * http://stackoverflow.com/questions/28109434/pax-exam-4-and-multiple-maven-repositories-not-working

org.eclipse.concierge/build.gradle

@@ -1,3 +1,27 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+// we change the version "5.0.0.qualifier" by the current build version
+// note: if this will change also update the configuration here
+def versionFile = 'src/org/eclipse/concierge/Concierge.java'
+def versionFileName = 'Concierge.java'
+def versionTempDir = 'build/tmp/sourcesCache'
+def versionPattern = '5.0.0.qualifier'
+
+compileJava.doFirst {
+    copy {
+        from(versionFile)
+        into(versionTempDir)
+    }
+    ant.replace(file: versionFile, token: versionPattern, value: version)
+}
+
+compileJava.doLast {
+    copy {
+        from(versionTempDir + '/' + versionFileName)
+        into(project.file(versionFile).parent)
+    }
+}
+
 // add . folder to test classpath, to lookup META-INF/micro-services
 sourceSets {
     test {

org.eclipse.concierge/src/org/eclipse/concierge/Concierge.java

@@ -146,7 +146,7 @@ public final class Concierge extends AbstractBundle implements Framework,
 	/**
 	 * Version displayed upon startup and returned by System Bundle
 	 */
-	private static final String FRAMEWORK_VERSION = "5.0.0.RC1";
+	private static final String FRAMEWORK_VERSION = "5.0.0.qualifier";
 
 	@SuppressWarnings("deprecation")
 	private static Class<?> SERVICE_EVENT_HOOK_CLASS = org.osgi.framework.hooks.service.EventHook.class;