Skip to content

Commit 489bc74

Browse files
danmardanmar
authored
Merge pull request #6 from garbbraf/rel_1.2.0
chore(rel): [v1.2.0] new release procedure
2 parents 17fb50e + 965e8fe commit 489bc74

File tree

15 files changed

+108
-180
lines changed

15 files changed

+108
-180
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.2.qualifier
5+
Bundle-Version: 1.2.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.2-SNAPSHOT</version>
9+
<version>1.2.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.2.qualifier
5+
Bundle-Version: 1.2.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.2-SNAPSHOT</version>
9+
<version>1.2.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.2.qualifier"
5+
version="1.2.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.2-SNAPSHOT</version>
9+
<version>1.2.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: 3 additions & 18 deletions
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.2-SNAPSHOT</version>
8+
<version>1.2.0-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

1111
<!-- tycho requires maven >= 3.0 -->
@@ -107,21 +107,6 @@
107107
</execution>
108108
</executions>
109109
</plugin>
110-
<!--
111-
<plugin>
112-
<groupId>org.eclipse.tycho.extras</groupId>
113-
<artifactId>tycho-source-feature-plugin</artifactId>
114-
<version>${tycho-version}</version>
115-
<executions>
116-
<execution>
117-
<id>source-feature</id>
118-
<phase>package</phase>
119-
<goals>
120-
<goal>source-feature</goal>
121-
</goals>
122-
</execution>
123-
</executions>
124-
</plugin>-->
125110
<plugin>
126111
<groupId>org.eclipse.tycho</groupId>
127112
<artifactId>tycho-p2-plugin</artifactId>
@@ -146,13 +131,13 @@
146131
<format>'v'yyyyMMdd'-'HHmm</format>
147132
</configuration>
148133
</plugin>
149-
134+
150135
<plugin>
151136
<groupId>org.eclipse.tycho</groupId>
152137
<artifactId>tycho-versions-plugin</artifactId>
153138
<version>${tycho-version}</version>
154139
</plugin>
155-
</plugins>
140+
</plugins>
156141
</build>
157142

158143
<modules>

‎com.googlecode.cppcheclipse.parent/release.txt‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,31 @@
1-
To release version x do the following steps:
1+
To release version X do the following steps:
22

