Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/maven/plugin.surefire.version-3…
Browse files Browse the repository at this point in the history
….3.1
  • Loading branch information
bednar authored Aug 5, 2024
2 parents 5aa478d + 33dd33e commit 84668b1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
10 changes: 7 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@
Update dependencies:

#### Build:
- [#738](https://github.com/influxdata/influxdb-client-java/pull/738): `spring-boot` to `3.3.1`
- [#753](https://github.com/influxdata/influxdb-client-java/pull/753): `spring-boot` to `3.3.2`
- [#726](https://github.com/influxdata/influxdb-client-java/pull/726): `kotlin` to `2.0.0`
- [#727](https://github.com/influxdata/influxdb-client-java/pull/727): `micrometer-registry-influx` to `1.30.0`
- [#752](https://github.com/influxdata/influxdb-client-java/pull/752): `micrometer-registry-influx` to `1.13.2`
- [#749](https://github.com/influxdata/influxdb-client-java/pull/749): `kotlin-coroutines` to `1.8.1`
- [#735](https://github.com/influxdata/influxdb-client-java/pull/735): `scala-collection-compat_2.12` to `2.12.0`
- [#740](https://github.com/influxdata/influxdb-client-java/pull/740): `pekko` to `1.0.3`
- [#741](https://github.com/influxdata/influxdb-client-java/pull/741): `commons-csv` to `1.11.0`
Expand All @@ -42,12 +43,15 @@ Update dependencies:
- [#730](https://github.com/influxdata/influxdb-client-java/pull/730): `scala-maven-plugin` to `4.9.1`
- [#734](https://github.com/influxdata/influxdb-client-java/pull/734): `maven-compiler-plugin` to `3.13.0`
- [#736](https://github.com/influxdata/influxdb-client-java/pull/736): `jacoco-maven-plugin` to `0.8.12`
- [#739](https://github.com/influxdata/influxdb-client-java/pull/739): `maven-project-info-reports-plugin` to `3.6.1`
- [#748](https://github.com/influxdata/influxdb-client-java/pull/748): `maven-surefire-plugin`, `maven-failsafe-plugin` to `3.3.1`
- [#746](https://github.com/influxdata/influxdb-client-java/pull/746): `maven-jar-plugin` to `3.4.2`
- [#747](https://github.com/influxdata/influxdb-client-java/pull/747): `maven-project-info-reports-plugin` to `3.6.2`
- [#751](https://github.com/influxdata/influxdb-client-java/pull/751): `license-maven-plugin` to `4.5`

#### Test:
- [#724](https://github.com/influxdata/influxdb-client-java/pull/724): `assertj` to `3.26.0`
- [#725](https://github.com/influxdata/influxdb-client-java/pull/725): `assertk-jvm` to `0.28.1`
- [#750](https://github.com/influxdata/influxdb-client-java/pull/750): `assertj-core` to `3.26.3`
- [#737](https://github.com/influxdata/influxdb-client-java/pull/737): `junit-jupiter` to `5.10.3`

#### Examples:
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<pekko.version>1.0.3</pekko.version>
<kotlin.version>2.0.0</kotlin.version>
<junit-jupiter.version>5.10.3</junit-jupiter.version>
<kotlin-coroutines.version>1.8.0</kotlin-coroutines.version>
<kotlin-coroutines.version>1.8.1</kotlin-coroutines.version>
<mockito.version>4.10.0</mockito.version>
</properties>

Expand Down Expand Up @@ -156,7 +156,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifest>
Expand Down Expand Up @@ -418,7 +418,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.3</version>
<version>4.5</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -466,7 +466,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.6.1</version>
<version>3.6.2</version>
<configuration>
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
</configuration>
Expand Down Expand Up @@ -702,7 +702,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.0</version>
<version>3.26.3</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
</scm>

<properties>
<micrometer.version>1.13.0</micrometer.version>
<spring-boot.version>3.3.1</spring-boot.version>
<micrometer.version>1.13.2</micrometer.version>
<spring-boot.version>3.3.2</spring-boot.version>
<spring.version>6.1.3</spring.version>
</properties>

Expand Down

0 comments on commit 84668b1

Please sign in to comment.