From 7b204dc9df69a696511ddbc8bb2fa94985550e65 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <konrad_w@gmx.de>
Date: Sat, 11 Jun 2016 07:36:53 +0200
Subject: [PATCH 1/2] #72 provide p2 update site (WIP)

---
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../pom.xml                                   |   2 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 com.googlecode.cppcheclipse.core/pom.xml      |   2 +-
 .../feature.xml                               |   2 +-
 com.googlecode.cppcheclipse.feature/pom.xml   |   2 +-
 com.googlecode.cppcheclipse.parent/pom.xml    |   3 +-
 .../release.txt                               |   4 +-
 .../bintray.ant                               | 173 ++++++++++++++++++
 .../category.xml                              |   2 +-
 .../packaging-p2composite.ant                 |  82 +++++++++
 .../pom.xml                                   | 142 +++++++++++++-
 .../removeFromBintray.sh                      |  45 +++++
 com.googlecode.cppcheclipse.target/pom.xml    |   2 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 com.googlecode.cppcheclipse.ui.tests/pom.xml  |   2 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 com.googlecode.cppcheclipse.ui/pom.xml        |   2 +-
 18 files changed, 457 insertions(+), 16 deletions(-)
 create mode 100644 com.googlecode.cppcheclipse.repository/bintray.ant
 create mode 100644 com.googlecode.cppcheclipse.repository/packaging-p2composite.ant
 create mode 100644 com.googlecode.cppcheclipse.repository/removeFromBintray.sh

diff --git a/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF
index 6d6e5a9..e597edc 100644
--- a/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF
+++ b/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse Core Tests
 Bundle-SymbolicName: com.googlecode.cppcheclipse.core.tests
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0
 Bundle-Vendor: Konrad Windszus
 Fragment-Host: com.googlecode.cppcheclipse.core;bundle-version="0.9.8"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/com.googlecode.cppcheclipse.core.tests/pom.xml b/com.googlecode.cppcheclipse.core.tests/pom.xml
index dd71790..4f84119 100644
--- a/com.googlecode.cppcheclipse.core.tests/pom.xml
+++ b/com.googlecode.cppcheclipse.core.tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.core.tests</artifactId>
diff --git a/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF
index 0fa60f2..07961de 100644
--- a/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF
+++ b/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse Core
 Bundle-SymbolicName: com.googlecode.cppcheclipse.core;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0
 Bundle-Activator: com.googlecode.cppcheclipse.core.CppcheclipsePlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.ui;bundle-version="3.5.0",
diff --git a/com.googlecode.cppcheclipse.core/pom.xml b/com.googlecode.cppcheclipse.core/pom.xml
index 59172de..d33a5dc 100644
--- a/com.googlecode.cppcheclipse.core/pom.xml
+++ b/com.googlecode.cppcheclipse.core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.core</artifactId>
diff --git a/com.googlecode.cppcheclipse.feature/feature.xml b/com.googlecode.cppcheclipse.feature/feature.xml
index 8951ba0..564fc93 100644
--- a/com.googlecode.cppcheclipse.feature/feature.xml
+++ b/com.googlecode.cppcheclipse.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.googlecode.cppcheclipse.feature"
       label="cppcheclipse"
-      version="1.0.1.qualifier"
+      version="1.1.0"
       provider-name="Konrad Windszus"
       plugin="com.googlecode.cppcheclipse.core">
 
diff --git a/com.googlecode.cppcheclipse.feature/pom.xml b/com.googlecode.cppcheclipse.feature/pom.xml
index 303144b..aec9720 100644
--- a/com.googlecode.cppcheclipse.feature/pom.xml
+++ b/com.googlecode.cppcheclipse.feature/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.feature</artifactId>
diff --git a/com.googlecode.cppcheclipse.parent/pom.xml b/com.googlecode.cppcheclipse.parent/pom.xml
index 5f7c165..7e7e03c 100644
--- a/com.googlecode.cppcheclipse.parent/pom.xml
+++ b/com.googlecode.cppcheclipse.parent/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.googlecode.cppcheclipse</groupId>
 	<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0</version>
 	<packaging>pom</packaging>
 
 	<!-- tycho requires maven >= 3.0 -->
@@ -16,6 +16,7 @@
 	<properties>
 		<tycho-version>0.24.0</tycho-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
 	</properties>
 
 	<build>
