This is an automated email from the ASF dual-hosted git repository. adriancole pushed a commit to branch oz-build in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-brave-cassandra.git
commit 2e20019fd221305f1e3a6db94e61699b5d6867f3 Author: Adrian Cole <[email protected]> AuthorDate: Thu Jun 13 18:23:41 2019 +0800 Restores OpenZipkin publishing configuration This reverts back to OpenZipkin publishing configuration. See https://github.com/apache/incubator-zipkin/issues/2629 --- .github/CONTRIBUTING.md | 33 +++ .mvn/wrapper/MavenWrapperDownloader.java | 4 +- .mvn/wrapper/maven-wrapper.properties | 4 +- .travis.yml | 40 ++++ CONTRIBUTING.md | 45 ---- DISCLAIMER | 5 - Jenkinsfile | 90 -------- NOTICE | 5 - README.md | 16 +- cassandra-driver/pom.xml | 23 +-- .../cassandra/driver/CassandraClientParser.java | 21 +- .../cassandra/driver/CassandraClientSampler.java | 21 +- .../cassandra/driver/CassandraClientTracing.java | 21 +- .../brave/cassandra/driver/CassandraTraceKeys.java | 21 +- .../brave/cassandra/driver/TracingSession.java | 21 +- .../cassandra/driver/CustomPayloadCaptor.java | 21 +- .../brave/cassandra/driver/ITTracingSession.java | 21 +- cassandra-tests/pom.xml | 23 +-- .../src/main/java/cassandra/CassandraRule.java | 21 +- .../src/main/resources/log4j2.properties | 21 +- .../src/main/resources/test-cassandra.yaml | 25 +-- cassandra/pom.xml | 23 +-- .../java/brave/cassandra/CassandraTraceKeys.java | 21 +- .../src/main/java/brave/cassandra/Tracing.java | 21 +- .../java/brave/cassandra/TracingComponent.java | 21 +- .../src/test/java/brave/cassandra/ITTracing.java | 21 +- .../src/test/java/brave/cassandra/TracingTest.java | 21 +- mvnw | 9 +- mvnw.cmd | 30 ++- pom.xml | 230 ++++++++------------- src/etc/header.txt | 21 +- src/main/assemblies/source-release.xml | 87 -------- travis/publish.sh | 138 +++++++++++++ 33 files changed, 513 insertions(+), 632 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 0000000..b67e335 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,33 @@ +# Contributing to Zipkin + +If you would like to contribute code, fork this GitHub repository and +send 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](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 2019 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/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java old mode 100755 new mode 100644 index b20a55a..c32394f --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -20,12 +20,12 @@ import java.util.Properties; public class MavenWrapperDownloader { - private static final String WRAPPER_VERSION = "0.5.3"; + private static final String WRAPPER_VERSION = "0.5.5"; /** * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. */ private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"; - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + " .jar"; + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; /** * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties old mode 100755 new mode 100644 index 1703626..fa87ad7 --- 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 -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..476a6c7 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,40 @@ +# Run `travis lint` when changing this file to avoid breaking the build. + +cache: + directories: + - $HOME/.m2 + +language: java + +jdk: openjdk11 + +before_install: + # allocate commits to CI, not the owner of the deploy key + - git config user.name "zipkinci" + - git config user.email "[email protected]" + # 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 + +# Override default travis to use the maven wrapper; skip license on travis due to #1512 +install: ./mvnw install -DskipTests=true -Dlicense.skip=true -Dmaven.javadoc.skip=true -B -V +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]/ + +env: + global: + # Ex. travis encrypt BINTRAY_USER=your_github_account + - secure: "nRxCmaVvF+L+Ed4g7wKQne79jBx6a1fL42H/c9iWDIjeCh74nLS/orQan6KVWm+z8tWiET91viJcJjoiycEYiDDPFHv+5lThv1kOg+4BOyPDhKzOWN+8KGyzoJiuGsA97AU1lhjE1q4ce8khvX+8FCjBuDRpy0Bx1r/UAkq0ltdnZ7jFAnH/WVeJg4scq5OWkqDdEc6eLI22ZX1X3Zh5PDUCjSxt6RDnvUV52J8QYPCtIEmodcoGGCSoIchWNHZBEB8NWXib5e7qLm2ro8qlaRGKb1s7p1Kvi7sfgqA5ZWSHjDFjUHjCq9qMjxRrcuRz/2OKH6Ni51iFQH+wuGSPslE9otjRW8SGNpHmAVlJfcXHt5YQS3NYNBgXfJ6ENkyH8szR3mUq/xij6gTJfl1jbYD5wVYKkAodPgTBGit95HTFoGSpWjZrJiiXAXW+SLMW8Vl+Rc6Q1aFIewzSat7pm3vos2Qg+ [...] + # Ex. travis encrypt BINTRAY_KEY=xxx-https://bintray.com/profile/edit-xxx --add + - secure: "jfnIyXP7UdvyYh28ADmaHhLv2TT3DdmtLSDaRWD9J3OuwbNuW0vHvZPXSQ6LAkz1Nn3IuWXtEqUab5a7WWBvJWEs42hc0m3/+br5OUBdRvJXXkzdQB6PutC7bGyQtF5Ijnh/7N4N1BAbiZxMPf7wDmQXouNflvEaajIv9JjJKQWcUjoOueHHvnoljthMB1DZDMcHhNv05GeovZV/jPJZ+ftCQ/sMWnlNM3m8TUEMibPj3yc39ecH79IkxTqEA9KlQc9WesX1gA87uRDbwR/SRZCsVK+57Vu6GWqqXEarJVFkAbhafiTPzcDL6J8kgkG0dI16GAloL4612EHOKHe9/i+KCRufNFdXJGz5nDfHkj8QM9MxLn5m86Y9+7Kq69WP6zE91Ond9Jh2BbqBNNLgc+NRRQZL9qnzQNIG1gXuAuGS+p9mq6nILuda44MDExau1ZcUveRMF03Sqe83+7bJjSFhLKlM+ [...] + # Ex. travis encrypt GH_TOKEN=XXX-https://github.com/settings/tokens-XXX --add + - secure: "UPm7VacsdANr/KrfA4xXqfu3PIuJF/EHbWGv8ROzP9rq1oQqiesB6csQZFULmRj7Ndw1WaYSByQC+Ax8Ip+fuB+1j0mjGYoyIEugONeZv3CQ5OZCeWz6Dwm9bVDqa85whzxIYETRLT13hM8tAao0UOe6KAzTCZlDKxurebeSyQss/679rKeW5m/0f8ZhX+qTosXo5dpA5pyvq6uyFD3sSeJiig46KEDytvCD1kvo4HNoCD57k0Eh2AsIbg558W5vnZjOfE9p10McY0P5OBbTHyD23UCwXUxB0l8M9qVn2q13v4m0I/WrCqowu3fZPmOdIVX9k7P1ItncFlCJR49Kj54h+sJF5iDM0e5NsPwiALPA6DSj1K/QufH9YMO1/E+9UpZfEG7yO9uSNui+PhSu+/j5rfh4QZDTdH3zlnKIBu3VmPcEE+HZjSA4DCENb2/euHYDUML1mvrepY4DXGrqYbxPGvRLb [...] + # Ex. travis encrypt SONATYPE_USER=your_sonatype_account + - secure: "cqjdfroDe3NQ3J02dk9Ddsyz27mzN/vbq3/TfegV7QLce5VNGs2inHkTljt9BGU0S+9icMyLlRI0R4Q7QEBKiw1POnVzELAow4V2I4D5dyBjrQAGm8SWxJ1DNtXyfmvfwGt38G97RY0x4XRxTb3JgQMtO9a5BTih5AdOI7xnelTue7gFodjAVn8nytCKw9/YdwfVxhyNDpMSgRefqrFgbamT2f5b3cdQnOtEskDCVu9yNfSOG+w31qc3HgSRzniUFqxbPTYpKVdJDrEy7rSZ5jBozN7FJjStNdlwwbWvupCKmcejFO6a73dh3uoFPf5WDUTr1LJHoxzIRQDeaE5i7o0CHHcodE0efa69A8wsJrVOq5GN9HmjD+lsUIgdJIEH5Kz4AjGDOTzwwXzOjGEdUaCzb/83275tTikyujiOp9Rc37oNUzTOIeJvPDdffDDbDPwpEIsP8zlpF7mRhypXWAfXw1sQA [...] + # Ex. travis encrypt SONATYPE_PASSWORD=your_sonatype_password + - secure: "lQIgnaiqxv9oDWv+IrGeHjPTmOPAU+aKUeB1NAz9+6XR7MSybgWszFm2zayZA2ysSqmj62Mz9dV20s+Ia2WRPtcPHQqrHfwWEXE4qxTGuve16SSwXTmUccQvwesVfT1xn+bXuuh/tr5ObeGndj5t8ky0w8FyVKuzQEk13pCQCOR8rTlQVR9hddGQbiDvb+updX78Kj4PUz7ogYHKC9ddsBk+9Q2KWQhNv3CSuNDMHm7YhL1XyJeJBY1uKXvPBKS8i4s181vupfLjgzBTXzbElnIZDm6Zj/2BNd/X4mmo6p7KmhAcGjNIqIQchJcSy0TE/TorTKXP7bPEuHkGPGJ0OzdUGAB1B/jajFtmb5LhZ3QMzxZvS+Xr/hGhLG709fhOJ9ZGM3LP5Atw0rsQdvNqChMgujQgZWz8wSVhOZ6Tr03iNhrgaDwOYzvGWOs5DtjNg88RBJwiW3hPNIjtBi8PA6Qokh0qC [...] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 0516f07..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,45 +0,0 @@ -# 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 [email protected]. You will get a -confirmation and end up on a [list we can check](http://people.apache.org/unlistedclas.html). diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index f73ab06..0000000 --- a/DISCLAIMER +++ /dev/null @@ -1,5 +0,0 @@ -Apache Zipkin (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 deleted file mode 100644 index bae2e38..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,90 +0,0 @@ -/* - * 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: '[email protected]', - replyTo: '[email protected]', - body: "See <${currentBuild.absoluteUrl}>" - ) - } - } - - } - } -} diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 975c0d0..0000000 --- a/NOTICE +++ /dev/null @@ -1,5 +0,0 @@ -Apache Zipkin Brave (incubating) for Apache Cassandra -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 04ab789..a195a06 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [](https://gitter.im/openzipkin/zipkin) -[](https://builds.apache.org/blue/organizations/jenkins/incubator-zipkin-brave-cassandra) -[](https://search.maven.org/search?q=g:org.apache.zipkin.brave.cassandra%20AND%20a:brave-instrumentation-cassandra) +[](https://circleci.com/gh/openzipkin/brave-cassandra) +[](https://search.maven.org/search?q=g:io.brave.cassandra%20AND%20a:brave-instrumentation-cassandra) # brave-cassandra This contains tracing instrumentation for [Cassandra](https://github.com/apache/cassandra/blob/trunk/src/java/org/apache/cassandra/tracing/Tracing.java) and the [DataStax Java Driver](https://github.com/datastax/java-driver). @@ -15,10 +15,8 @@ server integration is in place, cassandra will contribute data to these RPC spans. ## Artifacts -Artifacts are under the maven group id `org.apache.zipkin.brave.cassandra` -### Source Releases -Source Releases are uploaded to [Apache](https://dist.apache.org/repos/dist/release/incubator/zipkin/brave-cassandra) -### 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.brave.cassandra%22) -### Binary Snapshots -Binary Snapshots are uploaded to [Apache](https://repository.apache.org/content/repositories/snapshots/) after commits to master. +Artifacts are under the maven group id `io.zipkin.brave.cassandra` +### Library Releases +Releases are uploaded to [Bintray](https://bintray.com/openzipkin/maven/brave-cassandra) and synchronized to [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.zipkin.brave.cassandra%22) +### Library Snapshots +Snapshots are uploaded to [JFrog](http://oss.jfrog.org/artifactory/oss-snapshot-local) after commits to master. diff --git a/cassandra-driver/pom.xml b/cassandra-driver/pom.xml index 2aae081..c8ad837 100644 --- a/cassandra-driver/pom.xml +++ b/cassandra-driver/pom.xml @@ -1,25 +1,22 @@ <?xml version="1.0"?> <!-- - 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 + Copyright 2017-2019 The OpenZipkin Authors - http://www.apache.org/licenses/LICENSE-2.0 + 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 - 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. + 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <groupId>org.apache.zipkin.brave.cassandra</groupId> + <groupId>io.zipkin.brave.cassandra</groupId> <artifactId>brave-cassandra-parent</artifactId> <version>0.10.3-SNAPSHOT</version> </parent> diff --git a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientParser.java b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientParser.java index 2c12362..4baad5f 100644 --- a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientParser.java +++ b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientParser.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra.driver; diff --git a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientSampler.java b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientSampler.java index deb5570..479b6ea 100644 --- a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientSampler.java +++ b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientSampler.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra.driver; diff --git a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientTracing.java b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientTracing.java index 7914193..337a35c 100644 --- a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientTracing.java +++ b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientTracing.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra.driver; diff --git a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraTraceKeys.java b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraTraceKeys.java index ff97a7b..15282d2 100644 --- a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraTraceKeys.java +++ b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraTraceKeys.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra.driver; diff --git a/cassandra-driver/src/main/java/brave/cassandra/driver/TracingSession.java b/cassandra-driver/src/main/java/brave/cassandra/driver/TracingSession.java index e6d3e49..1f87713 100644 --- a/cassandra-driver/src/main/java/brave/cassandra/driver/TracingSession.java +++ b/cassandra-driver/src/main/java/brave/cassandra/driver/TracingSession.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra.driver; diff --git a/cassandra-driver/src/test/java/brave/cassandra/driver/CustomPayloadCaptor.java b/cassandra-driver/src/test/java/brave/cassandra/driver/CustomPayloadCaptor.java index 24aeacb..556ec94 100644 --- a/cassandra-driver/src/test/java/brave/cassandra/driver/CustomPayloadCaptor.java +++ b/cassandra-driver/src/test/java/brave/cassandra/driver/CustomPayloadCaptor.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra.driver; diff --git a/cassandra-driver/src/test/java/brave/cassandra/driver/ITTracingSession.java b/cassandra-driver/src/test/java/brave/cassandra/driver/ITTracingSession.java index 67d69c3..a88645a 100644 --- a/cassandra-driver/src/test/java/brave/cassandra/driver/ITTracingSession.java +++ b/cassandra-driver/src/test/java/brave/cassandra/driver/ITTracingSession.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra.driver; diff --git a/cassandra-tests/pom.xml b/cassandra-tests/pom.xml index 813e238..9c15f7d 100644 --- a/cassandra-tests/pom.xml +++ b/cassandra-tests/pom.xml @@ -1,25 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - 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 + Copyright 2017-2019 The OpenZipkin Authors - http://www.apache.org/licenses/LICENSE-2.0 + 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 - 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. + 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <groupId>org.apache.zipkin.brave.cassandra</groupId> + <groupId>io.zipkin.brave.cassandra</groupId> <artifactId>brave-cassandra-parent</artifactId> <version>0.10.3-SNAPSHOT</version> </parent> diff --git a/cassandra-tests/src/main/java/cassandra/CassandraRule.java b/cassandra-tests/src/main/java/cassandra/CassandraRule.java index fce5008..dd18588 100644 --- a/cassandra-tests/src/main/java/cassandra/CassandraRule.java +++ b/cassandra-tests/src/main/java/cassandra/CassandraRule.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package cassandra; diff --git a/cassandra-tests/src/main/resources/log4j2.properties b/cassandra-tests/src/main/resources/log4j2.properties index 413b837..ac7ac91 100755 --- a/cassandra-tests/src/main/resources/log4j2.properties +++ b/cassandra-tests/src/main/resources/log4j2.properties @@ -1,18 +1,15 @@ # -# 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 +# Copyright 2017-2019 The OpenZipkin Authors # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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 # -# 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. +# 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. # appenders=console diff --git a/cassandra-tests/src/main/resources/test-cassandra.yaml b/cassandra-tests/src/main/resources/test-cassandra.yaml index 2425784..010f9c6 100644 --- a/cassandra-tests/src/main/resources/test-cassandra.yaml +++ b/cassandra-tests/src/main/resources/test-cassandra.yaml @@ -1,18 +1,15 @@ # -# 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. +# Copyright 2017-2019 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. # # Cassandra storage config YAML diff --git a/cassandra/pom.xml b/cassandra/pom.xml index ff2a3ff..ae8e48e 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -1,25 +1,22 @@ <?xml version="1.0"?> <!-- - 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 + Copyright 2017-2019 The OpenZipkin Authors - http://www.apache.org/licenses/LICENSE-2.0 + 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 - 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. + 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <groupId>org.apache.zipkin.brave.cassandra</groupId> + <groupId>io.zipkin.brave.cassandra</groupId> <artifactId>brave-cassandra-parent</artifactId> <version>0.10.3-SNAPSHOT</version> </parent> diff --git a/cassandra/src/main/java/brave/cassandra/CassandraTraceKeys.java b/cassandra/src/main/java/brave/cassandra/CassandraTraceKeys.java index 76efa92..1f6b042 100644 --- a/cassandra/src/main/java/brave/cassandra/CassandraTraceKeys.java +++ b/cassandra/src/main/java/brave/cassandra/CassandraTraceKeys.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra; diff --git a/cassandra/src/main/java/brave/cassandra/Tracing.java b/cassandra/src/main/java/brave/cassandra/Tracing.java index 224f247..86f60dc 100644 --- a/cassandra/src/main/java/brave/cassandra/Tracing.java +++ b/cassandra/src/main/java/brave/cassandra/Tracing.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra; diff --git a/cassandra/src/main/java/brave/cassandra/TracingComponent.java b/cassandra/src/main/java/brave/cassandra/TracingComponent.java index c27c295..3dc0ece 100644 --- a/cassandra/src/main/java/brave/cassandra/TracingComponent.java +++ b/cassandra/src/main/java/brave/cassandra/TracingComponent.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra; diff --git a/cassandra/src/test/java/brave/cassandra/ITTracing.java b/cassandra/src/test/java/brave/cassandra/ITTracing.java index e35b51e..11f9449 100644 --- a/cassandra/src/test/java/brave/cassandra/ITTracing.java +++ b/cassandra/src/test/java/brave/cassandra/ITTracing.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra; diff --git a/cassandra/src/test/java/brave/cassandra/TracingTest.java b/cassandra/src/test/java/brave/cassandra/TracingTest.java index b6eb216..7c24882 100644 --- a/cassandra/src/test/java/brave/cassandra/TracingTest.java +++ b/cassandra/src/test/java/brave/cassandra/TracingTest.java @@ -1,18 +1,15 @@ /* - * 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 + * Copyright 2017-2019 The OpenZipkin Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ package brave.cassandra; diff --git a/mvnw b/mvnw index 34d9dae..d2f0ea3 100755 --- a/mvnw +++ b/mvnw @@ -212,9 +212,9 @@ else echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." fi if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar" + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar" else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar"; + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"; fi while IFS="=" read key value; do case "$key" in (wrapperUrl) jarUrl="$value"; break ;; @@ -296,6 +296,11 @@ if $cygwin; then MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` fi +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain exec "$JAVACMD" \ diff --git a/mvnw.cmd b/mvnw.cmd old mode 100755 new mode 100644 index 77b451d..b26ab24 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -37,7 +37,7 @@ @echo off @REM set title of command window title %0 -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' @if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% @REM set %HOME% to equivalent of $HOME @@ -120,7 +120,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar"; +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"; FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B @@ -129,14 +129,18 @@ FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven- @REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central @REM This allows using the maven wrapper in projects that prohibit checking in binary data. if exist %WRAPPER_JAR% ( - echo Found %WRAPPER_JAR% + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) ) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar" - ) - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + powershell -Command "&{"^ "$webclient = new-object System.Net.WebClient;"^ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ @@ -144,10 +148,16 @@ if exist %WRAPPER_JAR% ( "}"^ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ "}" - echo Finished downloading %WRAPPER_JAR% + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) ) @REM End of extension +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + %MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* if ERRORLEVEL 1 goto error goto end diff --git a/pom.xml b/pom.xml index 0ea16be..f6c828f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,32 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - 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 + Copyright 2017-2019 The OpenZipkin Authors - http://www.apache.org/licenses/LICENSE-2.0 + 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 - 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. + 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>21</version> - </parent> - - <groupId>org.apache.zipkin.brave.cassandra</groupId> + <groupId>io.zipkin.brave.cassandra</groupId> <artifactId>brave-cassandra-parent</artifactId> <version>0.10.3-SNAPSHOT</version> <packaging>pom</packaging> @@ -59,13 +50,13 @@ </properties> <name>Brave Cassandra (Parent)</name> - <description>Apache Zipkin Brave (incubating) for Apache Cassandra (Parent)</description> - <url>https://github.com/apache/incubator-zipkin-brave-cassandra</url> + <description>Tracing instrumentation for Apache Cassandra (Parent)</description> + <url>https://github.com/openzipkin/brave-cassandra</url> <inceptionYear>2017</inceptionYear> <organization> - <name>The Apache Software Foundation</name> - <url>http://www.apache.org/</url> + <name>OpenZipkin</name> + <url>http://zipkin.io/</url> </organization> <licenses> @@ -77,9 +68,10 @@ </licenses> <scm> - <url>https://github.com/apache/incubator-zipkin-brave-cassandra</url> - <connection>scm:git:https://github.com/apache/incubator-zipkin-brave-cassandra.git</connection> - <developerConnection>scm:git:https://github.com/apache/incubator-zipkin-brave-cassandra.git</developerConnection> + <url>https://github.com/openzipkin/brave-cassandra</url> + <connection>scm:git:https://github.com/openzipkin/brave-cassandra.git</connection> + <developerConnection>scm:git:https://github.com/openzipkin/brave-cassandra.git + </developerConnection> <tag>HEAD</tag> </scm> @@ -92,35 +84,20 @@ </developer> </developers> - <mailingLists> - <mailingList> - <name>Zipkin Developer List</name> - <post>[email protected]</post> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - </mailingList> - <mailingList> - <name>Zipkin Commits</name> - <post>[email protected]</post> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - </mailingList> - </mailingLists> - <distributionManagement> <repository> - <id>apache.releases.https</id> - <url>https://repository.apache.org/service/local/staging/deploy/maven2</url> + <id>bintray</id> + <url>https://api.bintray.com/maven/openzipkin/maven/brave-cassandra/;publish=1</url> </repository> <snapshotRepository> - <id>apache.snapshots.https</id> - <url>https://repository.apache.org/content/repositories/snapshots/</url> + <id>jfrog-snapshots</id> + <url>http://oss.jfrog.org/artifactory/oss-snapshot-local</url> </snapshotRepository> </distributionManagement> <issueManagement> <system>Github</system> - <url>https://github.com/apache/incubator-zipkin-brave-cassandra/issues</url> + <url>https://github.com/openzipkin/brave-cassandra/issues</url> </issueManagement> <dependencyManagement> @@ -217,19 +194,40 @@ <plugin> <groupId>io.takari</groupId> <artifactId>maven</artifactId> - <version>0.7.4</version> + <version>0.7.6</version> + <configuration> + <maven>3.6.1</maven> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-install-plugin</artifactId> + <version>3.0.0-M1</version> + </plugin> + + <!-- Uploads occur as a last step (which also adds checksums) --> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <version>3.0.0-M1</version> + </plugin> + + <plugin> + <artifactId>maven-release-plugin</artifactId> + <version>2.5.3</version> <configuration> - <maven>3.6.0</maven> + <useReleaseProfile>false</useReleaseProfile> + <releaseProfiles>release</releaseProfiles> + <autoVersionSubmodules>true</autoVersionSubmodules> + <tagNameFormat>@{project.version}</tagNameFormat> </configuration> </plugin> <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <!-- inherit version from org.apache:parent --> + <groupId>io.zipkin.centralsync-maven-plugin</groupId> + <artifactId>centralsync-maven-plugin</artifactId> + <version>0.1.1</version> <configuration> - <failOnError>false</failOnError> - <!-- hush pedantic warnings: we don't put param and return on everything! --> - <doclint>none</doclint> + <packageName>brave-cassandra</packageName> </configuration> </plugin> </plugins> @@ -239,7 +237,7 @@ <plugin> <inherited>true</inherited> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>3.8.1</version> <configuration> <!-- Retrolambda will rewrite lambdas as Java 6 bytecode --> <source>1.8</source> @@ -269,7 +267,7 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>3.1.1</version> + <version>3.1.2</version> </plugin> <plugin> @@ -316,17 +314,6 @@ </plugin> <plugin> - <artifactId>maven-install-plugin</artifactId> - <version>3.0.0-M1</version> - </plugin> - - <!-- Uploads occur as a last step (which also adds checksums) --> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <version>3.0.0-M1</version> - </plugin> - - <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> <version>${license-maven-plugin.version}</version> @@ -344,13 +331,17 @@ <exclude>etc/header.txt</exclude> <exclude>**/.idea/**</exclude> <exclude>LICENSE</exclude> - <exclude>DISCLAIMER</exclude> - <exclude>NOTICE</exclude> - <exclude>Jenkinsfile</exclude> <exclude>**/*.md</exclude> </excludes> <strictCheck>true</strictCheck> </configuration> + <dependencies> + <dependency> + <groupId>com.mycila</groupId> + <artifactId>license-maven-plugin-git</artifactId> + <version>${license-maven-plugin.version}</version> + </dependency> + </dependencies> <executions> <execution> <goals> @@ -373,73 +364,13 @@ <configuration> <rules> <requireJavaVersion> - <version>[11,12)</version> + <version>[11,13)</version> </requireJavaVersion> </rules> </configuration> </execution> </executions> </plugin> - - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>0.13</version> - <configuration> - <excludes> - <exclude>**/target/**</exclude> - - <!-- IDE files --> - <exclude>**/*.iml</exclude> - <exclude>**/.idea/**</exclude> - <exclude>**/*.classpath</exclude> - <exclude>**/.project</exclude> - <exclude>**/.settings/**</exclude> - <exclude>**/dependency-reduced-pom.xml</exclude> - - <!-- git files --> - <exclude>**/.gitignore</exclude> - <exclude>**/.gitmodules</exclude> - <exclude>**/.git/**</exclude> - - <!-- CI files --> - <exclude>**/.travis.yml</exclude> - - <!-- GitHub files --> - <exclude>**/.github/**</exclude> - - <!-- document files --> - <exclude>**/*.md</exclude> - - <!-- Maven Wrapper generated files --> - <exclude>.mvn/wrapper/maven-wrapper.properties</exclude> - </excludes> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- org.apache:apache:21 sets maven-remote-resources-plugin in plugins, not pluginManagement - This results in execution in the parent project, and a side effect of an empty - DEPENDENCIES file in the assembly when packaged with the apache-release profile. - - https://issues.apache.org/jira/browse/MPOM-218 - - This works around the problem by skipping at the parent level at the cost of having to - un-skip it at every deployed child. - --> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> </plugins> </build> @@ -483,23 +414,38 @@ </build> </profile> <profile> - <id>apache-release</id> + <id>release</id> <build> <plugins> + <!-- Creates source jar --> <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <artifactId>maven-source-plugin</artifactId> + <version>3.1.0</version> <executions> <execution> - <id>source-release-assembly</id> - <configuration> - <!-- make the source release zip includes the word incubating --> - <finalName>apache-zipkin-brave-cassandra-incubating-${project.version}</finalName> - <descriptors> - <descriptor>src/main/assemblies/source-release.xml</descriptor> - </descriptors> - <!-- don't inherit the source-release as we are overriding it --> - <descriptorRefs combine.self="override" /> - </configuration> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>3.1.0</version> + <configuration> + <failOnError>false</failOnError> + <!-- hush pedantic warnings: we don't put param and return on everything! --> + <doclint>none</doclint> + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + <phase>package</phase> </execution> </executions> </plugin> diff --git a/src/etc/header.txt b/src/etc/header.txt index 1745cfe..308c88f 100644 --- a/src/etc/header.txt +++ b/src/etc/header.txt @@ -1,14 +1,11 @@ -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 +Copyright ${license.git.copyrightYears} The OpenZipkin Authors - http://www.apache.org/licenses/LICENSE-2.0 +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 -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. +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. \ No newline at end of file diff --git a/src/main/assemblies/source-release.xml b/src/main/assemblies/source-release.xml deleted file mode 100644 index 2a799c3..0000000 --- a/src/main/assemblies/source-release.xml +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- - - 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. - ---> -<assembly> - <id>source-release</id> - <!-- the only thing being done differently here is the base directory --> - <baseDirectory>brave-cassandra-${version}</baseDirectory> - <formats> - <format>zip</format> - </formats> - - <!-- Inlined to exclude all maven wrapper artifacts. This allows us to avoid NOTICE citations --> - <fileSets> - <!-- main project directory structure --> - <fileSet> - <directory>.</directory> - <outputDirectory></outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <!-- PATCH: Jenkinsfile --> - <exclude>Jenkinsfile</exclude> - - <!-- PATCH: Maven wrapper --> - <exclude>.mvn/**</exclude> - <exclude>mvnw</exclude> - <exclude>mvnw.cmd</exclude> - - <!-- build output --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude> - - <!-- NOTE: Most of the following excludes should not be required - if the standard release process is followed. This is because the - release plugin checks out project sources into a location like - target/checkout, then runs the build from there. The result is - a source-release archive that comes from a pretty clean directory - structure. - - HOWEVER, if the release plugin is configured to run extra goals - or generate a project website, it's definitely possible that some - of these files will be present. So, it's safer to exclude them. - --> - - <!-- IDEs --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude> - - <!-- misc --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude> - - <!-- release-plugin temp files --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude> - </excludes> - </fileSet> - <!-- license, readme, etc. calculated at build time --> - <fileSet> - <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory> - <outputDirectory></outputDirectory> - </fileSet> - </fileSets> -</assembly> diff --git a/travis/publish.sh b/travis/publish.sh new file mode 100755 index 0000000..69cd575 --- /dev/null +++ b/travis/publish.sh @@ -0,0 +1,138 @@ +#!/usr/bin/env bash +# +# Copyright 2017-2019 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 +} + +print_project_version() { + ./mvnw help:evaluate -N -Dexpression=project.version|sed -n '/^[0-9]/p' +} + +is_release_commit() { + project_version="$(print_project_version)" + 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 #1512 +./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 + ./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DskipTests 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 #1512 + ./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DreleaseVersion="$(release_version)" -Darguments="-DskipTests -Dlicense.skip=true" release:prepare +fi
