From commits-return-656-archive-asf-public=cust-asf.ponee.io@zipkin.apache.org Thu May 2 00:33:13 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0CDAC180629 for ; Thu, 2 May 2019 02:33:11 +0200 (CEST) Received: (qmail 92075 invoked by uid 500); 2 May 2019 00:33:11 -0000 Mailing-List: contact commits-help@zipkin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zipkin.apache.org Delivered-To: mailing list commits@zipkin.apache.org Received: (qmail 92066 invoked by uid 99); 2 May 2019 00:33:11 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2019 00:33:11 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 35334871AE; Thu, 2 May 2019 00:33:11 +0000 (UTC) Date: Thu, 02 May 2019 00:33:11 +0000 To: "commits@zipkin.apache.org" Subject: [incubator-zipkin-reporter-java] branch master updated: Does all the things to change to ASF build (#141) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155675719112.7300.1380260297656384167@gitbox.apache.org> From: adriancole@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-zipkin-reporter-java X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 90bee060638188a3cb8bea18cb617a8c81d9ca59 X-Git-Newrev: 5347a35e0389aeee94d0c2f591880ee0abd59182 X-Git-Rev: 5347a35e0389aeee94d0c2f591880ee0abd59182 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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-reporter-java.git The following commit(s) were added to refs/heads/master by this push: new 5347a35 Does all the things to change to ASF build (#141) 5347a35 is described below commit 5347a35e0389aeee94d0c2f591880ee0abd59182 Author: Adrian Cole AuthorDate: Thu May 2 08:33:06 2019 +0800 Does all the things to change to ASF build (#141) --- .github/CONTRIBUTING.md | 45 ++++ .mvn/wrapper/maven-wrapper.properties | 2 +- .settings.xml | 44 ---- .travis.yml | 40 +--- CONTRIBUTING.md | 30 --- DISCLAIMER | 5 + Jenkinsfile | 90 ++++++++ NOTICE | 6 + README.md | 23 +- RELEASE.md | 73 ------- amqp-client/pom.xml | 29 ++- .../java/zipkin2/reporter/amqp/RabbitMQSender.java | 21 +- .../zipkin2/reporter/amqp/RabbitMQSenderTest.java | 21 +- benchmarks/pom.xml | 35 ++- .../zipkin2/reporter/AsyncReporterBenchmarks.java | 21 +- .../reporter/ByteBoundedQueueBenchmarks.java | 21 +- .../zipkin2/reporter/HttpSenderBenchmarks.java | 21 +- .../zipkin2/reporter/KafkaSenderBenchmarks.java | 21 +- .../src/main/java/zipkin2/reporter/NoopSender.java | 21 +- .../zipkin2/reporter/OkHttpSenderBenchmarks.java | 21 +- .../java/zipkin2/reporter/SenderBenchmarks.java | 21 +- .../reporter/URLConnectionSenderBenchmarks.java | 21 +- .../reporter/amqp/RabbitMQSenderBenchmarks.java | 21 +- benchmarks/src/main/resources/log4j.properties | 17 ++ benchmarks/src/main/resources/logback.xml | 18 ++ bom/pom.xml | 22 +- core/pom.xml | 29 ++- .../main/java/zipkin2/reporter/AsyncReporter.java | 21 +- .../java/zipkin2/reporter/AwaitableCallback.java | 21 +- .../java/zipkin2/reporter/BufferNextMessage.java | 21 +- .../java/zipkin2/reporter/ByteBoundedQueue.java | 21 +- .../java/zipkin2/reporter/BytesMessageEncoder.java | 21 +- .../zipkin2/reporter/InMemoryReporterMetrics.java | 21 +- core/src/main/java/zipkin2/reporter/Reporter.java | 21 +- .../java/zipkin2/reporter/ReporterMetrics.java | 21 +- core/src/main/java/zipkin2/reporter/Sender.java | 21 +- .../java/zipkin2/reporter/AsyncReporterTest.java | 21 +- .../zipkin2/reporter/AwaitableCallbackTest.java | 21 +- .../zipkin2/reporter/BufferNextMessageTest.java | 21 +- .../zipkin2/reporter/ByteBoundedQueueTest.java | 21 +- .../zipkin2/reporter/BytesMessageEncoderTest.java | 21 +- .../src/test/java/zipkin2/reporter/FakeSender.java | 21 +- .../reporter/InMemoryReporterMetricsTest.java | 21 +- .../test/java/zipkin2/reporter/TestObjects.java | 21 +- kafka08/pom.xml | 29 ++- .../java/zipkin2/reporter/kafka08/KafkaSender.java | 21 +- .../zipkin2/reporter/kafka08/KafkaSenderTest.java | 21 +- kafka11/pom.xml | 29 ++- .../java/zipkin2/reporter/kafka11/KafkaSender.java | 21 +- .../zipkin2/reporter/kafka11/KafkaSenderTest.java | 21 +- libthrift/pom.xml | 29 ++- .../reporter/libthrift/InternalScribeCodec.java | 21 +- .../reporter/libthrift/LibthriftSender.java | 21 +- .../zipkin2/reporter/libthrift/ScribeClient.java | 21 +- .../libthrift/InternalScribeCodecTest.java | 21 +- .../reporter/libthrift/LibthriftSenderTest.java | 21 +- metrics-micrometer/pom.xml | 29 ++- .../micrometer/MicrometerReporterMetrics.java | 21 +- .../micrometer/MicrometerReporterMetricsTest.java | 21 +- okhttp3/pom.xml | 29 ++- .../java/zipkin2/reporter/okhttp3/HttpCall.java | 21 +- .../zipkin2/reporter/okhttp3/OkHttpSender.java | 21 +- .../okhttp3/RequestBodyMessageEncoder.java | 21 +- .../zipkin2/reporter/okhttp3/HttpCallTest.java | 21 +- .../zipkin2/reporter/okhttp3/OkHttpSenderTest.java | 21 +- pom.xml | 234 +++++++++++++-------- spring-beans/pom.xml | 29 ++- .../reporter/beans/AsyncReporterFactoryBean.java | 21 +- .../reporter/beans/KafkaSenderFactoryBean.java | 21 +- .../reporter/beans/LibthriftSenderFactoryBean.java | 21 +- .../reporter/beans/OkHttpSenderFactoryBean.java | 21 +- .../reporter/beans/RabbitMQSenderFactoryBean.java | 21 +- .../beans/URLConnectionSenderFactoryBean.java | 21 +- .../beans/AsyncReporterFactoryBeanTest.java | 21 +- .../reporter/beans/KafkaSenderFactoryBeanTest.java | 21 +- .../beans/LibthriftSenderFactoryBeanTest.java | 21 +- .../beans/OkHttpSenderFactoryBeanTest.java | 21 +- .../beans/RabbitMQSenderFactoryBeanTest.java | 21 +- .../beans/URLConnectionSenderFactoryBeanTest.java | 21 +- .../test/java/zipkin2/reporter/beans/XmlBeans.java | 21 +- src/etc/header.txt | 21 +- src/main/assemblies/source-release.xml | 93 ++++++++ travis/publish.sh | 135 ------------ urlconnection/pom.xml | 29 ++- .../urlconnection/URLConnectionSender.java | 21 +- .../urlconnection/URLConnectionSenderTest.java | 21 +- 86 files changed, 1373 insertions(+), 1060 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 0000000..0516f07 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,45 @@ +# Contributing to Apache Zipkin (incubating) + +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](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`. + +``` +/* + * 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. + */ + ``` + +## 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). diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 05c741e..ec07118 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -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 +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.4/maven-wrapper-0.5.4.jar diff --git a/.settings.xml b/.settings.xml deleted file mode 100644 index cde1fd6..0000000 --- a/.settings.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - sonatype - ${env.SONATYPE_USER} - ${env.SONATYPE_PASSWORD} - - - bintray - ${env.BINTRAY_USER} - ${env.BINTRAY_KEY} - - - jfrog-snapshots - ${env.BINTRAY_USER} - ${env.BINTRAY_KEY} - - - github.com - ${env.GH_USER} - ${env.GH_TOKEN} - - - - diff --git a/.travis.yml b/.travis.yml index 50529d5..2ff041a 100755 --- a/.travis.yml +++ b/.travis.yml @@ -13,28 +13,9 @@ cache: directories: - $HOME/.m2 -before_install: - # parameters used during a 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 - # skip license on travis due to zipkin #1512 - - ./mvnw -q install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Dlicense.skip=true - -script: - - ./travis/publish.sh - -# 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]/ +install: ./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V +script: ./mvnw clean verify -B notifications: webhooks: @@ -42,20 +23,3 @@ notifications: - https://webhooks.gitter.im/e/637e968b45032d16ee26 on_success: change on_failure: always - -env: - global: - # Ex. travis encrypt BINTRAY_USER=your_github_account - - secure: "oLZli9H7qYm5t621MDgspCcfip3hrh6BkP8dtHF8POb1nhSO4Z0M6E5hL94iDE11BFvHQuldyb+E2o9VrNxR0Ywb4wGQB0sVsm+o23y95GiH1hTZYCMF1c/AKqbRyA6rknKAX3JCp59HgL8qgsiHFVpAcfXDNfnJCJXtQB20NiTR5GwLkDr9sZn/SZUyJ6lE6wf3cIicyG3PctsPMkzPpkqLvevMEMvnMkrNSCiV5KJcVj+6QHwfwvGwQt54aOHdEy87R3TpO0B4t/J4n6y+D5BX4NzRGOAmgyMOZPuQoCc3Legoyv5MZoPoAEUrq2p9/O+K6NpLDDVZfO/9M5pp6E+tz4Hj1mBCrOLd8Nlw3NBe3ExdCoh8jT2FIr7ASpm0Y8gRRFq0NxJAwXvW0ZmnFK8JHjiQcVL0dqZQPXzmStbeNaTtmTAEbyE+T42J6Yhf15kySKuvdJLq6OuAavPYLcbfCkseoXC [...] - # Ex. travis encrypt BINTRAY_KEY=xxx-https://bintray.com/profile/edit-xxx --add - - secure: "fA2HSx8qra1RW+l49qsL5MjTzp1JhRbGAufRaW6kyKuPMXf1SgUqpXTIoYCFxvjxF0Gpf8o7puhP+EheuG+9ecbI5hHzWscp0h3dvhxZflQYm5TVeh9a7s+Lj9Ei/ADJ0JXsqyzb3oVn3+4HFGY73EZXHZh2gVbxXpmreiKQ7YNsvNeDSZJAs+ww6M9UD9Yx37TOXpgx5VZ5oJhHJoz+iSdiyhCgvQzngdsYrvCGnHfAbexNzN9TwROrqAEXhcH8Rsx3YkvDIbo+a/WiNVL4T87KLo1ThsNBqA+Uc1cIgyaGWlckN7b2m4KcsfOwulGP8lB5nzWG+pMdj/CCfAHTA4rQDMvipSCb+aFNZCt5AjnGZMRjGlo2SLvPRSMMSiITO850ZRFIW2c+OesMNlUaMoX3PgCZxPa6gnEizX0hSML4JkM9lg/5y+7X7eFFjcnBDFIYjTZqhvC3i6dYQo+JyyT6c28LQOR [...] - # Ex. travis encrypt GH_USER_EMAIL=for_github@domain.com --add - - secure: "ukCQ6EnQqVoN9Ef/2KzVd4Ml/JC8xYqsETvf56ciLAC9WrIHioHsBP0E5yyWgyTMWOzcR6h/maIfNvb3Ktu/+2srlPAt43ZkZE7YWxTsr0LwjeaMzRIqVUna3XV1ntz7iuw00YAhdohfuFqSIjTNiWaZsjA1LHAst4usUHqpIIsXHrXC9bYzZ3EzRKjRjrY0+JJoc6J6FzRNHejDym51kTwtkkN2BDN7sdudDYPXQTwY5K//sqhvqfD54psCZCQYVyyuUwb6+fF6P6Q2TQ3ReM13Wz3LWCmWtFutiFdimqMkz8W0haXr7t7lcoZmv/OC3WQkk5kPBeAvc807RTSGvLr+Zhu/vGJ8u1vVKS+2J7hyyUbmdyM9QUOCQ0HI/zBC25MWzvnmu974MdfDkJao6iOK2q7f7lBfw6+orT1HhrNeyMjVSViXWYEEb72jfVMYInR264D4I0F5LcsD0pwUsQWGo+l2TUO [...] - # Ex. travis encrypt GH_USER=your_github_account --add - - secure: "tNFXJUnLgI4Rp92yaqe/47tt12t4tZr4SE1HfwAqoBOzlKwEh2Jl4xh6xbi1GGJmjzoqS/+a8TYNwhGVkSQ0+kgoY0OdFLOyJ9WeZ2+lWZZVHMwNTrHbHbMIrf42Yo6sbUo2qhEJ3W8YMSb691jM9LzMS/FFFR9AhtIP4RE9cz16iZW+0F/hqTgI68lWqUU/HWryznlQqBnuiDx6jrLNpI9Xa1uFA7k+nCaiA1vskVb6BQ4WbxlmztU3VkUek4dwE1asNmw98o8ytPXWeKVSlP+UWjc80dTkiwtFllta+u0mU3cQMODp9C+A69Y2lpJ2h/h/e/YO6CbzDeRPTAj3Yctbp1/ySv998oIuLBW7PBtjRNCTkxZlpnWseggVIB/H4SN+vcpR17tt4NnGfiidM8cEmt3b+/oUH1orsPJilpb1HskUCVgmVIW/rhrlbvL7QawB8YeK8ilVFY7GIrjRAZgtXQwRcsF [...] - # Ex. travis encrypt GH_TOKEN=XXX-https://github.com/settings/tokens-XXX --add - - secure: "UJ14c18ujumDLJuc/8cRSo+/K2/VkEt/ydVzOh7yefZ8/XD0upySy3slkwR12OSWlfDgEHRkqdPNkP1lWwVUKwTYXlFcBSz0khpm2kzZRaOc8Q/ROdVbQe92NlbVcKDCFGhzTJ+QMN11cn9AmRnDaGafvmDSm/MruQwX2QgLuxZK8qFVPOY72Fy9Pon5LTY0rwIwvq15DdDUQqw8/o5yuxuhzryWINMle/H1xqtYQBMFQykj/Z0UJcnRFPRKRdI02R4jDcpC39m6IHn5diICw8qQTbf3N74Wts3vCvaj4rwRPVDEHg1U7d4AixtYDM/BWpDJUdYjYTb2jGnD+qtDmjWdYeld9udpesWsTCpDgXH1pW5cVDKOuXfKyfuzC5l7I+5rECHBdb3LTVUYb6uRRGk8VWDUd3qXak40sud5XDcOUzUUGYnZ9PYm+7ArQ27/iW+uRpIJrBPzekcumQ9c4XC6wK/4sM2 [...] - # Ex. travis encrypt SONATYPE_USER=your_sonatype_account - - secure: "Y7PB4328gfA1sJ1apvDGjVQ7O7HTA2L2EIp0aZd+R6/H+wMoQb/OLOj8nxBSd4ls1I0tbkXwCwVtjaLug5FBqYQ+eKszX46SxhpVpAXMLO6tuxlz0PXDeDwunkZSiSU15Qx3AX535dZUY0iqRt6/erDzBFkrz21EVXats4uYED8GLO/MYHCy2I0UkbXTrjpPqtICwiIps3k1seLbxFMs3Q+YAvqoCp66np+RpBhseCZnJ0qle/2l+z4iQvKlgvKcg7MfgWCYGQJKzVlwzhyNVsm1ONygQBJmsjTOF6GPPBr0AvaN4SdDEzWQBe3RTjDwlD8Tai+6wRacZ4N3qTL6usohimFZL/nJ8kFuWtU1lLjUuW5DqqbZrIM2PkqsBGFmjUN8rPgLg1VnP89ngFwZtPIpVLm5GQX55xEBR5cYsGRFAvJIlSyi0QuzbN8pTLjIy3f7vFYk5HcdkO1qpw79k9rB8MVLgv2 [...] - # Ex. travis encrypt SONATYPE_PASSWORD=your_sonatype_password - - secure: "icBwbrN+0t0mbFJubO8LTiLsMZFCiT2Zlp/8JR+CW1afzjiM2kwm4dKMa6KzZ2+ou/yI9T9/3vz1BCngeLKlncipfJYnJN/SnuRJNqxoUp4b/TMom7G16YTcYtJ0sk1zYFO3ExAH2QmR5SD/I4L89+u5a9azIdOeZKyh50167xLKhGA4wkXZc23Ns0TC8iF5r6x6XipdREU7xzmdrhE6+ocbPEGzRMwqGp7ukTruY8CkzQGqj4LVjSdBR9+7y2RPshAlcVx7cMp+SdpzW3MvahBBDTxZw+DTxDFIZvIVUwApdlifLH+F29GgYNaNIfEOPSHN8yDlRTUW0tosnhMSw55y4WKOUdXsF87hDr+3C8d40iqlJ2wQtQyAVeGaRoQQ2oxhcKGkgRollBNixJ1XWon8qkhmeq8haiB7zty2m57UljanvGtGXEEeggwXeaQ5cDfVrFh7H37dtbst9/7YY3q9LdxHcIN [...] 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 new file mode 100644 index 0000000..49e6c9a --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,5 @@ +Apache Zipkin Reporter (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. diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..bae2e38 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,90 @@ +/* + * 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. + */ + +pipeline { + agent { + label 'ubuntu' + } + + tools { + jdk 'JDK 11 (latest)' + } + + options { + buildDiscarder(logRotator( + numToKeepStr: '30', + )) + timestamps() + skipStagesAfterUnstable() + timeout time: 30, unit: 'MINUTES' + } + + stages { + stage('SCM Checkout') { + steps { + deleteDir() + checkout scm + } + } + + stage('Check environment') { + steps { + sh 'env' + sh 'pwd' + sh 'ls' + sh 'git status' + } + } + + stage('Run tests') { + steps { + // use install, as opposed to verify, to ensure invoker tests use latest code + sh './mvnw clean install --batch-mode -nsu' + } + } + + stage('Publish snapshot') { + when { + branch 'master' + } + steps { + sh './mvnw deploy -Papache-release -Dgpg.skip=true -DskipTests --batch-mode -nsu' + } + } + } + + post { + always { + junit '**/target/*-reports/*.xml' + deleteDir() + } + + changed { + script { + if (env.BRANCH_NAME == 'master') { + emailext( + subject: "[${currentBuild.projectName}] master is ${currentBuild.currentResult} (#${currentBuild.number})", + to: 'commits@zipkin.apache.org', + replyTo: 'dev@zipkin.apache.org', + body: "See <${currentBuild.absoluteUrl}>" + ) + } + } + + } + } +} diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..b675b55 --- /dev/null +++ b/NOTICE @@ -0,0 +1,6 @@ +Apache Zipkin Reporter (incubating) +Copyright 2019 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + diff --git a/README.md b/README.md index 87653e6..3290127 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,9 @@ -[![Gitter chat](http://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/openzipkin/zipkin) [![Build Status](https://travis-ci.org/openzipkin/zipkin-reporter-java.svg?branch=master)](https://travis-ci.org/openzipkin/zipkin-reporter-java) [![Download](https://api.bintray.com/packages/openzipkin/maven/zipkin-reporter-java/images/download.svg) ](https://bintray.com/openzipkin/maven/zipkin-reporter-java/_latestVersion) +[![Gitter chat](http://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/openzipkin/zipkin) +[![Build Status](https://img.shields.io/jenkins/s/https/builds.apache.org/job/incubator-zipkin-reporter-java.svg)](https://builds.apache.org/blue/organizations/jenkins/incubator-zipkin-reporter-java) +[![Maven Central](https://img.shields.io/maven-central/v/org.apache.zipkin.reporter2/zipkin-reporter.svg)](https://search.maven.org/search?q=g:org.apache.zipkin.reporter2%20AND%20a:zipkin-reporter) + + +[![Gitter chat](http://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/openzipkin/zipkin) [![Build Status](https://travis-ci.org/apache/incubator-zipkin-reporter-java.svg?branch=master)](https://travis-ci.org/apache/incubator-zipkin-reporter-java) [![Download](https://api.bintray.com/packages/openzipkin/maven/zipkin-reporter-java/images/download.svg) ](https://bintray.com/openzipkin/maven/zipkin-reporter-java/_latestVersion) # zipkin-reporter-java Shared library for reporting zipkin spans onto transports including http, kafka and rabbitmq. @@ -128,12 +133,14 @@ reporter = AsyncReporter.builder(URLConnectionSender.create("http://localhost:94 ## Artifacts -All artifacts publish to the group ID "io.zipkin.reporter2". We use a +All artifacts publish to the group ID "org.apache.zipkin.reporter2". We use a common release version for all components. -### Library Releases -Releases are uploaded to [Bintray](https://bintray.com/openzipkin/maven/brave) and synchronized to [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.zipkin.reporter2%22) -### Library Snapshots -Snapshots are uploaded to [JFrog](http://oss.jfrog.org/artifactory/oss-snapshot-local) after commits to master. +### Source Releases +Source Releases are uploaded to [Apache](https://dist.apache.org/repos/dist/release/incubator/zipkin/zipkin-reporter-java) +### Binary Releases +Binary Releases are uploaded to [Apache](https://repository.apache.org/service/local/staging/deploy/maven2) and synchronized to [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.zipkin%22) +### Binary Snapshots +Binary Snapshots are uploaded to [Apache](https://repository.apache.org/content/repositories/snapshots/) after commits to master. ### Version alignments When using multiple reporter components, you'll want to align versions in one place. This allows you to more safely upgrade, with less worry @@ -146,7 +153,7 @@ Ex. in your dependencies section, import the BOM like this: - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-reporter-bom ${zipkin-reporter.version} pom @@ -160,7 +167,7 @@ Now, you can leave off the version when choosing any supported instrumentation. Also any indirect use will have versions aligned: ```xml - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-sender-okhttp3 ``` diff --git a/RELEASE.md b/RELEASE.md deleted file mode 100644 index 954c8c2..0000000 --- a/RELEASE.md +++ /dev/null @@ -1,73 +0,0 @@ -# Zipkin Reporter 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 Travis CI** - - This part is controlled by [`travis/publish.sh`](travis/publish.sh). It creates a bunch of new commits, bumps - the version, publishes artifacts, and syncs to Maven Central. - -## Credentials - -Credentials of various kind are needed for the release process to work. If you notice something -failing due to unauthorized, re-encrypt them using instructions at the bottom of the `.travis.yml` - -Ex You'll see comments like this: -```yaml -env: - global: - # Ex. travis encrypt BINTRAY_USER=your_github_account - - secure: "VeTO... -``` - -To re-encrypt, you literally run the commands with relevant values and replace the "secure" key with the output: - -```bash -$ travis encrypt BINTRAY_USER=adrianmole -Please add the following to your .travis.yml file: - - secure: "mQnECL+dXc5l9wCYl/wUz+AaYFGt/1G31NAZcTLf2RbhKo8mUenc4hZNjHCEv+4ZvfYLd/NoTNMhTCxmtBMz1q4CahPKLWCZLoRD1ExeXwRymJPIhxZUPzx9yHPHc5dmgrSYOCJLJKJmHiOl9/bJi123456=" -``` - -### Troubleshooting invalid credentials - -If you receive a '401 unauthorized' failure from jCenter or Bintray, it is -likely `BINTRAY_USER` or `BINTRAY_KEY` entries are invalid, or possibly the user -associated with them does not have rights to upload. - -The least destructive test is to try to publish a snapshot manually. By passing -the values Travis would use, you can kick off a snapshot from your laptop. This -is a good way to validate that your unencrypted credentials are authorized. - -Here's an example of a snapshot deploy with specified credentials. -```bash -$ BINTRAY_USER=adrianmole BINTRAY_KEY=ed6f20bde9123bbb2312b221 TRAVIS_PULL_REQUEST=false TRAVIS_TAG= TRAVIS_BRANCH=master travis/publish.sh -``` - -## 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=0.6.13-SNAPSHOT -DgenerateBackupPoms=false -$ ./mvnw com.mycila:license-maven-plugin:format -$ ./mvnw versions:set -DnewVersion=0.6.12-SNAPSHOT -DgenerateBackupPoms=false -$ git commit -am"Adjusts copyright headers for this year" -``` - diff --git a/amqp-client/pom.xml b/amqp-client/pom.xml index 972c0a7..e96de6d 100644 --- a/amqp-client/pom.xml +++ b/amqp-client/pom.xml @@ -1,24 +1,27 @@ 4.0.0 - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-reporter-parent 2.8.3-SNAPSHOT @@ -54,6 +57,12 @@ + maven-remote-resources-plugin + + false + + + maven-jar-plugin diff --git a/amqp-client/src/main/java/zipkin2/reporter/amqp/RabbitMQSender.java b/amqp-client/src/main/java/zipkin2/reporter/amqp/RabbitMQSender.java index 77eee90..0a746e0 100644 --- a/amqp-client/src/main/java/zipkin2/reporter/amqp/RabbitMQSender.java +++ b/amqp-client/src/main/java/zipkin2/reporter/amqp/RabbitMQSender.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.amqp; diff --git a/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQSenderTest.java b/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQSenderTest.java index 33e6a3f..b220898 100644 --- a/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQSenderTest.java +++ b/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQSenderTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.amqp; diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index e3c8b57..5afea8d 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -1,24 +1,27 @@ 4.0.0 - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-reporter-parent 2.8.3-SNAPSHOT @@ -113,6 +116,12 @@ + + maven-remote-resources-plugin + + false + + net.orfjackal.retrolambda @@ -130,6 +139,12 @@ + maven-deploy-plugin + + true + + + maven-shade-plugin diff --git a/benchmarks/src/main/java/zipkin2/reporter/AsyncReporterBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/AsyncReporterBenchmarks.java index d0687d2..9b390cb 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/AsyncReporterBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/AsyncReporterBenchmarks.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/benchmarks/src/main/java/zipkin2/reporter/ByteBoundedQueueBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/ByteBoundedQueueBenchmarks.java index c791d34..e342a7c 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/ByteBoundedQueueBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/ByteBoundedQueueBenchmarks.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/benchmarks/src/main/java/zipkin2/reporter/HttpSenderBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/HttpSenderBenchmarks.java index 5fdcee8..e8b2bfe 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/HttpSenderBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/HttpSenderBenchmarks.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/benchmarks/src/main/java/zipkin2/reporter/KafkaSenderBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/KafkaSenderBenchmarks.java index b5fbb90..f062f8f 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/KafkaSenderBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/KafkaSenderBenchmarks.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/benchmarks/src/main/java/zipkin2/reporter/NoopSender.java b/benchmarks/src/main/java/zipkin2/reporter/NoopSender.java index 10dccb6..5bebd33 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/NoopSender.java +++ b/benchmarks/src/main/java/zipkin2/reporter/NoopSender.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/benchmarks/src/main/java/zipkin2/reporter/OkHttpSenderBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/OkHttpSenderBenchmarks.java index 0b91835..8dd6a87 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/OkHttpSenderBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/OkHttpSenderBenchmarks.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/benchmarks/src/main/java/zipkin2/reporter/SenderBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/SenderBenchmarks.java index c3cc667..1ebb2eb 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/SenderBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/SenderBenchmarks.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/benchmarks/src/main/java/zipkin2/reporter/URLConnectionSenderBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/URLConnectionSenderBenchmarks.java index c9fe902..cfe6fd8 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/URLConnectionSenderBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/URLConnectionSenderBenchmarks.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/benchmarks/src/main/java/zipkin2/reporter/amqp/RabbitMQSenderBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/amqp/RabbitMQSenderBenchmarks.java index f3fe533..f50c0b2 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/amqp/RabbitMQSenderBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/amqp/RabbitMQSenderBenchmarks.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.amqp; diff --git a/benchmarks/src/main/resources/log4j.properties b/benchmarks/src/main/resources/log4j.properties index 33712a9..b9e39ed 100644 --- a/benchmarks/src/main/resources/log4j.properties +++ b/benchmarks/src/main/resources/log4j.properties @@ -1,3 +1,20 @@ +# +# 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. +# + # By default, everything goes to console and file log4j.rootLogger=WARN, A1 diff --git a/benchmarks/src/main/resources/logback.xml b/benchmarks/src/main/resources/logback.xml index 091750c..02a7089 100644 --- a/benchmarks/src/main/resources/logback.xml +++ b/benchmarks/src/main/resources/logback.xml @@ -1,3 +1,21 @@ + diff --git a/bom/pom.xml b/bom/pom.xml index 8bc7ae0..2abc692 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -1,7 +1,13 @@ 4.0.0 - io.zipkin.reporter2 + + org.apache + apache + 21 + + + org.apache.zipkin.reporter2 zipkin-reporter-bom Zipkin Reporter BOM 2.8.3-SNAPSHOT @@ -14,12 +20,12 @@ 2.12.7 - https://github.com/openzipkin/zipkin-reporter-java + https://github.com/apache/incubator-zipkin-reporter-java 2016 - OpenZipkin - http://zipkin.io/ + The Apache Software Foundation + http://www.apache.org/ @@ -31,9 +37,9 @@ - https://github.com/openzipkin/zipkin-reporter-java - scm:git:https://github.com/openzipkin/zipkin-reporter-java.git - scm:git:https://github.com/openzipkin/zipkin-reporter-java.git + https://github.com/apache/incubator-zipkin-reporter-java + scm:git:https://github.com/apache/incubator-zipkin-reporter-java.git + scm:git:https://github.com/apache/incubator-zipkin-reporter-java.git HEAD @@ -59,7 +65,7 @@ Github - https://github.com/openzipkin/zipkin-reporter-java/issues + https://github.com/apache/incubator-zipkin-reporter-java/issues diff --git a/core/pom.xml b/core/pom.xml index 3bb2e5e..b3a422c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,24 +1,27 @@ 4.0.0 - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-reporter-parent 2.8.3-SNAPSHOT @@ -33,6 +36,12 @@ + maven-remote-resources-plugin + + false + + + maven-jar-plugin diff --git a/core/src/main/java/zipkin2/reporter/AsyncReporter.java b/core/src/main/java/zipkin2/reporter/AsyncReporter.java index 74c823f..b75c2be 100644 --- a/core/src/main/java/zipkin2/reporter/AsyncReporter.java +++ b/core/src/main/java/zipkin2/reporter/AsyncReporter.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/main/java/zipkin2/reporter/AwaitableCallback.java b/core/src/main/java/zipkin2/reporter/AwaitableCallback.java index 4aa9f18..e2b40dd 100644 --- a/core/src/main/java/zipkin2/reporter/AwaitableCallback.java +++ b/core/src/main/java/zipkin2/reporter/AwaitableCallback.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/main/java/zipkin2/reporter/BufferNextMessage.java b/core/src/main/java/zipkin2/reporter/BufferNextMessage.java index 554dc98..31ebf11 100644 --- a/core/src/main/java/zipkin2/reporter/BufferNextMessage.java +++ b/core/src/main/java/zipkin2/reporter/BufferNextMessage.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/main/java/zipkin2/reporter/ByteBoundedQueue.java b/core/src/main/java/zipkin2/reporter/ByteBoundedQueue.java index 4634139..49ecd36 100644 --- a/core/src/main/java/zipkin2/reporter/ByteBoundedQueue.java +++ b/core/src/main/java/zipkin2/reporter/ByteBoundedQueue.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/main/java/zipkin2/reporter/BytesMessageEncoder.java b/core/src/main/java/zipkin2/reporter/BytesMessageEncoder.java index 1e64aa5..42ba3f6 100644 --- a/core/src/main/java/zipkin2/reporter/BytesMessageEncoder.java +++ b/core/src/main/java/zipkin2/reporter/BytesMessageEncoder.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/main/java/zipkin2/reporter/InMemoryReporterMetrics.java b/core/src/main/java/zipkin2/reporter/InMemoryReporterMetrics.java index bed1ced..638d233 100644 --- a/core/src/main/java/zipkin2/reporter/InMemoryReporterMetrics.java +++ b/core/src/main/java/zipkin2/reporter/InMemoryReporterMetrics.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/main/java/zipkin2/reporter/Reporter.java b/core/src/main/java/zipkin2/reporter/Reporter.java index 9da9f02..577abdb 100644 --- a/core/src/main/java/zipkin2/reporter/Reporter.java +++ b/core/src/main/java/zipkin2/reporter/Reporter.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/main/java/zipkin2/reporter/ReporterMetrics.java b/core/src/main/java/zipkin2/reporter/ReporterMetrics.java index 3c55f34..df39077 100644 --- a/core/src/main/java/zipkin2/reporter/ReporterMetrics.java +++ b/core/src/main/java/zipkin2/reporter/ReporterMetrics.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/main/java/zipkin2/reporter/Sender.java b/core/src/main/java/zipkin2/reporter/Sender.java index 0b7cfa1..092dce9 100644 --- a/core/src/main/java/zipkin2/reporter/Sender.java +++ b/core/src/main/java/zipkin2/reporter/Sender.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/test/java/zipkin2/reporter/AsyncReporterTest.java b/core/src/test/java/zipkin2/reporter/AsyncReporterTest.java index 8607583..0abad97 100644 --- a/core/src/test/java/zipkin2/reporter/AsyncReporterTest.java +++ b/core/src/test/java/zipkin2/reporter/AsyncReporterTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/test/java/zipkin2/reporter/AwaitableCallbackTest.java b/core/src/test/java/zipkin2/reporter/AwaitableCallbackTest.java index 151a506..34473ad 100644 --- a/core/src/test/java/zipkin2/reporter/AwaitableCallbackTest.java +++ b/core/src/test/java/zipkin2/reporter/AwaitableCallbackTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/test/java/zipkin2/reporter/BufferNextMessageTest.java b/core/src/test/java/zipkin2/reporter/BufferNextMessageTest.java index ad86716..7d33f7f 100644 --- a/core/src/test/java/zipkin2/reporter/BufferNextMessageTest.java +++ b/core/src/test/java/zipkin2/reporter/BufferNextMessageTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/test/java/zipkin2/reporter/ByteBoundedQueueTest.java b/core/src/test/java/zipkin2/reporter/ByteBoundedQueueTest.java index 6509f55..38acc5a 100644 --- a/core/src/test/java/zipkin2/reporter/ByteBoundedQueueTest.java +++ b/core/src/test/java/zipkin2/reporter/ByteBoundedQueueTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/test/java/zipkin2/reporter/BytesMessageEncoderTest.java b/core/src/test/java/zipkin2/reporter/BytesMessageEncoderTest.java index 107812b..2679042 100644 --- a/core/src/test/java/zipkin2/reporter/BytesMessageEncoderTest.java +++ b/core/src/test/java/zipkin2/reporter/BytesMessageEncoderTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/test/java/zipkin2/reporter/FakeSender.java b/core/src/test/java/zipkin2/reporter/FakeSender.java index 0772c48..796b21b 100644 --- a/core/src/test/java/zipkin2/reporter/FakeSender.java +++ b/core/src/test/java/zipkin2/reporter/FakeSender.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/test/java/zipkin2/reporter/InMemoryReporterMetricsTest.java b/core/src/test/java/zipkin2/reporter/InMemoryReporterMetricsTest.java index c5f5ea6..93cd62e 100644 --- a/core/src/test/java/zipkin2/reporter/InMemoryReporterMetricsTest.java +++ b/core/src/test/java/zipkin2/reporter/InMemoryReporterMetricsTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/core/src/test/java/zipkin2/reporter/TestObjects.java b/core/src/test/java/zipkin2/reporter/TestObjects.java index fe02846..4a5d921 100644 --- a/core/src/test/java/zipkin2/reporter/TestObjects.java +++ b/core/src/test/java/zipkin2/reporter/TestObjects.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter; diff --git a/kafka08/pom.xml b/kafka08/pom.xml index 896e2cc..2003e07 100644 --- a/kafka08/pom.xml +++ b/kafka08/pom.xml @@ -1,24 +1,27 @@ 4.0.0 - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-reporter-parent 2.8.3-SNAPSHOT @@ -70,6 +73,12 @@ + maven-remote-resources-plugin + + false + + + maven-jar-plugin diff --git a/kafka08/src/main/java/zipkin2/reporter/kafka08/KafkaSender.java b/kafka08/src/main/java/zipkin2/reporter/kafka08/KafkaSender.java index b33f114..e25b53e 100644 --- a/kafka08/src/main/java/zipkin2/reporter/kafka08/KafkaSender.java +++ b/kafka08/src/main/java/zipkin2/reporter/kafka08/KafkaSender.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2019 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. */ package zipkin2.reporter.kafka08; diff --git a/kafka08/src/test/java/zipkin2/reporter/kafka08/KafkaSenderTest.java b/kafka08/src/test/java/zipkin2/reporter/kafka08/KafkaSenderTest.java index 8be3ae6..6b1a273 100644 --- a/kafka08/src/test/java/zipkin2/reporter/kafka08/KafkaSenderTest.java +++ b/kafka08/src/test/java/zipkin2/reporter/kafka08/KafkaSenderTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.kafka08; diff --git a/kafka11/pom.xml b/kafka11/pom.xml index 1209a61..32dfd2f 100644 --- a/kafka11/pom.xml +++ b/kafka11/pom.xml @@ -1,24 +1,27 @@ 4.0.0 - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-reporter-parent 2.8.3-SNAPSHOT @@ -67,6 +70,12 @@ + maven-remote-resources-plugin + + false + + + maven-jar-plugin diff --git a/kafka11/src/main/java/zipkin2/reporter/kafka11/KafkaSender.java b/kafka11/src/main/java/zipkin2/reporter/kafka11/KafkaSender.java index eeb86e9..40e3850 100644 --- a/kafka11/src/main/java/zipkin2/reporter/kafka11/KafkaSender.java +++ b/kafka11/src/main/java/zipkin2/reporter/kafka11/KafkaSender.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2019 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. */ package zipkin2.reporter.kafka11; diff --git a/kafka11/src/test/java/zipkin2/reporter/kafka11/KafkaSenderTest.java b/kafka11/src/test/java/zipkin2/reporter/kafka11/KafkaSenderTest.java index f95383c..bef95ae 100644 --- a/kafka11/src/test/java/zipkin2/reporter/kafka11/KafkaSenderTest.java +++ b/kafka11/src/test/java/zipkin2/reporter/kafka11/KafkaSenderTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2019 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. */ package zipkin2.reporter.kafka11; diff --git a/libthrift/pom.xml b/libthrift/pom.xml index 71e1f02..bc05bca 100644 --- a/libthrift/pom.xml +++ b/libthrift/pom.xml @@ -1,24 +1,27 @@ 4.0.0 - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-reporter-parent 2.8.3-SNAPSHOT @@ -60,6 +63,12 @@ + maven-remote-resources-plugin + + false + + + maven-jar-plugin diff --git a/libthrift/src/main/java/zipkin2/reporter/libthrift/InternalScribeCodec.java b/libthrift/src/main/java/zipkin2/reporter/libthrift/InternalScribeCodec.java index 79d4c6b..eb6199d 100644 --- a/libthrift/src/main/java/zipkin2/reporter/libthrift/InternalScribeCodec.java +++ b/libthrift/src/main/java/zipkin2/reporter/libthrift/InternalScribeCodec.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.libthrift; diff --git a/libthrift/src/main/java/zipkin2/reporter/libthrift/LibthriftSender.java b/libthrift/src/main/java/zipkin2/reporter/libthrift/LibthriftSender.java index 03f768a..d477f97 100644 --- a/libthrift/src/main/java/zipkin2/reporter/libthrift/LibthriftSender.java +++ b/libthrift/src/main/java/zipkin2/reporter/libthrift/LibthriftSender.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.libthrift; diff --git a/libthrift/src/main/java/zipkin2/reporter/libthrift/ScribeClient.java b/libthrift/src/main/java/zipkin2/reporter/libthrift/ScribeClient.java index c5f0577..2c8c5fc 100644 --- a/libthrift/src/main/java/zipkin2/reporter/libthrift/ScribeClient.java +++ b/libthrift/src/main/java/zipkin2/reporter/libthrift/ScribeClient.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.libthrift; diff --git a/libthrift/src/test/java/zipkin2/reporter/libthrift/InternalScribeCodecTest.java b/libthrift/src/test/java/zipkin2/reporter/libthrift/InternalScribeCodecTest.java index 0d374df..35b32f6 100644 --- a/libthrift/src/test/java/zipkin2/reporter/libthrift/InternalScribeCodecTest.java +++ b/libthrift/src/test/java/zipkin2/reporter/libthrift/InternalScribeCodecTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.libthrift; diff --git a/libthrift/src/test/java/zipkin2/reporter/libthrift/LibthriftSenderTest.java b/libthrift/src/test/java/zipkin2/reporter/libthrift/LibthriftSenderTest.java index b28eb73..c84490b 100644 --- a/libthrift/src/test/java/zipkin2/reporter/libthrift/LibthriftSenderTest.java +++ b/libthrift/src/test/java/zipkin2/reporter/libthrift/LibthriftSenderTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2019 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. */ package zipkin2.reporter.libthrift; diff --git a/metrics-micrometer/pom.xml b/metrics-micrometer/pom.xml index fb19232..510c94a 100644 --- a/metrics-micrometer/pom.xml +++ b/metrics-micrometer/pom.xml @@ -1,24 +1,27 @@ 4.0.0 - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-reporter-parent 2.8.3-SNAPSHOT ../ @@ -50,6 +53,12 @@ + + maven-remote-resources-plugin + + false + + net.orfjackal.retrolambda diff --git a/metrics-micrometer/src/main/java/zipkin2/reporter/metrics/micrometer/MicrometerReporterMetrics.java b/metrics-micrometer/src/main/java/zipkin2/reporter/metrics/micrometer/MicrometerReporterMetrics.java index 2acfbbf..1338104 100644 --- a/metrics-micrometer/src/main/java/zipkin2/reporter/metrics/micrometer/MicrometerReporterMetrics.java +++ b/metrics-micrometer/src/main/java/zipkin2/reporter/metrics/micrometer/MicrometerReporterMetrics.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2019 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. */ package zipkin2.reporter.metrics.micrometer; diff --git a/metrics-micrometer/src/test/java/zipkin2/reporter/metrics/micrometer/MicrometerReporterMetricsTest.java b/metrics-micrometer/src/test/java/zipkin2/reporter/metrics/micrometer/MicrometerReporterMetricsTest.java index 18566f3..3da224d 100644 --- a/metrics-micrometer/src/test/java/zipkin2/reporter/metrics/micrometer/MicrometerReporterMetricsTest.java +++ b/metrics-micrometer/src/test/java/zipkin2/reporter/metrics/micrometer/MicrometerReporterMetricsTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2019 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. */ package zipkin2.reporter.metrics.micrometer; diff --git a/okhttp3/pom.xml b/okhttp3/pom.xml index 1e76b45..d049f2a 100644 --- a/okhttp3/pom.xml +++ b/okhttp3/pom.xml @@ -1,24 +1,27 @@ 4.0.0 - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-reporter-parent 2.8.3-SNAPSHOT @@ -61,6 +64,12 @@ + maven-remote-resources-plugin + + false + + + maven-jar-plugin diff --git a/okhttp3/src/main/java/zipkin2/reporter/okhttp3/HttpCall.java b/okhttp3/src/main/java/zipkin2/reporter/okhttp3/HttpCall.java index afaf540..945a889 100644 --- a/okhttp3/src/main/java/zipkin2/reporter/okhttp3/HttpCall.java +++ b/okhttp3/src/main/java/zipkin2/reporter/okhttp3/HttpCall.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.okhttp3; diff --git a/okhttp3/src/main/java/zipkin2/reporter/okhttp3/OkHttpSender.java b/okhttp3/src/main/java/zipkin2/reporter/okhttp3/OkHttpSender.java index ca395a7..ec771c6 100644 --- a/okhttp3/src/main/java/zipkin2/reporter/okhttp3/OkHttpSender.java +++ b/okhttp3/src/main/java/zipkin2/reporter/okhttp3/OkHttpSender.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.okhttp3; diff --git a/okhttp3/src/main/java/zipkin2/reporter/okhttp3/RequestBodyMessageEncoder.java b/okhttp3/src/main/java/zipkin2/reporter/okhttp3/RequestBodyMessageEncoder.java index 559ede7..3b756e0 100644 --- a/okhttp3/src/main/java/zipkin2/reporter/okhttp3/RequestBodyMessageEncoder.java +++ b/okhttp3/src/main/java/zipkin2/reporter/okhttp3/RequestBodyMessageEncoder.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.okhttp3; diff --git a/okhttp3/src/test/java/zipkin2/reporter/okhttp3/HttpCallTest.java b/okhttp3/src/test/java/zipkin2/reporter/okhttp3/HttpCallTest.java index 1d3ca40..33b74c1 100644 --- a/okhttp3/src/test/java/zipkin2/reporter/okhttp3/HttpCallTest.java +++ b/okhttp3/src/test/java/zipkin2/reporter/okhttp3/HttpCallTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.okhttp3; diff --git a/okhttp3/src/test/java/zipkin2/reporter/okhttp3/OkHttpSenderTest.java b/okhttp3/src/test/java/zipkin2/reporter/okhttp3/OkHttpSenderTest.java index 610190f..c667c7c 100644 --- a/okhttp3/src/test/java/zipkin2/reporter/okhttp3/OkHttpSenderTest.java +++ b/okhttp3/src/test/java/zipkin2/reporter/okhttp3/OkHttpSenderTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.okhttp3; diff --git a/pom.xml b/pom.xml index b92e20a..7b73ef7 100755 --- a/pom.xml +++ b/pom.xml @@ -1,23 +1,32 @@ 4.0.0 - io.zipkin.reporter2 + + org.apache + apache + 21 + + + org.apache.zipkin.reporter2 zipkin-reporter-parent 2.8.3-SNAPSHOT pom @@ -61,12 +70,12 @@ Zipkin Reporter (Parent) Zipkin Reporter (Parent) - https://github.com/openzipkin/zipkin-reporter-java + https://github.com/apache/incubator-zipkin-reporter-java 2016 - OpenZipkin - http://zipkin.io/ + The Apache Software Foundation + http://www.apache.org/ @@ -78,9 +87,9 @@ - https://github.com/openzipkin/zipkin-reporter-java - scm:git:https://github.com/openzipkin/zipkin-reporter-java.git - scm:git:https://github.com/openzipkin/zipkin-reporter-java.git + https://github.com/apache/incubator-zipkin-reporter-java + scm:git:https://github.com/apache/incubator-zipkin-reporter-java.git + scm:git:https://github.com/apache/incubator-zipkin-reporter-java.git HEAD @@ -94,22 +103,37 @@ + + Github + https://github.com/apache/incubator-zipkin-reporter-java/issues + + + + + Zipkin Developer List + dev@zipkin.apache.org + dev-subscribe@zipkin.apache.org + dev-unsubscribe@zipkin.apache.org + + + Zipkin Commits + commits@zipkin.apache.org + commits-subscribe@zipkin.apache.org + commits-unsubscribe@zipkin.apache.org + + + - bintray - https://api.bintray.com/maven/openzipkin/maven/zipkin-reporter-java/;publish=1 + apache.releases.https + https://repository.apache.org/service/local/staging/deploy/maven2 - jfrog-snapshots - https://oss.jfrog.org/artifactory/oss-snapshot-local + apache.snapshots.https + https://repository.apache.org/content/repositories/snapshots/ - - Github - https://github.com/openzipkin/zipkin-reporter-java/issues - - @@ -172,7 +196,7 @@ maven 0.7.5 - 3.6.0 + 3.6.1 @@ -223,6 +247,19 @@ + + + maven-javadoc-plugin + 3.0.1 + + false + zipkin2.reporter.internal,zipkin2.reporter.internal.* + + + none + + + org.eclipse.m2e lifecycle-mapping @@ -332,6 +369,10 @@ SLASHSTAR_STYLE + SLASHSTAR_STYLE + SCRIPT_STYLE + XML_STYLE + DOUBLESLASH_STYLE .travis.yml @@ -342,21 +383,17 @@ mvnw* etc/header.txt **/.idea/** + **/.editorconfig LICENSE + DISCLAIMER + DEPENDENCIES + NOTICE + Jenkinsfile **/*.md - bnd.bnd src/test/resources/** - src/main/resources/** true - - - com.mycila - license-maven-plugin-git - ${license-maven-plugin.version} - - @@ -368,30 +405,11 @@ - maven-release-plugin - 2.5.3 - - false - release - true - @{project.version} - - - - maven-surefire-plugin 3.0.0-M3 - io.zipkin.centralsync-maven-plugin - centralsync-maven-plugin - 0.1.0 - - zipkin-reporter-java - - - org.apache.felix maven-bundle-plugin 4.1.0 @@ -419,6 +437,73 @@ + + + org.apache.rat + apache-rat-plugin + 0.13 + + + **/target/** + + + **/.editorconfig + **/*.iml + **/.idea/** + **/*.classpath + **/.project + **/.settings/** + **/dependency-reduced-pom.xml + + + **/.gitignore + **/.gitmodules + **/.git/** + + + **/.travis.yml + + + **/.github/** + + + **/*.md + + + **/*.json + + + **/src/test/resources/** + + + .mvn/wrapper/maven-wrapper.properties + + + + + verify + + check + + + + + + + + maven-remote-resources-plugin + + true + + @@ -505,40 +590,23 @@ - release + apache-release - - - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - - - - maven-javadoc-plugin - 3.0.1 - - false - zipkin2.reporter.internal,zipkin2.reporter.internal.* - - - none - + maven-assembly-plugin - attach-javadocs - - jar - - package + source-release-assembly + + + apache-zipkin-reporter-java-incubating-${project.version} + + src/main/assemblies/source-release.xml + + + + diff --git a/spring-beans/pom.xml b/spring-beans/pom.xml index 53730e1..6063f66 100644 --- a/spring-beans/pom.xml +++ b/spring-beans/pom.xml @@ -1,22 +1,25 @@ - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-reporter-parent 2.8.3-SNAPSHOT @@ -89,6 +92,12 @@ + maven-remote-resources-plugin + + false + + + maven-jar-plugin diff --git a/spring-beans/src/main/java/zipkin2/reporter/beans/AsyncReporterFactoryBean.java b/spring-beans/src/main/java/zipkin2/reporter/beans/AsyncReporterFactoryBean.java index 4b11fcf..475851e 100644 --- a/spring-beans/src/main/java/zipkin2/reporter/beans/AsyncReporterFactoryBean.java +++ b/spring-beans/src/main/java/zipkin2/reporter/beans/AsyncReporterFactoryBean.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/main/java/zipkin2/reporter/beans/KafkaSenderFactoryBean.java b/spring-beans/src/main/java/zipkin2/reporter/beans/KafkaSenderFactoryBean.java index a86b760..7734d95 100644 --- a/spring-beans/src/main/java/zipkin2/reporter/beans/KafkaSenderFactoryBean.java +++ b/spring-beans/src/main/java/zipkin2/reporter/beans/KafkaSenderFactoryBean.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/main/java/zipkin2/reporter/beans/LibthriftSenderFactoryBean.java b/spring-beans/src/main/java/zipkin2/reporter/beans/LibthriftSenderFactoryBean.java index 81a1ab1..59e365c 100644 --- a/spring-beans/src/main/java/zipkin2/reporter/beans/LibthriftSenderFactoryBean.java +++ b/spring-beans/src/main/java/zipkin2/reporter/beans/LibthriftSenderFactoryBean.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/main/java/zipkin2/reporter/beans/OkHttpSenderFactoryBean.java b/spring-beans/src/main/java/zipkin2/reporter/beans/OkHttpSenderFactoryBean.java index d8095b3..87fe4fa 100644 --- a/spring-beans/src/main/java/zipkin2/reporter/beans/OkHttpSenderFactoryBean.java +++ b/spring-beans/src/main/java/zipkin2/reporter/beans/OkHttpSenderFactoryBean.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/main/java/zipkin2/reporter/beans/RabbitMQSenderFactoryBean.java b/spring-beans/src/main/java/zipkin2/reporter/beans/RabbitMQSenderFactoryBean.java index 1dc84dc..f542a50 100644 --- a/spring-beans/src/main/java/zipkin2/reporter/beans/RabbitMQSenderFactoryBean.java +++ b/spring-beans/src/main/java/zipkin2/reporter/beans/RabbitMQSenderFactoryBean.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/main/java/zipkin2/reporter/beans/URLConnectionSenderFactoryBean.java b/spring-beans/src/main/java/zipkin2/reporter/beans/URLConnectionSenderFactoryBean.java index 19f7b02..173900f 100644 --- a/spring-beans/src/main/java/zipkin2/reporter/beans/URLConnectionSenderFactoryBean.java +++ b/spring-beans/src/main/java/zipkin2/reporter/beans/URLConnectionSenderFactoryBean.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/test/java/zipkin2/reporter/beans/AsyncReporterFactoryBeanTest.java b/spring-beans/src/test/java/zipkin2/reporter/beans/AsyncReporterFactoryBeanTest.java index 4959f8c..10c5645 100755 --- a/spring-beans/src/test/java/zipkin2/reporter/beans/AsyncReporterFactoryBeanTest.java +++ b/spring-beans/src/test/java/zipkin2/reporter/beans/AsyncReporterFactoryBeanTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/test/java/zipkin2/reporter/beans/KafkaSenderFactoryBeanTest.java b/spring-beans/src/test/java/zipkin2/reporter/beans/KafkaSenderFactoryBeanTest.java index e2cb800..aea37f9 100755 --- a/spring-beans/src/test/java/zipkin2/reporter/beans/KafkaSenderFactoryBeanTest.java +++ b/spring-beans/src/test/java/zipkin2/reporter/beans/KafkaSenderFactoryBeanTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/test/java/zipkin2/reporter/beans/LibthriftSenderFactoryBeanTest.java b/spring-beans/src/test/java/zipkin2/reporter/beans/LibthriftSenderFactoryBeanTest.java index cb86b97..d2d8c14 100755 --- a/spring-beans/src/test/java/zipkin2/reporter/beans/LibthriftSenderFactoryBeanTest.java +++ b/spring-beans/src/test/java/zipkin2/reporter/beans/LibthriftSenderFactoryBeanTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/test/java/zipkin2/reporter/beans/OkHttpSenderFactoryBeanTest.java b/spring-beans/src/test/java/zipkin2/reporter/beans/OkHttpSenderFactoryBeanTest.java index c4a4680..5b8419b 100755 --- a/spring-beans/src/test/java/zipkin2/reporter/beans/OkHttpSenderFactoryBeanTest.java +++ b/spring-beans/src/test/java/zipkin2/reporter/beans/OkHttpSenderFactoryBeanTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/test/java/zipkin2/reporter/beans/RabbitMQSenderFactoryBeanTest.java b/spring-beans/src/test/java/zipkin2/reporter/beans/RabbitMQSenderFactoryBeanTest.java index 4139123..5b9a86b 100755 --- a/spring-beans/src/test/java/zipkin2/reporter/beans/RabbitMQSenderFactoryBeanTest.java +++ b/spring-beans/src/test/java/zipkin2/reporter/beans/RabbitMQSenderFactoryBeanTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/test/java/zipkin2/reporter/beans/URLConnectionSenderFactoryBeanTest.java b/spring-beans/src/test/java/zipkin2/reporter/beans/URLConnectionSenderFactoryBeanTest.java index fafe808..8cabfd5 100755 --- a/spring-beans/src/test/java/zipkin2/reporter/beans/URLConnectionSenderFactoryBeanTest.java +++ b/spring-beans/src/test/java/zipkin2/reporter/beans/URLConnectionSenderFactoryBeanTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/spring-beans/src/test/java/zipkin2/reporter/beans/XmlBeans.java b/spring-beans/src/test/java/zipkin2/reporter/beans/XmlBeans.java index 04ee5a5..fa71c62 100644 --- a/spring-beans/src/test/java/zipkin2/reporter/beans/XmlBeans.java +++ b/spring-beans/src/test/java/zipkin2/reporter/beans/XmlBeans.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.beans; diff --git a/src/etc/header.txt b/src/etc/header.txt index 6dba3bd..1745cfe 100644 --- a/src/etc/header.txt +++ b/src/etc/header.txt @@ -1,11 +1,14 @@ -Copyright ${license.git.copyrightYears} 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. diff --git a/src/main/assemblies/source-release.xml b/src/main/assemblies/source-release.xml new file mode 100644 index 0000000..2d37fc5 --- /dev/null +++ b/src/main/assemblies/source-release.xml @@ -0,0 +1,93 @@ + + + + source-release + + zipkin-reporter-java-${version} + + zip + + + + + + + . + + true + + + .travis.yml + + + Jenkinsfile + + + .mvn/** + mvnw + mvnw.cmd + + + .github/** + + + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*] + + + + + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?] + + + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser] + + + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup] + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties] + + + + + ${project.build.directory}/maven-shared-archive-resources/META-INF + + + + diff --git a/travis/publish.sh b/travis/publish.sh deleted file mode 100755 index 667d33a..0000000 --- a/travis/publish.sh +++ /dev/null @@ -1,135 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2016-2017 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. -# - -set -euo pipefail -set -x - -build_started_by_tag() { - if [ "${TRAVIS_TAG}" == "" ]; then - echo "[Publishing] This build was not started by a tag, publishing snapshot" - return 1 - else - echo "[Publishing] This build was started by the tag ${TRAVIS_TAG}, publishing release" - return 0 - fi -} - -is_pull_request() { - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then - echo "[Not Publishing] This is a Pull Request" - return 0 - else - echo "[Publishing] This is not a Pull Request" - return 1 - fi -} - -is_travis_branch_master() { - if [ "${TRAVIS_BRANCH}" = master ]; then - echo "[Publishing] Travis branch is master" - return 0 - else - echo "[Not Publishing] Travis branch is not master" - return 1 - fi -} - -check_travis_branch_equals_travis_tag() { - #Weird comparison comparing branch to tag because when you 'git push --tags' - #the branch somehow becomes the tag value - #github issue: https://github.com/travis-ci/travis-ci/issues/1675 - if [ "${TRAVIS_BRANCH}" != "${TRAVIS_TAG}" ]; then - echo "Travis branch does not equal Travis tag, which it should, bailing out." - echo " github issue: https://github.com/travis-ci/travis-ci/issues/1675" - exit 1 - else - echo "[Publishing] Branch (${TRAVIS_BRANCH}) same as Tag (${TRAVIS_TAG})" - fi -} - -check_release_tag() { - tag="${TRAVIS_TAG}" - if [[ "$tag" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$ ]]; then - echo "Build started by version tag $tag. During the release process tags like this" - echo "are created by the 'release' Maven plugin. Nothing to do here." - exit 0 - elif [[ ! "$tag" =~ ^release-[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$ ]]; then - echo "You must specify a tag of the format 'release-0.0.0' to release this project." - echo "The provided tag ${tag} doesn't match that. Aborting." - exit 1 - fi -} - -is_release_commit() { - project_version=$(./mvnw help:evaluate -N -Dexpression=project.version|sed -n '/^[0-9]/p') - if [[ "$project_version" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$ ]]; then - echo "Build started by release commit $project_version. Will synchronize to maven central." - return 0 - else - return 1 - fi -} - -release_version() { - echo "${TRAVIS_TAG}" | sed 's/^release-//' -} - -safe_checkout_master() { - # We need to be on a branch for release:perform to be able to create commits, and we want that branch to be master. - # But we also want to make sure that we build and release exactly the tagged version, so we verify that the remote - # master is where our tag is. - git checkout -B master - git fetch origin master:origin/master - commit_local_master="$(git show --pretty='format:%H' master)" - commit_remote_master="$(git show --pretty='format:%H' origin/master)" - if [ "$commit_local_master" != "$commit_remote_master" ]; then - echo "Master on remote 'origin' has commits since the version under release, aborting" - exit 1 - fi -} - -#---------------------- -# MAIN -#---------------------- - -if ! is_pull_request && build_started_by_tag; then - check_travis_branch_equals_travis_tag - check_release_tag -fi - -# skip license on travis due to zipkin #1512 -MYSQL_USER=root ./mvnw install -nsu -Dlicense.skip=true - -# If we are on a pull request, our only job is to run tests, which happened above via ./mvnw install -if is_pull_request; then - true -# If we are on master, we will deploy the latest snapshot or release version -# - If a release commit fails to deploy for a transient reason, delete the broken version from bintray and click rebuild -elif is_travis_branch_master; then - # skip license on travis due to zipkin #1512 - ./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -pl -:benchmarks -DskipTests -Dlicense.skip=true deploy - - # If the deployment succeeded, sync it to Maven Central. Note: this needs to be done once per project, not module, hence -N - if is_release_commit; then - ./mvnw --batch-mode -s ./.settings.xml -nsu -N io.zipkin.centralsync-maven-plugin:centralsync-maven-plugin:sync - fi - -# If we are on a release tag, the following will update any version references and push a version tag for deployment. -elif build_started_by_tag; then - safe_checkout_master - # skip license on travis due to zipkin #1512 - ./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DreleaseVersion="$(release_version)" -Darguments="-DskipTests -Dlicense.skip=true" release:prepare -fi - diff --git a/urlconnection/pom.xml b/urlconnection/pom.xml index c3b0235..49d1635 100644 --- a/urlconnection/pom.xml +++ b/urlconnection/pom.xml @@ -1,24 +1,27 @@ 4.0.0 - io.zipkin.reporter2 + org.apache.zipkin.reporter2 zipkin-reporter-parent 2.8.3-SNAPSHOT @@ -52,6 +55,12 @@ + maven-remote-resources-plugin + + false + + + maven-jar-plugin diff --git a/urlconnection/src/main/java/zipkin2/reporter/urlconnection/URLConnectionSender.java b/urlconnection/src/main/java/zipkin2/reporter/urlconnection/URLConnectionSender.java index ea47e7f..3e24e35 100644 --- a/urlconnection/src/main/java/zipkin2/reporter/urlconnection/URLConnectionSender.java +++ b/urlconnection/src/main/java/zipkin2/reporter/urlconnection/URLConnectionSender.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.urlconnection; diff --git a/urlconnection/src/test/java/zipkin2/reporter/urlconnection/URLConnectionSenderTest.java b/urlconnection/src/test/java/zipkin2/reporter/urlconnection/URLConnectionSenderTest.java index d832b1e..28f02f2 100644 --- a/urlconnection/src/test/java/zipkin2/reporter/urlconnection/URLConnectionSenderTest.java +++ b/urlconnection/src/test/java/zipkin2/reporter/urlconnection/URLConnectionSenderTest.java @@ -1,15 +1,18 @@ /* - * Copyright 2016-2018 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. */ package zipkin2.reporter.urlconnection;