diff --git a/com.googlecode.cppcheclipse.parent/release.txt b/com.googlecode.cppcheclipse.parent/release.txt
index 1a1919d..8b9285f 100644
--- a/com.googlecode.cppcheclipse.parent/release.txt
+++ b/com.googlecode.cppcheclipse.parent/release.txt
@@ -2,8 +2,8 @@ To release version x do the following steps:
 
 make sure there are no uncommitted changes
 mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=<version x>
-build
-copy to p2 update site
+refresh category.xml (to point to feature in right version)
+mvn clean verify -Prelease-composite (see also http://www.lorenzobettini.it/2016/02/publish-an-eclipse-p2-composite-repository-on-bintray/)
 tag (from local workspace)
 mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=<version x+1>-SNAPSHOT
 afterwards the category.xml has to be updated manually, due to the changed version of the referenced feature
diff --git a/com.googlecode.cppcheclipse.repository/bintray.ant b/com.googlecode.cppcheclipse.repository/bintray.ant
new file mode 100644
index 0000000..b17b297
--- /dev/null
+++ b/com.googlecode.cppcheclipse.repository/bintray.ant
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Handle p2 composite metadata from Bintray" basedir=".">
+
+	<!--
+	These must be set from outside
+	<property name="bintray.user" value="" />
+	<property name="bintray.apikey" value="" />
+	<property name="bintray.repo" value="" />
+	<property name="bintray.package" value="" />
+	<property name="bintray.releases.path" value="" />
+	<property name="bintray.composite.path" value="" />
+	<property name="bintray.zip.path" value="" />
+	-->
+
+	<property name="bintray.url" value="https://dl.bintray.com/${bintray.owner}/${bintray.repo}" />
+	<property name="bintray.package.version" value="${unqualifiedVersion}.${buildQualifier}" />
+	<property name="bintray.releases.target.path" value="${bintray.releases.path}/${bintray.package.version}" />
+
+	<property name="main.composite.url" value="${bintray.url}/${bintray.composite.path}" />
+	<property name="target" value="target" />
+	<property name="composite.repository.directory" value="composite-child" />
+	<property name="main.composite.repository.directory" value="composite-main" />
+
+	<property name="compositeArtifacts" value="compositeArtifacts.xml" />
+	<property name="compositeContent" value="compositeContent.xml" />
+
+	<property name="local.p2.repository" value="target/repository" />
+
+	<target name="getMajorMinorVersion">
+		<script language="javascript">
+			<![CDATA[
+
+	                // getting the value
+	                buildnumber = project.getProperty("unqualifiedVersion");
+	                index = buildnumber.lastIndexOf(".");
+	                counter = buildnumber.substring(0, index);
+	    			project.setProperty("majorMinorVersion",counter);
+
+	            ]]>
+		</script>
+	</target>
+
+	<!-- Take from the remote URL the possible existing metadata -->
+	<target name="get-composite-metadata" depends="getMajorMinorVersion" >
+		<get-metadata url="${main.composite.url}" dest="${target}/${main.composite.repository.directory}" />
+		<get-metadata url="${main.composite.url}/${majorMinorVersion}" dest="${target}/${composite.repository.directory}" />
+		<antcall target="preprocess-metadata" />
+	</target>
+
+	<macrodef name="get-metadata" description="Retrieve the p2 composite metadata">
+		<attribute name="url" />
+		<attribute name="dest" />
+		<sequential>
+			<echo message="Creating directory @{dest}..." />
+			<mkdir dir="@{dest}" />
+			<get-file file="${compositeArtifacts}" url="@{url}" dest="@{dest}" />
+			<get-file file="${compositeContent}" url="@{url}" dest="@{dest}" />
+		</sequential>
+	</macrodef>
+
+	<macrodef name="get-file" description="Use Ant Get task the file">
+		<attribute name="file" />
+		<attribute name="url" />
+		<attribute name="dest" />
+		<sequential>
+			<!-- If the remote file does not exist then fail gracefully -->
+			<echo message="Getting @{file} from @{url} into @{dest}..." />
+			<get dest="@{dest}" ignoreerrors="true">
+				<url url="@{url}/@{file}" />
+			</get>
+		</sequential>
+	</macrodef>
+
+	<!-- p2.atomic.composite.loading must be set to false otherwise we won't be able
+		to add a child to the composite repository without having all the children available -->
+	<target name="preprocess-metadata" description="Preprocess p2 composite metadata">
+		<replaceregexp byline="true">
+			<regexp pattern="property name='p2.atomic.composite.loading' value='true'" />
+			<substitution expression="property name='p2.atomic.composite.loading' value='false'" />
+			<fileset dir="${target}">
+				<include name="${composite.repository.directory}/*.xml" />
+				<include name="${main.composite.repository.directory}/*.xml" />
+			</fileset>
+		</replaceregexp>
+	</target>
+
+	<!-- p2.atomic.composite.loading must be set to true
+		see https://bugs.eclipse.org/bugs/show_bug.cgi?id=356561 -->
+	<target name="postprocess-metadata" description="Preprocess p2 composite metadata">
+		<replaceregexp byline="true">
+			<regexp pattern="property name='p2.atomic.composite.loading' value='false'" />
+			<substitution expression="property name='p2.atomic.composite.loading' value='true'" />
+			<fileset dir="${target}">
+				<include name="${composite.repository.directory}/*.xml" />
+				<include name="${main.composite.repository.directory}/*.xml" />
+			</fileset>
+		</replaceregexp>
+	</target>
+
+	<target name="push-to-bintray" >
+		<antcall target="postprocess-metadata" />
+		<antcall target="push-p2-repo-to-bintray" />
+		<antcall target="push-p2-repo-zipped-to-bintray" />
+		<antcall target="push-composite-to-bintray" />
+		<antcall target="push-main-composite-to-bintray" />
+	</target>
+
+	<target name="push-p2-repo-to-bintray">
+		<apply executable="curl" parallel="false" relative="true" addsourcefile="false">
+			<arg value="-XPUT" />
+			<arg value="--verbose" />
+			<targetfile />
+
+			<fileset dir="${local.p2.repository}" />
+
+			<compositemapper>
+				<mergemapper to="-T" />
+				<globmapper from="*" to="${local.p2.repository}/*" />
+				<mergemapper to="-u${bintray.user}:${bintray.apikey}" />
+				<globmapper from="*" to="https://api.bintray.com/content/${bintray.owner}/${bintray.repo}/${bintray.releases.target.path}/*;bt_package=${bintray.package};bt_version=${bintray.package.version};publish=1" />
+			</compositemapper>
+		</apply>
+	</target>
+
+	<target name="push-p2-repo-zipped-to-bintray">
+		<apply executable="curl" parallel="false" relative="true" addsourcefile="false">
+			<arg value="-XPUT" />
+			<targetfile />
+
+			<fileset dir="${target}" includes="*.zip" />
+
+			<compositemapper>
+				<mergemapper to="-T" />
+				<globmapper from="*" to="${target}/*" />
+				<mergemapper to="-u${bintray.user}:${bintray.apikey}" />
+				<globmapper from="*" to="https://api.bintray.com/content/${bintray.owner}/${bintray.repo}/${bintray.zip.path}/*;bt_package=${bintray.package};bt_version=${bintray.package.version};publish=1" />
+			</compositemapper>
+		</apply>
+	</target>
+
+	<target name="push-composite-to-bintray" depends="getMajorMinorVersion" >
+		<apply executable="curl" parallel="false" relative="true" addsourcefile="false">
+			<arg value="-XPUT" />
+			<targetfile />
+
+			<fileset dir="${target}/${composite.repository.directory}" />
+
+			<compositemapper>
+				<mergemapper to="-T" />
+				<globmapper from="*" to="${target}/${composite.repository.directory}/*" />
+				<mergemapper to="-u${bintray.user}:${bintray.apikey}" />
+				<globmapper from="*" to="https://api.bintray.com/content/${bintray.owner}/${bintray.repo}/${bintray.composite.path}/${majorMinorVersion}/*;publish=1" />
+			</compositemapper>
+		</apply>
+	</target>
+
+	<target name="push-main-composite-to-bintray" >
+		<apply executable="curl" parallel="false" relative="true" addsourcefile="false">
+			<arg value="-XPUT" />
+			<targetfile />
+
+			<fileset dir="${target}/${main.composite.repository.directory}" />
+
+			<compositemapper>
+				<mergemapper to="-T" />
+				<globmapper from="*" to="${target}/${main.composite.repository.directory}/*" />
+				<mergemapper to="-u${bintray.user}:${bintray.apikey}" />
+				<globmapper from="*" to="https://api.bintray.com/content/${bintray.owner}/${bintray.repo}/${bintray.composite.path}/*;publish=1" />
+			</compositemapper>
+		</apply>
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/com.googlecode.cppcheclipse.repository/category.xml b/com.googlecode.cppcheclipse.repository/category.xml
index 5b406bc..9d8745f 100644
--- a/com.googlecode.cppcheclipse.repository/category.xml
+++ b/com.googlecode.cppcheclipse.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.googlecode.cppcheclipse.feature_1.0.1.qualifier.jar" id="com.googlecode.cppcheclipse.feature" version="1.0.1.qualifier">
+   <feature url="features/com.googlecode.cppcheclipse.feature_1.1.0.jar" id="com.googlecode.cppcheclipse.feature" version="1.1.0">
       <category name="cppcheclipse"/>
    </feature>
    <category-def name="cppcheclipse" label="cppcheclipse"/>
diff --git a/com.googlecode.cppcheclipse.repository/packaging-p2composite.ant b/com.googlecode.cppcheclipse.repository/packaging-p2composite.ant
new file mode 100644
index 0000000..d79c090
--- /dev/null
+++ b/com.googlecode.cppcheclipse.repository/packaging-p2composite.ant
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<project name="project">
+
+	<target name="getMajorMinorVersion">
+		<script language="javascript">
+			<![CDATA[
+
+	                // getting the value
+	                buildnumber = project.getProperty("unqualifiedVersion");
+	                index = buildnumber.lastIndexOf(".");
+	                counter = buildnumber.substring(0, index);
+	    			project.setProperty("majorMinorVersion",counter);
+
+	            ]]>
+		</script>
+	</target>
+
+	<target name="test_getMajorMinor" depends="getMajorMinorVersion">
+		<echo message="majorMinorVersion: ${majorMinorVersion}" />
+	</target>
+
+	<!--
+		site.label						The name/title/label of the created composite site
+		unqualifiedVersion 				The version without any qualifier replacement
+		buildQualifier					The build qualifier
+		child.repository.path.prefix	The path prefix to access the actual p2 repo from the
+										child repo, e.g., if child repo is in /updates/1.0 and
+										the p2 repo is in /releases/1.0.0.something then this property
+										should be "../../releases/"
+	-->
+	<target name="compute.child.repository.data" depends="getMajorMinorVersion">
+		<property name="full.version" value="${unqualifiedVersion}.${buildQualifier}" />
+
+		<property name="site.composite.name" value="${site.label} ${majorMinorVersion}" />
+		<property name="main.site.composite.name" value="${site.label} All Versions" />
+
+		<!-- composite.base.dir	The base directory for the local composite metadata,
+			e.g., from Maven, ${project.build.directory}
+		-->
+		<property name="composite.base.dir" value="target"/>
+
+		<property name="main.composite.repository.directory" location="${composite.base.dir}/composite-main" />
+		<property name="composite.repository.directory" location="${composite.base.dir}/composite-child" />
+
+		<property name="child.repository" value="${child.repository.path.prefix}${full.version}" />
+	</target>
+
+	<target name="p2.composite.add" depends="compute.child.repository.data">
+		<add.composite.repository.internal composite.repository.location="${main.composite.repository.directory}" composite.repository.name="${main.site.composite.name}" composite.repository.child="${majorMinorVersion}" />
+		<add.composite.repository.internal composite.repository.location="${composite.repository.directory}" composite.repository.name="${site.composite.name}" composite.repository.child="${child.repository}" />
+	</target>
+
+	<!-- = = = = = = = = = = = = = = = = =
+          macrodef: add.composite.repository.internal          
+         = = = = = = = = = = = = = = = = = -->
+	<macrodef name="add.composite.repository.internal">
+		<attribute name="composite.repository.location" />
+		<attribute name="composite.repository.name" />
+		<attribute name="composite.repository.child" />
+		<sequential>
+
+			<echo message=" " />
+			<echo message="Composite repository       : @{composite.repository.location}" />
+			<echo message="Composite name             : @{composite.repository.name}" />
+			<echo message="Adding child repository    : @{composite.repository.child}" />
+
+			<p2.composite.repository>
+				<repository compressed="false" location="@{composite.repository.location}" name="@{composite.repository.name}" />
+				<add>
+					<repository location="@{composite.repository.child}" />
+				</add>
+			</p2.composite.repository>
+
+			<echo file="@{composite.repository.location}/p2.index">version=1
+metadata.repository.factory.order=compositeContent.xml,\!
+artifact.repository.factory.order=compositeArtifacts.xml,\!
+</echo>
+
+		</sequential>
+	</macrodef>
+
+</project>
diff --git a/com.googlecode.cppcheclipse.repository/pom.xml b/com.googlecode.cppcheclipse.repository/pom.xml
index 3aabda4..3ea02d2 100644
--- a/com.googlecode.cppcheclipse.repository/pom.xml
+++ b/com.googlecode.cppcheclipse.repository/pom.xml
@@ -6,10 +6,150 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.repository</artifactId>
   <packaging>eclipse-repository</packaging>
   
+  <!-- settings for bintray deployment, taken from https://raw.githubusercontent.com/LorenzoBettini/p2composite-bintray-example/master/p2composite.example.site/pom.xml -->
+  <properties>
+		<!-- The name of your own Bintray repository -->
+		<bintray.repo>p2</bintray.repo>
+		<!-- The name of your own Bintray repository's package for releases -->
+		<bintray.package>releases</bintray.package>
+		<!-- The label for the Composite sites -->
+		<site.label>Composite Site for cppcheclipse</site.label>
+
+		<!-- If the Bintray repository is owned by someone different from your
+			user, then specify the bintray.owner explicitly -->
+		<bintray.owner>cppcheclipse</bintray.owner>
+		<!-- Define bintray.user and bintray.apikey in some secret place,
+			like .m2/settings.xml -->
+
+		<!-- Default values for remote directories -->
+		<bintray.releases.path>releases</bintray.releases.path>
+		<bintray.composite.path>updates</bintray.composite.path>
+		<bintray.zip.path>zipped</bintray.zip.path>
+		<!-- note that the following must be consistent with the path schema
+			used to publish child composite repositories and actual released p2 repositories -->
+		<child.repository.path.prefix>../../releases/</child.repository.path.prefix>
+	</properties>
+
+	<build>
+		<plugins>
+			<!-- make sure that zipped p2 repositories have the fully qualified version -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<finalName>${project.artifactId}-${qualifiedVersion}</finalName>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<profile>
+			<!-- Activate this profile to perform the release to Bintray -->
+			<id>release-composite</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>${maven-antrun-plugin.version}</version>
+						<executions>
+							<execution>
+								<!-- Retrieve possibly existing remote composite metadata -->
+								<id>update-local-repository</id>
+								<phase>prepare-package</phase>
+								<configuration>
+									<target>
+										<ant antfile="${basedir}/bintray.ant" target="get-composite-metadata">
+										</ant>
+									</target>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+							
+							<execution>
+								<!-- Deploy p2 repository, p2 composite updated metadata and zipped p2 repository -->
+								<id>deploy-repository</id>
+								<phase>verify</phase>
+								<configuration>
+									<target>
+										<ant antfile="${basedir}/bintray.ant" target="push-to-bintray">
+										</ant>
+									</target>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-eclipserun-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<configuration>
+							<!-- Update p2 composite metadata or create it -->
+							<!-- IMPORTANT: DO NOT split the arg line -->
+							<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2composite.ant p2.composite.add -Dsite.label="${site.label}" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier} -Dchild.repository.path.prefix="${child.repository.path.prefix}"</appArgLine>
+							<repositories>
+								<repository>
+									<id>mars</id>
+									<layout>p2</layout>
+									<url>http://download.eclipse.org/releases/mars</url>
+								</repository>
+							</repositories>
+							<dependencies>
+								<dependency>
+									<artifactId>org.eclipse.ant.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.apache.ant</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
+									<type>eclipse-feature</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
+									<type>eclipse-feature</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.ds</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+							</dependencies>
+						</configuration>
+						<executions>
+							<execution>
+								<id>add-p2-composite-repository</id>
+								<phase>package</phase>
+								<goals>
+									<goal>eclipse-run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/com.googlecode.cppcheclipse.repository/removeFromBintray.sh b/com.googlecode.cppcheclipse.repository/removeFromBintray.sh
new file mode 100644
index 0000000..7c88b6e
--- /dev/null
+++ b/com.googlecode.cppcheclipse.repository/removeFromBintray.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+# remove p2 metadata artifacts from bintray remote path
+#Sample Usage: removeFromBintray.sh apikey remotePath
+API=https://api.bintray.com
+
+BINTRAY_API_KEY=$1
+PATH_TO_REPOSITORY=$2
+
+BINTRAY_USER=lorenzobettini
+BINTRAY_REPO=p2-composite-example
+
+function main() {
+remove_p2_metadata
+}
+
+function remove_p2_metadata() {
+echo "${BINTRAY_USER}"
+echo "${BINTRAY_API_KEY}"
+echo "${BINTRAY_REPO}"
+echo "${PCK_NAME}"
+echo "${PCK_VERSION}"
+echo "${PATH_TO_REPOSITORY}"
+
+
+echo "Removing metadata content.jar..."
+curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/content.jar"
+echo ""
+echo "Removing metadata artifacts.jar..."
+curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/artifacts.jar"
+echo ""
+echo "Removing metadata compositeContent.xml..."
+curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/compositeContent.xml"
+echo ""
+echo "Removing metadata compositeArtifacts.xml..."
+curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/compositeArtifacts.xml"
+echo ""
+echo "Removing metadata p2.index..."
+curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/p2.index"
+echo ""
+
+}
+
+
+
+main "$@"
\ No newline at end of file
diff --git a/com.googlecode.cppcheclipse.target/pom.xml b/com.googlecode.cppcheclipse.target/pom.xml
index 22b8eea..0f65859 100644
--- a/com.googlecode.cppcheclipse.target/pom.xml
+++ b/com.googlecode.cppcheclipse.target/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
 		<groupId>com.googlecode.cppcheclipse</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0</version>
 		<relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
 	</parent>
 
diff --git a/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF
index 207eaab..577fdb6 100644
--- a/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF
+++ b/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse UI Tests
 Bundle-SymbolicName: com.googlecode.cppcheclipse.ui.tests
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0
 Bundle-Vendor: Konrad Windszus
 Fragment-Host: com.googlecode.cppcheclipse.ui;bundle-version="0.9.8"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/com.googlecode.cppcheclipse.ui.tests/pom.xml b/com.googlecode.cppcheclipse.ui.tests/pom.xml
index 5093aaf..5e912ea 100644
--- a/com.googlecode.cppcheclipse.ui.tests/pom.xml
+++ b/com.googlecode.cppcheclipse.ui.tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.ui.tests</artifactId>
diff --git a/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF
index 1e50831..f053595 100644
--- a/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF
+++ b/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse UI
 Bundle-SymbolicName: com.googlecode.cppcheclipse.ui;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0
 Bundle-Activator: com.googlecode.cppcheclipse.ui.Activator
 Bundle-Vendor: Konrad Windszus
 Require-Bundle: org.eclipse.ui;bundle-version="3.4.0",
diff --git a/com.googlecode.cppcheclipse.ui/pom.xml b/com.googlecode.cppcheclipse.ui/pom.xml
index a8ee28e..0f29da7 100644
--- a/com.googlecode.cppcheclipse.ui/pom.xml
+++ b/com.googlecode.cppcheclipse.ui/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.ui</artifactId>

