Skip to content

Commit 36170f1

Browse files
kwinkwin
committed
always include qualifier in version, tweaks to allow uploads to bintray
1 parent 7b204dc commit 36170f1

File tree

15 files changed

+70
-22
lines changed

15 files changed

+70
-22
lines changed

‎com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: cppcheclipse Core Tests
44
Bundle-SymbolicName: com.googlecode.cppcheclipse.core.tests
5-
Bundle-Version: 1.1.0
5+
Bundle-Version: 1.1.0.qualifier
66
Bundle-Vendor: Konrad Windszus
77
Fragment-Host: com.googlecode.cppcheclipse.core;bundle-version="0.9.8"
88
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

‎com.googlecode.cppcheclipse.core.tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
88
<groupId>com.googlecode.cppcheclipse</groupId>
9-
<version>1.1.0</version>
9+
<version>1.1.0-SNAPSHOT</version>
1010
<relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
1111
</parent>
1212
<artifactId>com.googlecode.cppcheclipse.core.tests</artifactId>

‎com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: cppcheclipse Core
44
Bundle-SymbolicName: com.googlecode.cppcheclipse.core;singleton:=true
5-
Bundle-Version: 1.1.0
5+
Bundle-Version: 1.1.0.qualifier
66
Bundle-Activator: com.googlecode.cppcheclipse.core.CppcheclipsePlugin
77
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
88
org.eclipse.ui;bundle-version="3.5.0",

‎com.googlecode.cppcheclipse.core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
88
<groupId>com.googlecode.cppcheclipse</groupId>
9-
<version>1.1.0</version>
9+
<version>1.1.0-SNAPSHOT</version>
1010
<relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
1111
</parent>
1212
<artifactId>com.googlecode.cppcheclipse.core</artifactId>

‎com.googlecode.cppcheclipse.feature/feature.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="com.googlecode.cppcheclipse.feature"
44
label="cppcheclipse"
5-
version="1.1.0"
5+
version="1.1.0.qualifier"
66
provider-name="Konrad Windszus"
77
plugin="com.googlecode.cppcheclipse.core">
88

‎com.googlecode.cppcheclipse.feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
88
<groupId>com.googlecode.cppcheclipse</groupId>
9-
<version>1.1.0</version>
9+
<version>1.1.0-SNAPSHOT</version>
1010
<relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
1111
</parent>
1212
<artifactId>com.googlecode.cppcheclipse.feature</artifactId>

‎com.googlecode.cppcheclipse.parent/pom.xml‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.googlecode.cppcheclipse</groupId>
77
<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
8-
<version>1.1.0</version>
8+
<version>1.1.0-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

1111
<!-- tycho requires maven >= 3.0 -->
@@ -86,6 +86,51 @@
8686
</execution>
8787
</executions>
8888
</plugin>
89+
<!--
90+
<plugin>
91+
<groupId>org.eclipse.tycho.extras</groupId>
92+
<artifactId>tycho-source-feature-plugin</artifactId>
93+
<version>${tycho-version}</version>
94+
<executions>
95+
<execution>
96+
<id>source-feature</id>
97+
<phase>package</phase>
98+
<goals>
99+
<goal>source-feature</goal>
100+
</goals>
101+
</execution>
102+
</executions>
103+
</plugin>-->
104+
<plugin>
105+
<groupId>org.eclipse.tycho</groupId>
106+
<artifactId>tycho-p2-plugin</artifactId>
107+
<version>${tycho-version}</version>
108+
<executions>
109+
<execution>
110+
<id>attach-p2-metadata</id>
111+
<phase>package</phase>
112+
<goals>
113+
<goal>p2-metadata</goal>
114+
</goals>
115+
</execution>
116+
</executions>
117+
</plugin>
118+
119+
<!-- generate qualifier -->
120+
<plugin>
121+
<groupId>org.eclipse.tycho</groupId>
122+
<artifactId>tycho-packaging-plugin</artifactId>
123+
<version>${tycho-version}</version>
124+
<configuration>
125+
<format>'v'yyyyMMdd'-'HHmm</format>
126+
</configuration>
127+
</plugin>
128+
129+
<plugin>
130+
<groupId>org.eclipse.tycho</groupId>
131+
<artifactId>tycho-versions-plugin</artifactId>
132+
<version>${tycho-version}</version>
133+
</plugin>
89134
</plugins>
90135
</build>
91136

‎com.googlecode.cppcheclipse.repository/category.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<site>
3-
<feature url="features/com.googlecode.cppcheclipse.feature_1.1.0.jar" id="com.googlecode.cppcheclipse.feature" version="1.1.0">
3+
<feature url="features/com.googlecode.cppcheclipse.feature_1.1.0.qualifier.jar" id="com.googlecode.cppcheclipse.feature" version="1.1.0.qualifier">
44
<category name="cppcheclipse"/>
55
</feature>
66
<category-def name="cppcheclipse" label="cppcheclipse"/>

‎com.googlecode.cppcheclipse.repository/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
88
<groupId>com.googlecode.cppcheclipse</groupId>
9-
<version>1.1.0</version>
9+
<version>1.1.0-SNAPSHOT</version>
1010
<relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
1111
</parent>
1212
<artifactId>com.googlecode.cppcheclipse.repository</artifactId>
@@ -38,7 +38,9 @@
3838

3939
<build>
4040
<plugins>
41-
<!-- make sure that zipped p2 repositories have the fully qualified version -->
41+
<!-- make sure that zipped p2 repositories have the fully qualified version.
42+
This is set through https://eclipse.org/tycho/sitedocs/tycho-packaging-plugin/build-qualifier-mojo.html
43+
-->
4244
<plugin>
4345
<groupId>org.eclipse.tycho</groupId>
4446
<artifactId>tycho-p2-repository-plugin</artifactId>

‎com.googlecode.cppcheclipse.repository/removeFromBintray.sh‎

100644100755
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ API=https://api.bintray.com
66
BINTRAY_API_KEY=$1
77
PATH_TO_REPOSITORY=$2
88

9-
BINTRAY_USER=lorenzobettini
10-
BINTRAY_REPO=p2-composite-example
9+
BINTRAY_USER=kwin
10+
BINTRAY_REPO=p2
11+
BINTRAY_ORGANISATION=cppcheclipse
1112

1213
function main() {
1314
remove_p2_metadata
@@ -23,19 +24,19 @@ echo "${PATH_TO_REPOSITORY}"
2324

2425

2526
echo "Removing metadata content.jar..."
26-
curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/content.jar"
27+
curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_ORGANISATION}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/content.jar"
2728
echo ""
2829
echo "Removing metadata artifacts.jar..."
29-
curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/artifacts.jar"
30+
curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_ORGANISATION}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/artifacts.jar"
3031
echo ""
3132
echo "Removing metadata compositeContent.xml..."
32-
curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/compositeContent.xml"
33+
curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_ORGANISATION}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/compositeContent.xml"
3334
echo ""
3435
echo "Removing metadata compositeArtifacts.xml..."
35-
curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/compositeArtifacts.xml"
36+
curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_ORGANISATION}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/compositeArtifacts.xml"
3637
echo ""
3738
echo "Removing metadata p2.index..."
38-
curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_USER}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/p2.index"
39+
curl -X DELETE -u${BINTRAY_USER}:${BINTRAY_API_KEY} "https://api.bintray.com/content/${BINTRAY_ORGANISATION}/${BINTRAY_REPO}/${PATH_TO_REPOSITORY}/p2.index"
3940
echo ""
4041

4142
}

0 commit comments

Comments
 (0)