3-
make sure there are no uncommitted changes
4-
mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=<version x>
5-
refresh category.xml (to point to feature in right version)
6-
mvn clean verify -Prelease-composite (see also http://www.lorenzobettini.it/2016/02/publish-an-eclipse-p2-composite-repository-on-bintray/)
7-
tag (from local workspace)
8-
mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=<version x+1>-SNAPSHOT
9-
afterwards the category.xml has to be updated manually, due to the changed version of the referenced feature
10-
commit
3+
* rake sure there are no uncommitted changes
4+
* run: `mvn org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=<version X>`
5+
* refresh category.xml (to point to feature in right version)
6+
* update access credentials in .m2/settings.xml for 'cppcheck-p2-repo' server:
7+
(...)
8+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
9+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
11+
<localRepository>/home/<user>>/.m2/repository</localRepository>
12+
<interactiveMode/>
13+
<offline/>
14+
<pluginGroups/>
15+
<mirrors/>
16+
<proxies/>
17+
<profiles/>
18+
<activeProfiles/>
19+
<servers>
20+
<server>
21+
<id>cppcheck-p2-repo</id>
22+
<username>user</username>
23+
<password>pass</password>
24+
</server>
25+
</servers>
26+
</settings>
27+
(...)
28+
* run `mvn clean install -P upload-p2-repo` (if you want to override ftp url run `mvn clean install -P upload-p2-repo -Dftp.url=<new_url>`)
29+
* tag the git repo (from local workspace)
30+
* run `mvn org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=<version X+1>-SNAPSHOT`
31+
* afterwards the category.xml has to be updated manually, due to the changed version of the referenced feature commit

‎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.2.qualifier.jar" id="com.googlecode.cppcheclipse.feature" version="1.1.2.qualifier">
3+
<feature url="features/com.googlecode.cppcheclipse.feature_1.2.0.qualifier.jar" id="com.googlecode.cppcheclipse.feature" version="1.2.0.qualifier">
44
<category name="cppcheclipse"/>
55
</feature>
66
<category-def name="cppcheclipse" label="cppcheclipse"/>

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

Lines changed: 63 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -1,157 +1,79 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5-
<modelVersion>4.0.0</modelVersion>
6-
<parent>
7-
<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
8-
<groupId>com.googlecode.cppcheclipse</groupId>
9-
<version>1.1.2-SNAPSHOT</version>
10-
<relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
11-
</parent>
12-
<artifactId>com.googlecode.cppcheclipse.repository</artifactId>
13-
<packaging>eclipse-repository</packaging>
14-
15-
<!-- settings for bintray deployment, taken from https://raw.githubusercontent.com/LorenzoBettini/p2composite-bintray-example/master/p2composite.example.site/pom.xml -->
16-
<properties>
17-
<!-- The name of your own Bintray repository -->
18-
<bintray.repo>p2</bintray.repo>
19-
<!-- The name of your own Bintray repository's package for releases -->
20-
<bintray.package>releases</bintray.package>
21-
<!-- The label for the Composite sites -->
22-
<site.label>Composite Site for cppcheclipse</site.label>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
8+
<groupId>com.googlecode.cppcheclipse</groupId>
9+
<version>1.2.0-SNAPSHOT</version>
10+
<relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
11+
</parent>
12+
<artifactId>com.googlecode.cppcheclipse.repository</artifactId>
13+
<packaging>eclipse-repository</packaging>
2314

24-
<!-- If the Bintray repository is owned by someone different from your
25-
user, then specify the bintray.owner explicitly -->
26-
<bintray.owner>cppcheclipse</bintray.owner>
27-
<!-- Define bintray.user and bintray.apikey in some secret place,
28-
like .m2/settings.xml -->
15+
<properties>
16+
17+
</properties>
2918

30-
<!-- Default values for remote directories -->
31-
<bintray.releases.path>releases</bintray.releases.path>
32-
<bintray.composite.path>updates</bintray.composite.path>
33-
<bintray.zip.path>zipped</bintray.zip.path>
34-
<!-- note that the following must be consistent with the path schema
35-
used to publish child composite repositories and actual released p2 repositories -->
36-
<child.repository.path.prefix>../../releases/</child.repository.path.prefix>
19+
<build>
20+
<extensions>
21+
<extension>
22+
<groupId>org.apache.maven.wagon</groupId>
23+
<artifactId>wagon-ftp</artifactId>
24+
<version>3.4.3</version>
25+
</extension>
26+
</extensions>
27+
</build>
28+
29+
<profiles>
30+
<!-- This profile is used to upload the repo -->
31+
<profile>
32+
<id>upload-p2-repo</id>
33+
<properties>
34+
<!-- Properties relative to the
35+
distant host where to upload the repo -->
36+
<ftp.url>ftp://ftpcluster.loopia.se</ftp.url>
37+
<!-- Relative path to the repo being uploaded -->
38+
<local.p2.repository>${project.build.directory}/repository/</local.p2.repository>
39+
<remote.p2.repository>/</remote.p2.repository>
3740
</properties>
3841

3942
<build>
4043
<plugins>
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-
-->
4444
<plugin>
45-
<groupId>org.eclipse.tycho</groupId>
46-
<artifactId>tycho-p2-repository-plugin</artifactId>
47-
<version>${tycho-version}</version>
45+
<groupId>org.codehaus.mojo</groupId>
46+
<artifactId>wagon-maven-plugin</artifactId>
47+
<version>2.0.0</version>
48+
<executions>
49+
<execution>
50+
<id>upload-repo</id>
51+
<phase>install</phase>
52+
<goals>
53+
<goal>upload</goal>
54+
</goals>
4855
<configuration>
49-
<finalName>${project.artifactId}-${qualifiedVersion}</finalName>
56+
<fromDir>${local.p2.repository}</fromDir>
57+
<toDir>${remote.p2.repository}</toDir>
58+
<includes>**/*</includes>
59+
<excludes>pom.xml</excludes>
60+
<url>${ftp.url}</url>
61+
<!-- Points to .m2/settings.xml
62+
where the connection settings are
63+
stored as shown below -->
64+
<!-- <server> -->
65+
<!-- <id>cppcheck-p2-repo</id> -->
66+
<!-- <username>username</username> -->
67+
<!-- <password>password</password> -->
68+
<!-- </server> -->
69+
<serverId>cppcheck-p2-repo</serverId>
5070
</configuration>
71+
</execution>
72+
</executions>
5173
</plugin>
5274
</plugins>
5375
</build>
54-
55-
<profiles>
56-
<profile>
57-
<!-- Activate this profile to perform the release to Bintray -->
58-
<id>release-composite</id>
59-
<activation>
60-
<activeByDefault>false</activeByDefault>
61-
</activation>
62-
63-
<build>
64-
<plugins>
65-
<plugin>
66-
<artifactId>maven-antrun-plugin</artifactId>
67-
<version>${maven-antrun-plugin.version}</version>
68-
<executions>
69-
<execution>
70-
<!-- Retrieve possibly existing remote composite metadata -->
71-
<id>update-local-repository</id>
72-
<phase>prepare-package</phase>
73-
<configuration>
74-
<target>
75-
<ant antfile="${basedir}/bintray.ant" target="get-composite-metadata">
76-
</ant>
77-
</target>
78-
</configuration>
79-
<goals>
80-
<goal>run</goal>
81-
</goals>
82-
</execution>
83-
84-
<execution>
85-
<!-- Deploy p2 repository, p2 composite updated metadata and zipped p2 repository -->
86-
<id>deploy-repository</id>
87-
<phase>verify</phase>
88-
<configuration>
89-
<target>
90-
<ant antfile="${basedir}/bintray.ant" target="push-to-bintray">
91-
</ant>
92-
</target>
93-
</configuration>
94-
<goals>
95-
<goal>run</goal>
96-
</goals>
97-
</execution>
98-
</executions>
99-
</plugin>
100-
101-
<plugin>
102-
<groupId>org.eclipse.tycho.extras</groupId>
103-
<artifactId>tycho-eclipserun-plugin</artifactId>
104-
<version>${tycho-version}</version>
105-
<configuration>
106-
<!-- Update p2 composite metadata or create it -->
107-
<!-- IMPORTANT: DO NOT split the arg line -->
108-
<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>
109-
<repositories>
110-
<repository>
111-
<id>mars</id>
112-
<layout>p2</layout>
113-
<url>http://download.eclipse.org/releases/mars</url>
114-
</repository>
115-
</repositories>
116-
<dependencies>
117-
<dependency>
118-
<artifactId>org.eclipse.ant.core</artifactId>
119-
<type>eclipse-plugin</type>
120-
</dependency>
121-
<dependency>
122-
<artifactId>org.apache.ant</artifactId>
123-
<type>eclipse-plugin</type>
124-
</dependency>
125-
<dependency>
126-
<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
127-
<type>eclipse-plugin</type>
128-
</dependency>
129-
<dependency>
130-
<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
131-
<type>eclipse-feature</type>
132-
</dependency>
133-
<dependency>
134-
<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
135-
<type>eclipse-feature</type>
136-
</dependency>
137-
<dependency>
138-
<artifactId>org.eclipse.equinox.ds</artifactId>
139-
<type>eclipse-plugin</type>
140-
</dependency>
141-
</dependencies>
142-
</configuration>
143-
<executions>
144-
<execution>
145-
<id>add-p2-composite-repository</id>
146-
<phase>package</phase>
147-
<goals>
148-
<goal>eclipse-run</goal>
149-
</goals>
150-
</execution>
151-
</executions>
152-
</plugin>
153-
</plugins>
154-
</build>
155-
</profile>
76+
</profile>
15677
</profiles>
78+
15779
</project>

0 commit comments

Comments
 (0)