From 36170f1526bb631b31e7e290badfc9e399354159 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <konrad_w@gmx.de>
Date: Sun, 24 Jul 2016 18:43:09 +0200
Subject: [PATCH 2/2] always include qualifier in version, tweaks to allow
 uploads to bintray

---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 com.googlecode.cppcheclipse.core/pom.xml      |  2 +-
 .../feature.xml                               |  2 +-
 com.googlecode.cppcheclipse.feature/pom.xml   |  2 +-
 com.googlecode.cppcheclipse.parent/pom.xml    | 47 ++++++++++++++++++-
 .../category.xml                              |  2 +-
 .../pom.xml                                   |  6 ++-
 .../removeFromBintray.sh                      | 15 +++---
 com.googlecode.cppcheclipse.target/pom.xml    |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 com.googlecode.cppcheclipse.ui.tests/pom.xml  |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 com.googlecode.cppcheclipse.ui/pom.xml        |  2 +-
 15 files changed, 70 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 com.googlecode.cppcheclipse.repository/removeFromBintray.sh

diff --git a/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF
index e597edc..6be1077 100644
--- a/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF
+++ b/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse Core Tests
 Bundle-SymbolicName: com.googlecode.cppcheclipse.core.tests
-Bundle-Version: 1.1.0
+Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Konrad Windszus
 Fragment-Host: com.googlecode.cppcheclipse.core;bundle-version="0.9.8"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/com.googlecode.cppcheclipse.core.tests/pom.xml b/com.googlecode.cppcheclipse.core.tests/pom.xml
