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-brave-cassandra.git
The following commit(s) were added to refs/heads/master by this push:
new e0a718c Moves project build to ASF infrastructure (#17)
e0a718c is described below
commit e0a718cea3d08ccac5f2286b6485c56ff41c5688
Author: Adrian Cole <[email protected]>
AuthorDate: Mon Mar 18 09:31:14 2019 +0800
Moves project build to ASF infrastructure (#17)
This moves off non-ASF things including repositories, deployment
processes, license headers etc. It creates the same changes done
in brave-karaf. Later, we'll need to setup Jenkins to look at this
and also do a test release.
---
.circleci/config.yml | 141 ---------
.gitignore | 8 +
.mvn/wrapper/MavenWrapperDownloader.java | 51 ++--
.mvn/wrapper/maven-wrapper.jar | Bin 48337 -> 0 bytes
.mvn/wrapper/maven-wrapper.properties | 3 +-
.settings.xml | 43 ---
CONTRIBUTING.md | 30 --
DISCLAIMER | 5 +
Jenkinsfile | 90 ++++++
NOTICE | 5 +
RELEASE.md | 41 ---
build-support/go-offline.sh | 34 ---
build-support/pom-no-crossmodule-dependencies.xsl | 26 --
build-support/publish-snapshot.sh | 23 --
build-support/publish-stable.sh | 21 --
build-support/trigger-publish.sh | 38 ---
cassandra-driver/pom.xml | 37 ++-
.../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 | 30 +-
.../src/main/java/cassandra/CassandraRule.java | 21 +-
.../src/main/resources/log4j2.properties | 17 ++
.../src/main/resources/test-cassandra.yaml | 17 ++
cassandra/pom.xml | 31 +-
.../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 +-
mvnw | 27 +-
mvnw.cmd | 333 +++++++++++----------
pom.xml | 222 ++++++++------
src/etc/header.txt | 21 +-
src/main/assemblies/source-release.xml | 87 ++++++
38 files changed, 814 insertions(+), 819 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index a095b4a..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# Copyright 2017-2018 The OpenZipkin Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
-# or implied. See the License for the specific language governing permissions
and limitations under
-# the License.
-#
-
-version: 2
-
-jobs:
- build:
- docker:
- - image: circleci/openjdk:11-jdk
- steps:
-
- - checkout
-
- - restore_cache:
- key: maven-dependencies-{{ checksum "pom.xml" }}
-
- - run:
- name: Download dependencies
- command: |
- sudo apt-get install xsltproc
- ./build-support/go-offline.sh
-
- - save_cache:
- key: maven-dependencies-{{ checksum "pom.xml" }}
- paths:
- - ~/.m2
-
- - run:
- name: Tests
- command: ./mvnw clean verify
-
- - run:
- name: Collect test reports
- when: always
- command: |
- mkdir -p /tmp/test-reports/unit-tests/
- find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp
{} /tmp/test-reports/unit-tests/ \;
- mkdir -p /tmp/test-reports/integration-tests/
- find . -type f -regex ".*/target/failsafe-reports/TEST.*xml" -exec
cp {} /tmp/test-reports/integration-tests/ \;
-
- - store_test_results:
- path: /tmp/test-reports/
-
- publish_snapshot:
- docker:
- - image: circleci/openjdk:11-jdk
- steps:
- - checkout
- - restore_cache:
- key: maven-dependencies-{{ checksum "pom.xml" }}
- - run:
- name: Publish snapshot
- command: |
- # Guard against running this on pull requests or forks
- [ "$CIRCLE_PROJECT_USERNAME" == "openzipkin" ] || exit 0
- [ -z "$CIRCLE_PR_NUMBER" ] || exit 0
- ./build-support/publish-snapshot.sh
-
- publish_stable:
- docker:
- - image: circleci/openjdk:11-jdk
- steps:
- - checkout
- - restore_cache:
- key: maven-dependencies-{{ checksum "pom.xml" }}
- - run:
- name: Publish stable version
- command: |
- # Guard against running this on pull requests or forks
- [ "$CIRCLE_PROJECT_USERNAME" == "openzipkin" ] || exit 0
- [ -z "$CIRCLE_PR_NUMBER" ] || exit 0
- ./build-support/publish-stable.sh
-
- trigger_publish:
- docker:
- - image: circleci/openjdk:11-jdk
- steps:
- - checkout
- - restore_cache:
- key: maven-dependencies-{{ checksum "pom.xml" }}
- - run:
- name: Configure Git for release
- command: |
- # parameters used during release
- # 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
- - run:
- name: Trigger publish
- command: |
- # Guard against running this on pull requests or forks
- [ "$CIRCLE_PROJECT_USERNAME" == "openzipkin" ] || exit 0
- [ -z "$CIRCLE_PR_NUMBER" ] || exit 0
- ./build-support/trigger-publish.sh
-
-workflows:
- version: 2
- build_and_publish:
- jobs:
- - build:
- filters:
- tags:
- only: /\d+\.\d+\.\d+/
- - publish_snapshot:
- requires:
- - build
- filters:
- branches:
- only: master
- - publish_stable:
- requires:
- - build
- filters:
- branches:
- ignore: /.*/
- tags:
- only: /\d+\.\d+\.\d+/
- - trigger_publish:
- filters:
- branches:
- ignore: /.*/
- tags:
- only: /release-\d+\.\d+\.\d+/
-
-notify:
- webhooks:
- - url: https://webhooks.gitter.im/e/22adbb9973299092e6ae
diff --git a/.gitignore b/.gitignore
index e1f45e2..53ecf9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,11 @@ target/
# macOS
.DS_Store
+
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Maven Wrapper
+.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java
b/.mvn/wrapper/MavenWrapperDownloader.java
index fa4f7b4..b20a55a 100755
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -1,22 +1,18 @@
/*
-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 2007-present the original author or 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.
+ */
import java.net.*;
import java.io.*;
import java.nio.channels.*;
@@ -24,11 +20,12 @@ import java.util.Properties;
public class MavenWrapperDownloader {
+ private static final String WRAPPER_VERSION = "0.5.3";
/**
* 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/0.4.2/maven-wrapper-0.4.2.jar";;
+ private static final String DEFAULT_DOWNLOAD_URL =
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/";
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + " .jar";
/**
* Path to the maven-wrapper.properties file, which might contain a
downloadUrl property to
@@ -76,13 +73,13 @@ public class MavenWrapperDownloader {
}
}
}
- System.out.println("- Downloading from: : " + url);
+ System.out.println("- Downloading from: " + url);
File outputFile = new File(baseDirectory.getAbsolutePath(),
MAVEN_WRAPPER_JAR_PATH);
if(!outputFile.getParentFile().exists()) {
if(!outputFile.getParentFile().mkdirs()) {
System.out.println(
- "- ERROR creating output direcrory '" +
outputFile.getParentFile().getAbsolutePath() + "'");
+ "- ERROR creating output directory '" +
outputFile.getParentFile().getAbsolutePath() + "'");
}
}
System.out.println("- Downloading to: " +
outputFile.getAbsolutePath());
@@ -98,6 +95,16 @@ public class MavenWrapperDownloader {
}
private static void downloadFileFromURL(String urlString, File
destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null &&
System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
URL website = new URL(urlString);
ReadableByteChannel rbc;
rbc = Channels.newChannel(website.openStream());
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100755
index 01e6799..0000000
Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/.mvn/wrapper/maven-wrapper.properties
b/.mvn/wrapper/maven-wrapper.properties
index 00d32aa..1703626 100755
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
\ No newline at end of file
+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
diff --git a/.settings.xml b/.settings.xml
deleted file mode 100644
index 062cdfe..0000000
--- a/.settings.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 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.
-
--->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
- http://maven.apache.org/xsd/settings-1.0.0.xsd";>
- <servers>
- <server>
- <id>sonatype</id>
- <username>${env.SONATYPE_USER}</username>
- <password>${env.SONATYPE_PASSWORD}</password>
- </server>
- <server>
- <id>bintray</id>
- <username>${env.BINTRAY_USER}</username>
- <password>${env.BINTRAY_KEY}</password>
- </server>
- <server>
- <id>jfrog-snapshots</id>
- <username>${env.BINTRAY_USER}</username>
- <password>${env.BINTRAY_KEY}</password>
- </server>
- <server>
- <id>github.com</id>
- <username>${env.GH_USER}</username>
- <password>${env.GH_TOKEN}</password>
- </server>
- </servers>
-</settings>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 47d2806..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 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.
- */
- ```
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..f73ab06
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..5c28c35
--- /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 1.8 (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/surefire-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
new file mode 100644
index 0000000..975c0d0
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+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/RELEASE.md b/RELEASE.md
deleted file mode 100644
index f282f8e..0000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Brave Cassandra Release Process
-
-This repo uses semantic versions. Please keep this in mind when choosing
version numbers.
-
-1. **Alert others you are releasing**
-
- There should be no commits made to master while the release is in progress
(about 10 minutes). Before you start
- a release, alert others on [gitter](https://gitter.im/openzipkin/zipkin) so
that they don't accidentally merge
- anything. If they do, and the build fails because of that, you'll have to
recreate the release tag described below.
-
-1. **Push a git tag**
-
- The tag should be of the format `release-N.M.L`, for example
`release-3.7.1`.
-
-1. **Wait for CircleCI**
-
- This part is controlled by
[`build-support/publish-stable.sh`](build-support/publish-stable.sh). It
creates a bunch of new commits, bumps
- the version, publishes artifacts, and syncs to Maven Central.
https://circleci.com/gh/openzipkin/brave-cassandra
-
-## Credentials
-
-Credentials of various kind are needed for the release process to work. If you
notice something
-failing due to unauthorized, re-save them as [environment
variables](https://circleci.com/gh/openzipkin/brave-cassandra/edit#env-vars).
-
-## First release of the year
-
-The license plugin verifies license headers of files include a copyright
notice indicating the years a file was affected.
-This information is taken from git history. There's a once-a-year problem with
files that include version numbers (pom.xml).
-When a release tag is made, it increments version numbers, then commits them
to git. On the first release of the year,
-further commands will fail due to the version increments invalidating the
copyright statement. The way to sort this out is
-the following:
-
-Before you do the first release of the year, move the SNAPSHOT version back
and forth from whatever the current is.
-In-between, re-apply the licenses.
-```bash
-$ ./mvnw versions:set -DnewVersion=1.3.3-SNAPSHOT -DgenerateBackupPoms=false
-$ ./mvnw com.mycila:license-maven-plugin:format
-$ ./mvnw versions:set -DnewVersion=1.3.2-SNAPSHOT -DgenerateBackupPoms=false
-$ git commit -am"Adjusts copyright headers for this year"
-```
-
diff --git a/build-support/go-offline.sh b/build-support/go-offline.sh
deleted file mode 100755
index 70e7e23..0000000
--- a/build-support/go-offline.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#
-# Copyright 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.
-#
-
-# Due to https://issues.apache.org/jira/browse/MDEP-323 and cross-module
dependencies,
-# we can't easily run mvn dependency:go-offline. This is a workaround for that.
-# It removes all dependencies on io.zipkin.java and ${project.groupId} using
XSLT,
-# then runs go-offline on the resulting POMs.
-
-set -xeuo pipefail
-
-rm -rf go-offline-builddir
-mkdir -p go-offline-builddir
-trap "rm -rf $(pwd)/go-offline-builddir" EXIT
-
-for f in $(find . -name 'pom.xml'); do
- echo $f
- mkdir -p $(dirname go-offline-builddir/$f)
- xsltproc ./build-support/pom-no-crossmodule-dependencies.xsl $f >
go-offline-builddir/$f
-done
-
-cd go-offline-builddir
-../mvnw dependency:go-offline
diff --git a/build-support/pom-no-crossmodule-dependencies.xsl
b/build-support/pom-no-crossmodule-dependencies.xsl
deleted file mode 100644
index 79d2b53..0000000
--- a/build-support/pom-no-crossmodule-dependencies.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 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.
-
--->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:pom="http://maven.apache.org/POM/4.0.0";>
- <xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="pom:dependency[pom:groupId = 'io.zipkin.aws']" />
- <xsl:template match="pom:dependency[pom:groupId = '${project.groupId}']" />
-</xsl:stylesheet>
diff --git a/build-support/publish-snapshot.sh
b/build-support/publish-snapshot.sh
deleted file mode 100755
index 1513004..0000000
--- a/build-support/publish-snapshot.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright 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
-
-if ./mvnw help:evaluate -N -Dexpression=project.version | grep -v '\[' | grep
-q SNAPSHOT; then
- ./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DskipTests deploy
-else
- echo "Not building release versions, those are built by the tag builder
using the publish-stable.sh script"
-fi
diff --git a/build-support/publish-stable.sh b/build-support/publish-stable.sh
deleted file mode 100755
index f6e5d38..0000000
--- a/build-support/publish-stable.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright 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
-
-./mvnw -DskipTests install -nsu
-./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DskipTests deploy
-./mvnw --batch-mode -s ./.settings.xml -nsu -N
io.zipkin.centralsync-maven-plugin:centralsync-maven-plugin:sync
diff --git a/build-support/trigger-publish.sh b/build-support/trigger-publish.sh
deleted file mode 100755
index 46ead94..0000000
--- a/build-support/trigger-publish.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright 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
-
-release_version() {
- echo "${CIRCLE_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
-}
-
-safe_checkout_master
-./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu
-DreleaseVersion="$(release_version)" -Darguments="-DskipTests" release:prepare
diff --git a/cassandra-driver/pom.xml b/cassandra-driver/pom.xml
index e351b94..30fbd34 100644
--- a/cassandra-driver/pom.xml
+++ b/cassandra-driver/pom.xml
@@ -1,22 +1,27 @@
<?xml version="1.0"?>
<!--
- Copyright 2017-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.
-->
-<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";>
+<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>io.zipkin.brave.cassandra</groupId>
+ <groupId>org.apache.zipkin.brave.cassandra</groupId>
<artifactId>brave-cassandra-parent</artifactId>
<version>0.10.2-SNAPSHOT</version>
</parent>
@@ -42,4 +47,14 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
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 dd55fed..2c12362 100644
---
a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientParser.java
+++
b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientParser.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 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 dc8ffdb..deb5570 100644
---
a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientSampler.java
+++
b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientSampler.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 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 f235ef2..7914193 100644
---
a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientTracing.java
+++
b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraClientTracing.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 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 cf09fc8..ff97a7b 100644
---
a/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraTraceKeys.java
+++
b/cassandra-driver/src/main/java/brave/cassandra/driver/CassandraTraceKeys.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 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 cc975c9..e6d3e49 100644
--- a/cassandra-driver/src/main/java/brave/cassandra/driver/TracingSession.java
+++ b/cassandra-driver/src/main/java/brave/cassandra/driver/TracingSession.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 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 1d416bc..24aeacb 100644
---
a/cassandra-driver/src/test/java/brave/cassandra/driver/CustomPayloadCaptor.java
+++
b/cassandra-driver/src/test/java/brave/cassandra/driver/CustomPayloadCaptor.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 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 f19af13..f28f40e 100644
---
a/cassandra-driver/src/test/java/brave/cassandra/driver/ITTracingSession.java
+++
b/cassandra-driver/src/test/java/brave/cassandra/driver/ITTracingSession.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 brave.cassandra.driver;
diff --git a/cassandra-tests/pom.xml b/cassandra-tests/pom.xml
index ae94a81..624446e 100644
--- a/cassandra-tests/pom.xml
+++ b/cassandra-tests/pom.xml
@@ -1,22 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2017-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.
-->
<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>io.zipkin.brave.cassandra</groupId>
+ <groupId>org.apache.zipkin.brave.cassandra</groupId>
<artifactId>brave-cassandra-parent</artifactId>
<version>0.10.2-SNAPSHOT</version>
</parent>
@@ -49,6 +52,13 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>net.orfjackal.retrolambda</groupId>
<artifactId>retrolambda-maven-plugin</artifactId>
<executions>
diff --git a/cassandra-tests/src/main/java/cassandra/CassandraRule.java
b/cassandra-tests/src/main/java/cassandra/CassandraRule.java
index 934033d..fce5008 100644
--- a/cassandra-tests/src/main/java/cassandra/CassandraRule.java
+++ b/cassandra-tests/src/main/java/cassandra/CassandraRule.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 cassandra;
diff --git a/cassandra-tests/src/main/resources/log4j2.properties
b/cassandra-tests/src/main/resources/log4j2.properties
index 20b5187..413b837 100755
--- a/cassandra-tests/src/main/resources/log4j2.properties
+++ b/cassandra-tests/src/main/resources/log4j2.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.
+#
+
appenders=console
appender.console.type=Console
appender.console.name=STDOUT
diff --git a/cassandra-tests/src/main/resources/test-cassandra.yaml
b/cassandra-tests/src/main/resources/test-cassandra.yaml
index c56da54..2425784 100644
--- a/cassandra-tests/src/main/resources/test-cassandra.yaml
+++ b/cassandra-tests/src/main/resources/test-cassandra.yaml
@@ -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.
+#
+
# Cassandra storage config YAML
# NOTE:
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 0d35c2c..bcce110 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -1,22 +1,25 @@
<?xml version="1.0"?>
<!--
- Copyright 2017-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.
-->
<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>io.zipkin.brave.cassandra</groupId>
+ <groupId>org.apache.zipkin.brave.cassandra</groupId>
<artifactId>brave-cassandra-parent</artifactId>
<version>0.10.2-SNAPSHOT</version>
</parent>
@@ -60,8 +63,14 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/cassandra/src/main/java/brave/cassandra/CassandraTraceKeys.java
b/cassandra/src/main/java/brave/cassandra/CassandraTraceKeys.java
index cc06621..76efa92 100644
--- a/cassandra/src/main/java/brave/cassandra/CassandraTraceKeys.java
+++ b/cassandra/src/main/java/brave/cassandra/CassandraTraceKeys.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 brave.cassandra;
diff --git a/cassandra/src/main/java/brave/cassandra/Tracing.java
b/cassandra/src/main/java/brave/cassandra/Tracing.java
index 3b4fa80..1cb9c1e 100644
--- a/cassandra/src/main/java/brave/cassandra/Tracing.java
+++ b/cassandra/src/main/java/brave/cassandra/Tracing.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 brave.cassandra;
diff --git a/cassandra/src/main/java/brave/cassandra/TracingComponent.java
b/cassandra/src/main/java/brave/cassandra/TracingComponent.java
index e3bdebf..c27c295 100644
--- a/cassandra/src/main/java/brave/cassandra/TracingComponent.java
+++ b/cassandra/src/main/java/brave/cassandra/TracingComponent.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 brave.cassandra;
diff --git a/cassandra/src/test/java/brave/cassandra/ITTracing.java
b/cassandra/src/test/java/brave/cassandra/ITTracing.java
index 89f3976..d8e3ce7 100644
--- a/cassandra/src/test/java/brave/cassandra/ITTracing.java
+++ b/cassandra/src/test/java/brave/cassandra/ITTracing.java
@@ -1,15 +1,18 @@
/*
- * Copyright 2017-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 brave.cassandra;
diff --git a/mvnw b/mvnw
index 5551fde..34d9dae 100755
--- a/mvnw
+++ b/mvnw
@@ -114,7 +114,6 @@ if $mingw ; then
M2_HOME="`(cd "$M2_HOME"; pwd)`"
[ -n "$JAVA_HOME" ] &&
JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
- # TODO classpath?
fi
if [ -z "$JAVA_HOME" ]; then
@@ -212,7 +211,11 @@ else
if [ "$MVNW_VERBOSE" = true ]; then
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
fi
-
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
+ if [ -n "$MVNW_REPOURL" ]; then
+
jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar"
+ else
+
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar";
+ fi
while IFS="=" read key value; do
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
esac
@@ -221,22 +224,38 @@ else
echo "Downloading from: $jarUrl"
fi
wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
if command -v wget > /dev/null; then
if [ "$MVNW_VERBOSE" = true ]; then
echo "Found wget ... using wget"
fi
- wget "$jarUrl" -O "$wrapperJarPath"
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD
"$jarUrl" -O "$wrapperJarPath"
+ fi
elif command -v curl > /dev/null; then
if [ "$MVNW_VERBOSE" = true ]; then
echo "Found curl ... using curl"
fi
- curl -o "$wrapperJarPath" "$jarUrl"
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath"
"$jarUrl" -f
+ fi
+
else
if [ "$MVNW_VERBOSE" = true ]; then
echo "Falling back to using Java to download"
fi
javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
if [ -e "$javaClass" ]; then
if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ];
then
if [ "$MVNW_VERBOSE" = true ]; then
diff --git a/mvnw.cmd b/mvnw.cmd
index 48363fa..77b451d 100755
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -1,161 +1,172 @@
-@REM
----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM
----------------------------------------------------------------------------
-
-@REM
----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM
----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd
ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another
setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder
".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto
endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do
set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-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.4.2/maven-wrapper-0.4.2.jar";
-FOR /F "tokens=1,2 delims==" %%A IN
(%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
- IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
-@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%
-) else (
- echo Couldn't find %WRAPPER_JAR%, downloading it ...
- echo Downloading from: %DOWNLOAD_URL%
- powershell -Command "(New-Object
Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
- echo Finished downloading %WRAPPER_JAR%
-)
-@REM End of extension
-
-%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
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd
ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%
+@REM
----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM
----------------------------------------------------------------------------
+
+@REM
----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM
----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd
ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another
setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder
".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto
endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do
set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+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";
+
+FOR /F "tokens=1,2 delims==" %%A IN
("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@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%
+) 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%
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and
[string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object
System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol =
[Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%',
'%WRAPPER_JAR%')"^
+ "}"
+ echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%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
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd
ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/pom.xml b/pom.xml
index 3fd04f1..78f5a4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2017-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.
-->
<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>
- <groupId>io.zipkin.brave.cassandra</groupId>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>21</version>
+ </parent>
+
+ <groupId>org.apache.zipkin.brave.cassandra</groupId>
<artifactId>brave-cassandra-parent</artifactId>
<version>0.10.2-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -37,24 +46,24 @@
<main.signature.artifact>java17</main.signature.artifact>
<main.basedir>${project.basedir}</main.basedir>
- <brave.version>5.4.3</brave.version>
+ <brave.version>5.6.3</brave.version>
<!-- override to set exclusions per-project -->
<errorprone.args />
<errorprone.version>2.3.2</errorprone.version>
- <license-maven-plugin.version>2.11</license-maven-plugin.version>
- <maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version>
+ <license-maven-plugin.version>3.0</license-maven-plugin.version>
+ <maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
</properties>
<name>Brave Cassandra (Parent)</name>
- <description>Brave Cassandra (Parent)</description>
- <url>https://github.com/openzipkin/brave-cassandra</url>
+ <description>Apache Zipkin Brave (incubating) for Apache Cassandra
(Parent)</description>
+ <url>https://github.com/apache/incubator-zipkin-brave-cassandra</url>
<inceptionYear>2017</inceptionYear>
<organization>
- <name>OpenZipkin</name>
- <url>http://zipkin.io/</url>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
</organization>
<licenses>
@@ -66,10 +75,9 @@
</licenses>
<scm>
- <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>
+ <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>
<tag>HEAD</tag>
</scm>
@@ -82,20 +90,35 @@
</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>bintray</id>
-
<url>https://api.bintray.com/maven/openzipkin/maven/brave-cassandra/;publish=1</url>
+ <id>apache.releases.https</id>
+
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
</repository>
<snapshotRepository>
- <id>jfrog-snapshots</id>
- <url>http://oss.jfrog.org/artifactory/oss-snapshot-local</url>
+ <id>apache.snapshots.https</id>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
<issueManagement>
<system>Github</system>
- <url>https://github.com/openzipkin/brave-cassandra/issues</url>
+
<url>https://github.com/apache/incubator-zipkin-brave-cassandra/issues</url>
</issueManagement>
<dependencyManagement>
@@ -110,7 +133,7 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
- <version>3.11.3</version>
+ <version>3.11.4</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -125,7 +148,7 @@
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
- <version>3.6.0</version>
+ <version>3.7.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -135,7 +158,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.11.1</version>
+ <version>3.12.1</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -162,11 +185,24 @@
<build>
<pluginManagement>
<plugins>
- <!-- mvn -N io.takari:maven:wrapper -Dmaven=3.5.4 -->
+ <!-- mvn -N io.takari:maven:wrapper generates the ./mvnw script -->
<plugin>
<groupId>io.takari</groupId>
<artifactId>maven</artifactId>
- <version>0.6.1</version>
+ <version>0.7.4</version>
+ <configuration>
+ <maven>3.6.0</maven>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <!-- inherit version from org.apache:parent -->
+ <configuration>
+ <failOnError>false</failOnError>
+ <!-- hush pedantic warnings: we don't put param and return on
everything! -->
+ <doclint>none</doclint>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
@@ -188,7 +224,7 @@
<plugin>
<groupId>net.orfjackal.retrolambda</groupId>
<artifactId>retrolambda-maven-plugin</artifactId>
- <version>2.5.5</version>
+ <version>2.5.6</version>
<executions>
<execution>
<goals>
@@ -205,7 +241,7 @@
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
@@ -237,18 +273,15 @@
</executions>
</plugin>
- <!-- Ensures checksums are added to published jars -->
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- <configuration>
- <createChecksum>true</createChecksum>
- </configuration>
+ <version>3.0.0-M1</version>
</plugin>
+ <!-- Uploads occur as a last step (which also adds checksums) -->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>3.0.0-M1</version>
</plugin>
<plugin>
@@ -269,19 +302,13 @@
<exclude>etc/header.txt</exclude>
<exclude>**/.idea/**</exclude>
<exclude>LICENSE</exclude>
+ <exclude>DISCLAIMER</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>Jenkinsfile</exclude>
<exclude>**/*.md</exclude>
- <exclude>src/test/resources/**</exclude>
- <exclude>src/main/resources/**</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>
@@ -313,22 +340,62 @@
</plugin>
<plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.13</version>
<configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <releaseProfiles>release</releaseProfiles>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <tagNameFormat>@{project.version}</tagNameFormat>
+ <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>
- <groupId>io.zipkin.centralsync-maven-plugin</groupId>
- <artifactId>centralsync-maven-plugin</artifactId>
- <version>0.1.0</version>
+ <artifactId>maven-remote-resources-plugin</artifactId>
<configuration>
- <packageName>brave-cassandra</packageName>
+ <skip>true</skip>
</configuration>
</plugin>
</plugins>
@@ -417,38 +484,23 @@
</build>
</profile>
<profile>
- <id>release</id>
+ <id>apache-release</id>
<build>
<plugins>
- <!-- Creates source jar -->
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
+ <artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</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>
+ <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>
</execution>
</executions>
</plugin>
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..2a799c3
--- /dev/null
+++ b/src/main/assemblies/source-release.xml
@@ -0,0 +1,87 @@
+<?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>
