Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Converts all the things to ASF build #912

Merged
merged 3 commits into from May 21, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
71 changes: 0 additions & 71 deletions .circleci/config.yml

This file was deleted.

23 changes: 23 additions & 0 deletions .editorconfig
@@ -0,0 +1,23 @@
#
# Copyright 2016-2018 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.
#

root = true

[*]
charset = utf-8
end_of_line = lf
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true
44 changes: 29 additions & 15 deletions .github/CONTRIBUTING.md
@@ -1,31 +1,45 @@
# Contributing to Zipkin
# Contributing to Apache Zipkin Brave (incubating)

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`).
If you would like to contribute code, fork this GitHub repository and
send a pull request on a branch other than `master`.

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
By contributing your code, you agree to license your contribution under
the terms of the [APLv2](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 -pl -:zipkin-ui`.
If you are adding a new file it should have a header like below. This
can be automatically added by running `mvn com.mycila:license-maven-plugin:format`.

```
/**
* Copyright 2015 The OpenZipkin Authors
/*
* 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
*
* 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
*
* 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.
* 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.
*/
```

## Contributor Agreement

Non-trivial change requires an Individual Contributor License Agreement
(ICLA). The ICLA applies to all Apache Software Foundation projects, and
is a one-time effort. If you have not yet filled an ICLA, download the [template](https://www.apache.org/licenses/icla.pdf).
After filling the form with your information print, sign, scan, and send
it in an email attachment to secretary@apache.org. You will get a
confirmation and end up on a [list we can check](http://people.apache.org/unlistedclas.html).
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

13 changes: 13 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,13 @@
---
name: Bug
about: If you’ve found a bug, spend the time to write a failing test. Bugs with tests get fixed and stay fixed. If you have a solution in mind, skip raising an issue and open a pull request instead.

---
## Describe the Bug
A clear and concise description of what the bug is. If you have a solution in mind, skip raising an issue and open a pull request instead.

## Steps to Reproduce
Steps to reproduce the behavior:

## Expected Behaviour
The best is to spend some time to write a failing test. Bugs with tests get fixed and stay fixed.
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.md
@@ -0,0 +1,19 @@
---
name: Feature Request
about: Please first, look at existing issues to see if the feature has been requested before.

---
Please first, look at [existing issues](https://github.com/apache/incubator-zipkin-dependencies/issues) to see if the feature has been requested before. If you don't find anything tell us what problem you’re trying to solve. Often a solution already exists! Don’t send pull requests to implement new features without first getting our support. Sometimes we leave features out on purpose to keep the project small.
codefromthecrypt marked this conversation as resolved.
Show resolved Hide resolved

**Feature:**
Description of the feature

**Rational**
Why this feature should be in zipkin

**Example Scenario**
When will this be used by operators?

**Prior Art**
* Links to prior art
* More links
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,9 @@
---
name: Question
about: This issue tracker is not for questions. If you want to ask how to do something, or to understand why something isn't working the way you expect it to, please use https://gitter.im/openzipkin/zipkin

---

This issue tracker is not for questions. If you want to ask how to do something, or to understand why something isn't working the way you expect it to, please use [Gitter](https://gitter.im/openzipkin/zipkin) or [Stack Overflow](https://stackoverflow.com/questions/tagged/zipkin).


4 changes: 2 additions & 2 deletions .mvn/wrapper/MavenWrapperDownloader.java 100755 → 100644
Expand Up @@ -20,12 +20,12 @@

public class MavenWrapperDownloader {

private static final String WRAPPER_VERSION = "0.5.3";
private static final String WRAPPER_VERSION = "0.5.5";
/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + " .jar";
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";

/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
Expand Down
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties 100755 → 100644
@@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
44 changes: 0 additions & 44 deletions .settings.xml

This file was deleted.

48 changes: 8 additions & 40 deletions .travis.yml
Expand Up @@ -3,57 +3,25 @@
sudo: required
dist: trusty

cache:
directories:
- $HOME/.m2

language: java

jdk:
- openjdk11

before_install:
# Parameters used during release
# allocate commits to CI, not the owner of the deploy key
- git config user.name "zipkinci"
- git config user.email "zipkinci+zipkin-dev@googlegroups.com"
# setup https authentication credentials, used by ./mvnw release:prepare
- git config credential.helper "store --file=.git/credentials"
- echo "https://$GH_TOKEN:@github.com" > .git/credentials

install:
# Override default travis to use the maven wrapper
- ./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V

script:
- ./travis/publish.sh
services:
- rabbitmq

# Don't build release tags. This avoids publish conflicts because the version commit exists both on master and the release tag.
# See https://github.com/travis-ci/travis-ci/issues/1532
branches:
except:
- /^[0-9]/
cache:
directories:
- $HOME/.m2

env:
global:
# Ex. travis encrypt BINTRAY_USER=your_github_account
- secure: "JkYf85iTVHAQb+gyuKwstLApmzUvSfwEdR9nBUypQv8wgLQIi8jry461eESt6nX96votG4EC4e0olZlfYCWVbd2dF/t9VzUT8xZr5aPgP/RRNpJVnJ96UKciAScRAm41NFgXJQojlIeUJEP98eugSMceijHEEAvRcWOOH1PTHUM="
# Ex. travis encrypt BINTRAY_KEY=xxx-https://bintray.com/profile/edit-xxx --add
- secure: "Rgi25T93QYhJCyQq1AATA0hpY5Tr7uJkEeFw5vHfVIv9ampPpGv9kYVkoVclThRT/V+QAyA03ii15onXySMxcYvSt2kZ2CrV4hPvQ/Pz0Be8/snM9HT4kbc6RQmJLkYgtIoe5OJSHl0lfzz1vha1fIEyLngDcajh3HZjJgUZMRc="
# Ex. travis encrypt GH_TOKEN=XXX-https://github.com/settings/tokens-XXX --add
- secure: "AWQEgthRa3GCkpo2DVRA5EN9Pogu9b0h3ldB0jUw3cb8/GKATN1xPGLT24tdWdzougtL2727ePF7Y0RhJ5GyEsYQya5wC7yGTchCQt531R4z8ICb39bNpts3SxuFDZCX0yCrqwLel7SnO5+j95h2TYeqKEl2ijBTw1nAfphgdHc="
# Ex. travis encrypt SONATYPE_USER=your_sonatype_account
- secure: "a30efC2iKHFlrtdFG0HgrNQQhiosmTRPRR0FUviqvQtBoBg3/U4o6Rqee27PVKq8m/tJ1GwLufZFMcvSMCzPs/D/sggqUw6a0wUNTjG6lpbQWy2lLpnw3RwqK46bY+jZsV2SxLyElbZOOC/qHzsPJooocuwwXvDkvRmYxocgiMc="
# Ex. travis encrypt SONATYPE_PASSWORD=your_sonatype_password
- secure: "XD8xiZw82rGZ0IK+xYJjfOTVsNdfliLdsT7izRrLt3LePj4ixQt0sD7z7RgVimYRQ8cqq0uuAU612DtWv/MrU0KQL33xYNWSKK3qw0K8ZYfch7/nJStU5LTqepC6Vldfn87X5KzgVIOoYCQpWkmUjI4Xpr4dnYrnmu+l2kpFCuY="
# Override default travis to use the maven wrapper
install: ./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
script: ./mvnw clean verify -B

notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/637e968b45032d16ee26
on_success: change
on_failure: always
on_start: false

services:
- rabbitmq
5 changes: 5 additions & 0 deletions DISCLAIMER
@@ -0,0 +1,5 @@
Apache Zipkin Brave (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,
it does indicate that the project has yet to be fully endorsed by the ASF.