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 @@
com.googlecode.cppcheclipse.parent
com.googlecode.cppcheclipse
- 1.0.1-SNAPSHOT
+ 1.1.0
../com.googlecode.cppcheclipse.parent/pom.xml
com.googlecode.cppcheclipse.core.tests
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 @@
com.googlecode.cppcheclipse.parent
com.googlecode.cppcheclipse
- 1.0.1-SNAPSHOT
+ 1.1.0
../com.googlecode.cppcheclipse.parent/pom.xml
com.googlecode.cppcheclipse.core
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 @@
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 @@
com.googlecode.cppcheclipse.parent
com.googlecode.cppcheclipse
- 1.0.1-SNAPSHOT
+ 1.1.0
../com.googlecode.cppcheclipse.parent/pom.xml
com.googlecode.cppcheclipse.feature
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 @@
4.0.0
com.googlecode.cppcheclipse
com.googlecode.cppcheclipse.parent
- 1.0.1-SNAPSHOT
+ 1.1.0
pom
@@ -16,6 +16,7 @@
0.24.0
UTF-8
+ 1.7
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=
-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=-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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
-
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ version=1
+metadata.repository.factory.order=compositeContent.xml,\!
+artifact.repository.factory.order=compositeArtifacts.xml,\!
+
+
+
+
+
+
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 @@
com.googlecode.cppcheclipse.parent
com.googlecode.cppcheclipse
- 1.0.1-SNAPSHOT
+ 1.1.0
../com.googlecode.cppcheclipse.parent/pom.xml
com.googlecode.cppcheclipse.repository
eclipse-repository
+
+
+
+ p2
+
+ releases
+
+ Composite Site for cppcheclipse
+
+
+ cppcheclipse
+
+
+
+ releases
+ updates
+ zipped
+
+ ../../releases/
+
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-repository-plugin
+ ${tycho-version}
+
+ ${project.artifactId}-${qualifiedVersion}
+
+
+
+
+
+
+
+
+ release-composite
+
+ false
+
+
+
+
+
+ maven-antrun-plugin
+ ${maven-antrun-plugin.version}
+
+
+
+ update-local-repository
+ prepare-package
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+ deploy-repository
+ verify
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+
+ org.eclipse.tycho.extras
+ tycho-eclipserun-plugin
+ ${tycho-version}
+
+
+
+ -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}"
+
+
+ mars
+ p2
+ http://download.eclipse.org/releases/mars
+
+
+
+
+ org.eclipse.ant.core
+ eclipse-plugin
+
+
+ org.apache.ant
+ eclipse-plugin
+
+
+ org.eclipse.equinox.p2.repository.tools
+ eclipse-plugin
+
+
+ org.eclipse.equinox.p2.core.feature
+ eclipse-feature
+
+
+ org.eclipse.equinox.p2.extras.feature
+ eclipse-feature
+
+
+ org.eclipse.equinox.ds
+ eclipse-plugin
+
+
+
+
+
+ add-p2-composite-repository
+ package
+
+ eclipse-run
+
+
+
+
+
+
+
+
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 @@
com.googlecode.cppcheclipse.parent
com.googlecode.cppcheclipse
- 1.0.1-SNAPSHOT
+ 1.1.0
../com.googlecode.cppcheclipse.parent/pom.xml
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 @@
com.googlecode.cppcheclipse.parent
com.googlecode.cppcheclipse
- 1.0.1-SNAPSHOT
+ 1.1.0
../com.googlecode.cppcheclipse.parent/pom.xml
com.googlecode.cppcheclipse.ui.tests
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 @@
com.googlecode.cppcheclipse.parent
com.googlecode.cppcheclipse
- 1.0.1-SNAPSHOT
+ 1.1.0
../com.googlecode.cppcheclipse.parent/pom.xml
com.googlecode.cppcheclipse.ui