Repository: incubator-streams-master Updated Branches: refs/heads/master f55f2a45b -> b34a0b1b2
remove old email template - rat pass Project: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/commit/b34a0b1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/tree/b34a0b1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/diff/b34a0b1b Branch: refs/heads/master Commit: b34a0b1b22aa5ee55995e4c6423ff73fed8363ff Parents: f55f2a4 Author: Steve Blackmon <sblack...@apache.org> Authored: Sat Sep 17 16:46:51 2016 -0500 Committer: Steve Blackmon <sblack...@apache.org> Committed: Sat Sep 17 16:46:51 2016 -0500 ---------------------------------------------------------------------- pom.xml | 3 ++- src/site/markdown/release.md | 43 +++++++++++++++++++++++++++++-- src/site/resources/PPMC_Combined.txt | 37 -------------------------- src/site/resources/architecture.dot | 20 +++++++++++++- src/site/resources/example.dot | 20 +++++++++++++- 5 files changed, 81 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams-master/blob/b34a0b1b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 53e788f..63052f7 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ </release.repository.url> <!-- Plugin and Plugin Dependency Versions --> - <apache-rat.plugin.version>0.11</apache-rat.plugin.version> + <apache-rat.plugin.version>0.12</apache-rat.plugin.version> <build-helper.plugin.version>1.8</build-helper.plugin.version> <bundle.plugin.version>1.4.3</bundle.plugin.version> <compiler.plugin.version>3.0</compiler.plugin.version> @@ -1064,6 +1064,7 @@ <exclude>**/*.iml</exclude> <exclude>**/*.ini</exclude> <exclude>**/*.jar</exclude> + <exclude>**/*.svg</exclude> <exclude>dependency-reduced-pom.xml</exclude> <exclude>rat.txt</exclude> </excludes> http://git-wip-us.apache.org/repos/asf/incubator-streams-master/blob/b34a0b1b/src/site/markdown/release.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/release.md b/src/site/markdown/release.md index 6f8563a..c2aafda 100644 --- a/src/site/markdown/release.md +++ b/src/site/markdown/release.md @@ -192,5 +192,44 @@ In order to perform a combined release of the streams-master and streams-project * Do NOT perform step 10 until steps 1-9 have been completed for BOTH projects * Build the streams-master FIRST * When prompted to change dependencies on SNAPSHOTs, do so to the corresponding releases that you just built - * Execute the remaining steps using the following e-mail templates - * [PMC Release Vote](PPMC_Combined.txt) + * Execute the remaining steps using the following e-mail template + + to: streams-...@incubator.apache.org + subject: [VOTE] Apache Streams ${release.version} Release Candidate + + I've created a combined ${release.version} release candidate, with the + following artifacts up for a vote: + + incubator-streams-master source tag (r${release.version}): + https://git-wip-us.apache.org/repos/asf?p=incubator-streams-master.git;a=commit;h=... + + incubator-streams source tag (r${release.version}): + https://git-wip-us.apache.org/repos/asf?p=incubator-streams.git;a=commit;h=... + + incubator-streams-examples source tag (r${release.version}): + https://git-wip-us.apache.org/repos/asf?p=incubator-streams-examples.git;a=commit;h=... + + Maven staging repo: + https://repository.apache.org/content/repositories/${release.master.repository} + https://repository.apache.org/content/repositories/${release.project.repository} + https://repository.apache.org/content/repositories/${release.examples.repository} + + Source releases: + https://repository.apache.org/content/repositories/${release.master.repository}/org/apache/streams/streams-master/${release.version}/streams-master-${release.version}-source-release.zip + https://repository.apache.org/content/repositories/${release.project.repository}/org/apache/rave/rave-project/${release.version}/streams-project-${release.version}-incubating-source-release.zip + https://repository.apache.org/content/repositories/${release.project.repository}/org/apache/rave/rave-project/${release.version}/streams-project-${release.version}-incubating-source-release.zip + + Checksums of streams-master-${release.version}-source-release.zip: + MD5: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + SHA1: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + Release artifacts are signed with the following key: + https://people.apache.org/keys/committer/... + + Please take the time to verify the artifacts before casting your vote. + + Vote will be open for 72 hours. + + [ ] +1 approve + [ ] +0 no opinion + [ ] -1 disapprove (and reason why) http://git-wip-us.apache.org/repos/asf/incubator-streams-master/blob/b34a0b1b/src/site/resources/PPMC_Combined.txt ---------------------------------------------------------------------- diff --git a/src/site/resources/PPMC_Combined.txt b/src/site/resources/PPMC_Combined.txt deleted file mode 100644 index cf2a03d..0000000 --- a/src/site/resources/PPMC_Combined.txt +++ /dev/null @@ -1,37 +0,0 @@ -to: streams-...@incubator.apache.org -subject: [VOTE] Apache Streams 0.1-incubating Release Candidate - -I've created a combined ${release.version} release candidate, with the -following artifacts up for a vote: - -SVN source tag (r${release.master.revision}): -https://svn.apache.org/repos/asf/rave/rave-master-pom/tags/${release.version}/ - -SVN source tag (r${release.project.revision}): - -https://svn.apache.org/repos/asf/rave/tags/${release.version}/ - -Maven staging repo: -https://repository.apache.org/content/repositories/${release.master.repository}/ -https://repository.apache.org/content/repositories/${release.project.repository}/ - - -Source releases: -https://repository.apache.org/content/repositories/${release.master.repository}/org/apache/rave/rave-master/0.1-incubating/rave-master-0.1-incubating-source-release.zip -https://repository.apache.org/content/repositories/${release.project.repository}/org/apache/rave/rave-project/0.1-incubating/rave-project-0.1-incubating-source-release.zip - -Demo Artifacts -http://people.apache.org/builds/incubator/rave/${release.version}/rave-${release.version}-bin.tar.gz -http://people.apache.org/builds/incubator/rave/${release.version}/rave-${release.version}-bin.zip - -PGP release keys: -https://svn.apache.org/repos/asf/rave/KEYS - -Please take the time to verify the artifacts before casting your vote. - -Vote will be open for 72 hours. - -[ ] +1 approve -[ ] +0 no opinion -[ ] -1 disapprove (and reason why) - http://git-wip-us.apache.org/repos/asf/incubator-streams-master/blob/b34a0b1b/src/site/resources/architecture.dot ---------------------------------------------------------------------- diff --git a/src/site/resources/architecture.dot b/src/site/resources/architecture.dot index 6aaa8a6..ea3fd79 100644 --- a/src/site/resources/architecture.dot +++ b/src/site/resources/architecture.dot @@ -1,4 +1,22 @@ -digraph g { +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + digraph g { graph [compound = true]; http://git-wip-us.apache.org/repos/asf/incubator-streams-master/blob/b34a0b1b/src/site/resources/example.dot ---------------------------------------------------------------------- diff --git a/src/site/resources/example.dot b/src/site/resources/example.dot index ece7b5c..9d0428c 100644 --- a/src/site/resources/example.dot +++ b/src/site/resources/example.dot @@ -1,4 +1,22 @@ -digraph g { +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + digraph g { graph [compound = true];