index 4f84119..96e74c7 100644
--- a/com.googlecode.cppcheclipse.core.tests/pom.xml
+++ b/com.googlecode.cppcheclipse.core.tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.1.0</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.core.tests</artifactId>
diff --git a/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF
index 07961de..49e4e87 100644
--- a/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF
+++ b/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse Core
 Bundle-SymbolicName: com.googlecode.cppcheclipse.core;singleton:=true
-Bundle-Version: 1.1.0
+Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: com.googlecode.cppcheclipse.core.CppcheclipsePlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.ui;bundle-version="3.5.0",
diff --git a/com.googlecode.cppcheclipse.core/pom.xml b/com.googlecode.cppcheclipse.core/pom.xml
index d33a5dc..2a5dc48 100644
--- a/com.googlecode.cppcheclipse.core/pom.xml
+++ b/com.googlecode.cppcheclipse.core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.1.0</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.core</artifactId>
diff --git a/com.googlecode.cppcheclipse.feature/feature.xml b/com.googlecode.cppcheclipse.feature/feature.xml
index 564fc93..b80fdaf 100644
--- a/com.googlecode.cppcheclipse.feature/feature.xml
+++ b/com.googlecode.cppcheclipse.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.googlecode.cppcheclipse.feature"
       label="cppcheclipse"
