Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Update Brave Karaf dependencies #63

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions features/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2016-2020 The OpenZipkin Authors
Copyright 2016-2024 The OpenZipkin Authors
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated.. at some point this could be refactored to use the short license headers

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated.. at some point this could be refactored to use the short license headers

Yep, will do shortly with Brave 6 / Zipkin 3 update, thanks!


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
Expand Down Expand Up @@ -38,7 +38,7 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
<executions>
<execution>
<id>filter</id>
Expand All @@ -52,7 +52,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>attach-artifacts</id>
Expand Down
6 changes: 3 additions & 3 deletions itests/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2016-2020 The OpenZipkin Authors
Copyright 2016-2024 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
Expand All @@ -24,8 +24,8 @@
<artifactId>brave-itests</artifactId>

<properties>
<pax-exam.version>4.13.4</pax-exam.version>
<karaf.version>4.3.0</karaf.version>
<pax-exam.version>4.13.5</pax-exam.version>
<karaf.version>4.3.10</karaf.version>
<main.basedir>${project.basedir}/..</main.basedir>
</properties>

Expand Down
46 changes: 23 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2016-2020 The OpenZipkin Authors
Copyright 2016-2024 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
Expand Down Expand Up @@ -55,39 +55,39 @@
<main.java.version>1.8</main.java.version>
<main.signature.artifact>java18</main.signature.artifact>

<zipkin.version>2.23.2</zipkin.version>
<zipkin-reporter.version>2.16.3</zipkin-reporter.version>
<brave.version>5.13.3</brave.version>
<zipkin.version>2.27.1</zipkin.version>
<zipkin-reporter.version>2.17.2</zipkin-reporter.version>
<brave.version>5.18.1</brave.version>

<assertj.version>3.18.1</assertj.version>
<junit.version>4.13.1</junit.version>
<mockito.version>3.6.28</mockito.version>
<assertj.version>3.26.3</assertj.version>
<junit.version>4.13.2</junit.version>
<mockito.version>5.14.2</mockito.version>

<!-- override to set exclusions per-project -->
<errorprone.args />
<errorprone.version>2.4.0</errorprone.version>

<license.skip>${skipTests}</license.skip>

<animal-sniffer-maven-plugin.version>1.19</animal-sniffer-maven-plugin.version>
<animal-sniffer-maven-plugin.version>1.24</animal-sniffer-maven-plugin.version>
<go-offline-maven-plugin.version>1.2.8</go-offline-maven-plugin.version>
<!-- TODO: cleanup any redundant ignores now also in the 4.0 release (once final) -->
<license-maven-plugin.version>4.0.rc2</license-maven-plugin.version>
<maven-bundle-plugin.version>5.1.1</maven-bundle-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<license-maven-plugin.version>4.6</license-maven-plugin.version>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<!-- Use same version as https://github.com/openzipkin/docker-java -->
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<!-- Use same version as https://github.com/openzipkin/docker-java -->
<maven-help-plugin.version>3.2.0</maven-help-plugin.version>
<maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<maven-help-plugin.version>3.5.1</maven-help-plugin.version>
<maven-install-plugin.version>3.1.3</maven-install-plugin.version>
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
</properties>

<name>Brave Karaf (Parent)</name>
Expand Down Expand Up @@ -157,7 +157,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.2.13</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading