You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zipkin.apache.org by ad...@apache.org on 2019/06/02 04:15:15 UTC
[incubator-zipkin-b3-propagation] branch master updated: cleanups
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-b3-propagation.git
The following commit(s) were added to refs/heads/master by this push:
new 95f8fe5 cleanups
95f8fe5 is described below
commit 95f8fe5d6da37235b69b1bf1edbbc694a42743dc
Author: Adrian Cole <ac...@pivotal.io>
AuthorDate: Sun Jun 2 12:15:05 2019 +0800
cleanups
---
.github/CONTRIBUTING.md | 2 +-
CONTRIBUTING.md | 30 ------------------------------
DISCLAIMER | 2 +-
NOTICE | 2 +-
RELEASE.md | 41 -----------------------------------------
5 files changed, 3 insertions(+), 74 deletions(-)
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index d4ca35f..8f4ba8a 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to Apache Zipkin (incubating)
+# Contributing to Apache Zipkin B3 Propagation (incubating)
If you would like to contribute code, fork this GitHub repository and
send a pull request on a branch other than `master`.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 4cb5efe..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributing to Zipkin
-
-If you would like to contribute code you can do so through GitHub by forking the repository and sending a pull request (on a branch other than `master` or `gh-pages`).
-
-When submitting code, please apply [Square Code Style](https://github.com/square/java-code-styles).
-* If the settings import correctly, CodeStyle/Java will be named Square and use 2 space tab and indent, with 4 space continuation indent.
-
-## License
-
-By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/openzipkin/zipkin/blob/master/LICENSE
-
-All files are released with the Apache 2.0 license.
-
-If you are adding a new file it should have a header like below. This can be automatically added by running `./mvnw com.mycila:license-maven-plugin:format`.
-
-```
-/**
- * Copyright 2016 The OpenZipkin Authors
- *
- * Licensed 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.
- */
- ```
diff --git a/DISCLAIMER b/DISCLAIMER
index f73ab06..728b3bf 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER
@@ -1,4 +1,4 @@
-Apache Zipkin (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
+Apache Zipkin B3 Propagation (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
Incubation is required of all newly accepted projects until a further review indicates
that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects.
While incubation status is not necessarily a reflection of the completeness or stability of the code,
diff --git a/NOTICE b/NOTICE
index c176eeb..0041e35 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Zipkin (incubating)
+Apache Zipkin B3 Propagation (incubating)
Copyright 2019 The Apache Software Foundation
This product includes software developed at
diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index e62f58f..0000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# B3 Propagation Release Process
-
-This repo uses semantic versions. Please keep this in mind when choosing version numbers.
-
-1. **Alert others you are releasing**
-
- There should be no commits made to master while the release is in progress (about 10 minutes). Before you start
- a release, alert others on [gitter](https://gitter.im/openzipkin/zipkin) so that they don't accidentally merge
- anything. If they do, and the build fails because of that, you'll have to recreate the release tag described below.
-
-1. **Push a git tag**
-
- The tag should be of the format `release-N.M.L`, for example `release-3.7.1`.
-
-1. **Wait for CircleCI**
-
- This part is controlled by [`build-support/publish-stable.sh`](build-support/publish-stable.sh). It creates a bunch of new commits, bumps
- the version, publishes artifacts, and syncs to Maven Central. https://circleci.com/gh/openzipkin/b3-propagation
-
-## Credentials
-
-Credentials of various kind are needed for the release process to work. If you notice something
-failing due to unauthorized, re-save them as [environment variables](https://circleci.com/gh/openzipkin/b3-propagation/edit#env-vars).
-
-## First release of the year
-
-The license plugin verifies license headers of files include a copyright notice indicating the years a file was affected.
-This information is taken from git history. There's a once-a-year problem with files that include version numbers (pom.xml).
-When a release tag is made, it increments version numbers, then commits them to git. On the first release of the year,
-further commands will fail due to the version increments invalidating the copyright statement. The way to sort this out is
-the following:
-
-Before you do the first release of the year, move the SNAPSHOT version back and forth from whatever the current is.
-In-between, re-apply the licenses.
-```bash
-$ ./mvnw versions:set -DnewVersion=1.3.3-SNAPSHOT -DgenerateBackupPoms=false
-$ ./mvnw com.mycila:license-maven-plugin:format
-$ ./mvnw versions:set -DnewVersion=1.3.2-SNAPSHOT -DgenerateBackupPoms=false
-$ git commit -am"Adjusts copyright headers for this year"
-```
-