-      version="1.1.0"
+      version="1.1.0.qualifier"
       provider-name="Konrad Windszus"
       plugin="com.googlecode.cppcheclipse.core">
 
diff --git a/com.googlecode.cppcheclipse.feature/pom.xml b/com.googlecode.cppcheclipse.feature/pom.xml
index aec9720..d6b9bab 100644
--- a/com.googlecode.cppcheclipse.feature/pom.xml
+++ b/com.googlecode.cppcheclipse.feature/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.1.0</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.feature</artifactId>
diff --git a/com.googlecode.cppcheclipse.parent/pom.xml b/com.googlecode.cppcheclipse.parent/pom.xml
index 7e7e03c..f1360f7 100644
--- a/com.googlecode.cppcheclipse.parent/pom.xml
+++ b/com.googlecode.cppcheclipse.parent/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.googlecode.cppcheclipse</groupId>
 	<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<!-- tycho requires maven >= 3.0 -->
@@ -86,6 +86,51 @@
 					</execution>
 				</executions>
 			</plugin>
+	<!--  
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>-->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>attach-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- generate qualifier -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<format>'v'yyyyMMdd'-'HHmm</format>
+				</configuration>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-versions-plugin</artifactId>
+				<version>${tycho-version}</version>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/com.googlecode.cppcheclipse.repository/category.xml b/com.googlecode.cppcheclipse.repository/category.xml
index 9d8745f..57627be 100644
--- a/com.googlecode.cppcheclipse.repository/category.xml
+++ b/com.googlecode.cppcheclipse.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.googlecode.cppcheclipse.feature_1.1.0.jar" id="com.googlecode.cppcheclipse.feature" version="1.1.0">
+   <feature url="features/com.googlecode.cppcheclipse.feature_1.1.0.qualifier.jar" id="com.googlecode.cppcheclipse.feature" version="1.1.0.qualifier">
       <category name="cppcheclipse"/>
    </feature>
    <category-def name="cppcheclipse" label="cppcheclipse"/>
