Skip to content

Commit 9a34b0a

Browse files
committed
Update to Brave 6 / Zipkin 3
Signed-off-by: Andriy Redko <[email protected]>
1 parent dae03aa commit 9a34b0a

File tree

29 files changed

+107
-352
lines changed

29 files changed

+107
-352
lines changed

.github/CONTRIBUTING.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,8 @@ If you are adding a new file it should have a header like below. This
1717
can be automatically added by running `./mvnw com.mycila:license-maven-plugin:format`.
1818

1919
```
20-
/**
21-
* Copyright 2019 The OpenZipkin Authors
22-
*
23-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
24-
* in compliance with the License. You may obtain a copy of the License at
25-
*
26-
* http://www.apache.org/licenses/LICENSE-2.0
27-
*
28-
* Unless required by applicable law or agreed to in writing, software distributed under the License
29-
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
30-
* or implied. See the License for the specific language governing permissions and limitations under
31-
* the License.
20+
/*
21+
* Copyright The OpenZipkin Authors
22+
* SPDX-License-Identifier: Apache-2.0
3223
*/
3324
```

.settings.xml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2016-2020 The OpenZipkin Authors
5-
6-
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
7-
in compliance with the License. You may obtain a copy of the License at
8-
9-
http://www.apache.org/licenses/LICENSE-2.0
10-
11-
Unless required by applicable law or agreed to in writing, software distributed under the License
12-
is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
13-
or implied. See the License for the specific language governing permissions and limitations under
14-
the License.
4+
Copyright The OpenZipkin Authors
5+
SPDX-License-Identifier: Apache-2.0
156
167
-->
178
<settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

build-bin/git/login_git

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
#!/bin/sh
22
#
3-
# Copyright 2016-2020 The OpenZipkin Authors
4-
#
5-
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
6-
# in compliance with the License. You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software distributed under the License
11-
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
# or implied. See the License for the specific language governing permissions and limitations under
13-
# the License.
3+
# Copyright The OpenZipkin Authors
4+
# SPDX-License-Identifier: Apache-2.0
145
#
156

167
set -ue

build-bin/git/version_from_trigger_tag

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
#!/bin/sh
22
#
3-
# Copyright 2016-2020 The OpenZipkin Authors
4-
#
5-
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
6-
# in compliance with the License. You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software distributed under the License
11-
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
# or implied. See the License for the specific language governing permissions and limitations under
13-
# the License.
3+
# Copyright The OpenZipkin Authors
4+
# SPDX-License-Identifier: Apache-2.0
145
#
156

167
set -ue

build-bin/gpg/configure_gpg

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
#!/bin/sh
22
#
3-
# Copyright 2016-2020 The OpenZipkin Authors
4-
#
5-
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
6-
# in compliance with the License. You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software distributed under the License
11-
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
# or implied. See the License for the specific language governing permissions and limitations under
13-
# the License.
3+
# Copyright The OpenZipkin Authors
4+
# SPDX-License-Identifier: Apache-2.0
145
#
156

167
set -ue

build-bin/maven/maven_deploy

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
#!/bin/sh
22
#
3-
# Copyright 2016-2020 The OpenZipkin Authors
4-
#
5-
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
6-
# in compliance with the License. You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software distributed under the License
11-
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
# or implied. See the License for the specific language governing permissions and limitations under
13-
# the License.
3+
# Copyright The OpenZipkin Authors
4+
# SPDX-License-Identifier: Apache-2.0
145
#
156

167
set -ue

build-bin/maven/maven_go_offline

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
#!/bin/sh
22
#
3-
# Copyright 2016-2020 The OpenZipkin Authors
4-
#
5-
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
6-
# in compliance with the License. You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software distributed under the License
11-
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
# or implied. See the License for the specific language governing permissions and limitations under
13-
# the License.
3+
# Copyright The OpenZipkin Authors
4+
# SPDX-License-Identifier: Apache-2.0
145
#
156

167
# This is a go-offline that properly works with multi-module builds

build-bin/maven/maven_opts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
#!/bin/sh
22
#
3-
# Copyright 2016-2020 The OpenZipkin Authors
4-
#
5-
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
6-
# in compliance with the License. You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software distributed under the License
11-
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
# or implied. See the License for the specific language governing permissions and limitations under
13-
# the License.
3+
# Copyright The OpenZipkin Authors
4+
# SPDX-License-Identifier: Apache-2.0
145
#
156

167
# This script checks each variable value, so it isn't important to fail on unbound (set -u)

build-bin/maven/maven_release

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
#!/bin/sh
22
#
3-
# Copyright 2016-2020 The OpenZipkin Authors
4-
#
5-
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
6-
# in compliance with the License. You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software distributed under the License
11-
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
# or implied. See the License for the specific language governing permissions and limitations under
13-
# the License.
3+
# Copyright The OpenZipkin Authors
4+
# SPDX-License-Identifier: Apache-2.0
145
#
156

167
set -ue

exporter-sender-kafka/pom.xml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
11
<?xml version="1.0"?>
22
<!--
33
4-
Copyright 2016-2020 The OpenZipkin Authors
5-
6-
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
7-
in compliance with the License. You may obtain a copy of the License at
8-
9-
http://www.apache.org/licenses/LICENSE-2.0
10-
11-
Unless required by applicable law or agreed to in writing, software distributed under the License
12-
is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
13-
or implied. See the License for the specific language governing permissions and limitations under
14-
the License.
4+
Copyright The OpenZipkin Authors
5+
SPDX-License-Identifier: Apache-2.0
156
167
-->
178
<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">
189
<parent>
1910
<groupId>io.zipkin.brave.karaf</groupId>
2011
<artifactId>brave-karaf-parent</artifactId>
21-
<version>0.2.6-SNAPSHOT</version>
12+
<version>0.3.0-SNAPSHOT</version>
2213
</parent>
2314
<modelVersion>4.0.0</modelVersion>
2415

0 commit comments

Comments
 (0)