diff --git a/com.googlecode.cppcheclipse.repository/pom.xml b/com.googlecode.cppcheclipse.repository/pom.xml
index 3ea02d2..c33046b 100644
--- a/com.googlecode.cppcheclipse.repository/pom.xml
+++ b/com.googlecode.cppcheclipse.repository/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.1.0</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.repository</artifactId>
@@ -38,7 +38,9 @@
 
 	<build>
 		<plugins>
-			<!-- make sure that zipped p2 repositories have the fully qualified version -->
+			<!-- make sure that zipped p2 repositories have the fully qualified version.
+				 This is set through https://eclipse.org/tycho/sitedocs/tycho-packaging-plugin/build-qualifier-mojo.html
+			 -->
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-repository-plugin</artifactId>
diff --git a/com.googlecode.cppcheclipse.repository/removeFromBintray.sh b/com.googlecode.cppcheclipse.repository/removeFromBintray.sh
old mode 100644
new mode 100755
index 7c88b6e..6424a9b
--- a/com.googlecode.cppcheclipse.repository/removeFromBintray.sh
+++ b/com.googlecode.cppcheclipse.repository/removeFromBintray.sh
@@ -6,8 +6,9 @@ API=https://api.bintray.com
 BINTRAY_API_KEY=$1
 PATH_TO_REPOSITORY=$2
 
-BINTRAY_USER=lorenzobettini
-BINTRAY_REPO=p2-composite-example
+BINTRAY_USER=kwin
+BINTRAY_REPO=p2
+BINTRAY_ORGANISATION=cppcheclipse
 
 function main() {
 remove_p2_metadata
@@ -23,19 +24,19 @@ echo "${PATH_TO_REPOSITORY}"
 
 
 echo "Removing metadata content.jar..."
-curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/content.jar"
+curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_ORGANISATION}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/content.jar"
 echo ""
 echo "Removing metadata artifacts.jar..."
-curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/artifacts.jar"
+curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_ORGANISATION}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/artifacts.jar"
 echo ""
 echo "Removing metadata compositeContent.xml..."
-curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/compositeContent.xml"
+curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_ORGANISATION}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/compositeContent.xml"
 echo ""
 echo "Removing metadata compositeArtifacts.xml..."
-curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/compositeArtifacts.xml"
+curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_ORGANISATION}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/compositeArtifacts.xml"
 echo ""
 echo "Removing metadata p2.index..."
-curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/p2.index"
+curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_ORGANISATION}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/p2.index"
 echo ""
 
 }
diff --git a/com.googlecode.cppcheclipse.target/pom.xml b/com.googlecode.cppcheclipse.target/pom.xml
index 0f65859..53d0fa3 100644
--- a/com.googlecode.cppcheclipse.target/pom.xml
+++ b/com.googlecode.cppcheclipse.target/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
 		<groupId>com.googlecode.cppcheclipse</groupId>
-		<version>1.1.0</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
 	</parent>
 
diff --git a/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF
index 577fdb6..87191fd 100644
--- a/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF
+++ b/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse UI Tests
 Bundle-SymbolicName: com.googlecode.cppcheclipse.ui.tests
-Bundle-Version: 1.1.0
+Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Konrad Windszus
 Fragment-Host: com.googlecode.cppcheclipse.ui;bundle-version="0.9.8"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/com.googlecode.cppcheclipse.ui.tests/pom.xml b/com.googlecode.cppcheclipse.ui.tests/pom.xml
index 5e912ea..61570ea 100644
--- a/com.googlecode.cppcheclipse.ui.tests/pom.xml
+++ b/com.googlecode.cppcheclipse.ui.tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.1.0</version>
+    <version>1.1.0.qualifier</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.ui.tests</artifactId>
diff --git a/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF
index f053595..4090117 100644
--- a/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF
+++ b/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse UI
 Bundle-SymbolicName: com.googlecode.cppcheclipse.ui;singleton:=true
-Bundle-Version: 1.1.0
+Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: com.googlecode.cppcheclipse.ui.Activator
 Bundle-Vendor: Konrad Windszus
 Require-Bundle: org.eclipse.ui;bundle-version="3.4.0",
diff --git a/com.googlecode.cppcheclipse.ui/pom.xml b/com.googlecode.cppcheclipse.ui/pom.xml
index 0f29da7..fad00f0 100644
--- a/com.googlecode.cppcheclipse.ui/pom.xml
+++ b/com.googlecode.cppcheclipse.ui/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.1.0</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.ui</artifactId>