Skip to content

Commit fb85e12

Browse files
bednarbednar
authored
chore: add configuration for Dependabot, update dependencies (#377)
1 parent 5c15cfa commit fb85e12

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+269
-92
lines changed

‎.circleci/config.yml

+19
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,23 @@ jobs:
168168
name: "Check dependency rules"
169169
command: mvn enforcer:enforce -Drules=banDuplicatePomDependencyVersions,dependencyConvergence
170170

171+
check-generate-site:
172+
parameters:
173+
maven-image:
174+
type: string
175+
default: *default-maven-image
176+
docker:
177+
- image: << parameters.maven-image >>
178+
steps:
179+
- checkout
180+
- restore_cache:
181+
name: Restoring Maven Cache
182+
keys:
183+
- maven-cache_v3-<< parameters.maven-image >>-
184+
- run:
185+
name: "Check generate site"
186+
command: mvn clean site site:stage -DskipTests
187+
171188
deploy-snapshot:
172189
docker:
173190
- image: *default-maven-image
@@ -211,6 +228,7 @@ workflows:
211228
build:
212229
jobs:
213230
- check-dependencies
231+
- check-generate-site
214232
- tests-java:
215233
name: jdk-8
216234
- tests-java:
@@ -234,6 +252,7 @@ workflows:
234252
- deploy-snapshot:
235253
requires:
236254
- check-dependencies
255+
- check-generate-site
237256
- jdk-8
238257
- jdk-11
239258
- jdk-17

‎.github/dependabot.yml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#
2+
# The MIT License
3+
#
4+
# Permission is hereby granted, free of charge, to any person obtaining a copy
5+
# of this software and associated documentation files (the "Software"), to deal
6+
# in the Software without restriction, including without limitation the rights
7+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
# copies of the Software, and to permit persons to whom the Software is
9+
# furnished to do so, subject to the following conditions:
10+
#
11+
# The above copyright notice and this permission notice shall be included in
12+
# all copies or substantial portions of the Software.
13+
#
14+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20+
# THE SOFTWARE.
21+
#
22+
23+
version: 2
24+
updates:
25+
- package-ecosystem: "maven"
26+
directory: "/"
27+
schedule:
28+
interval: "daily"
29+
open-pull-requests-limit: 10
30+
ignore:
31+
- dependency-name: "org.scala-lang:scala-library"
32+
update-types: ["version-update:semver-major", "version-update:semver-minor"]

‎CHANGELOG.md

+58
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
## 6.4.0 [unreleased]
2+
3+
### Release Notice
4+
5+
#### Spring
6+
7+
:warning: The client upgrades the `OkHttp` library to version `4.10.0`.
8+
9+
The `spring-boot` supports the `OkHttp:4.10.0` from the version `3.0.0-M4` - [spring-boot/OkHttp 4.10,0](https://github.com/spring-projects/spring-boot/commit/6cb1a958a5d43a2fffb7e7635e3be9c0ee15f3b1).
10+
For the older version of `spring-boot` you have to configure Spring Boot's `okhttp3.version` property:
11+
12+
```xml
13+
<properties>
14+
<okhttp3.version>4.10.0</okhttp3.version>
15+
</properties>
16+
```
217

318
### Features
419
1. [#373](https://github.com/influxdata/influxdb-client-java/pull/373): Improve `FluxDSL`:
@@ -16,6 +31,49 @@
1631
1. [#358](https://github.com/influxdata/influxdb-client-java/pull/358): Missing backpressure for asynchronous non-blocking API
1732
1. [#372](https://github.com/influxdata/influxdb-client-java/pull/372): Redact the `Authorization` HTTP header from log
1833

34+
### Dependencies
35+
1. [#377](https://github.com/influxdata/influxdb-client-java/pull/377): Update dependencies:
36+
37+
#### Build:
38+
- kotlin-stdlib to 1.7.10
39+
- kotlinx-coroutines-core to 1.6.4
40+
- lombok to 1.18.24
41+
- micrometer-registry-influx to 1.9.2
42+
- okhttp3 to 4.10.0
43+
- okio to 3.2.0
44+
- rxjava to 3.1.5
45+
- scala-collection-compat_2.12 to 2.8.0
46+
- spring to 5.3.22
47+
- spring-boot to 2.7.2
48+
49+
#### Maven Plugin:
50+
- maven-bundle-plugin to 5.1.7
51+
- maven-checkstyle-plugin to 3.1.2
52+
- maven-compiler-plugin to 3.10.1
53+
- maven-enforcer-plugin to 3.1.0
54+
- maven-jar-plugin to 3.2.2
55+
- maven-javadoc-plugin to 3.4.0
56+
- maven-project-info-reports-plugin to 3.4.0
57+
- maven-site-plugin to 3.12.0
58+
- build-helper-maven-plugin to 3.3.0
59+
- dokka-maven-plugin to 1.7.10
60+
- jacoco-maven-plugin to 0.8.8
61+
- karaf-maven-plugin to 4.4.1
62+
- kotlin-maven-plugin to 1.7.10
63+
- license-maven-plugin to 4.1
64+
- nexus-staging-maven-plugin to 1.6.13
65+
- scala-maven-plugin to 4.7.1
66+
- scalatest-maven-plugin to 2.1.0
67+
- scala-maven-plugin to 3.4.4
68+
- scoverage-maven-plugin to 1.4.11
69+
- versions-maven-plugin to 2.11.0
70+
71+
#### Test:
72+
- assertj-core to 3.23.1
73+
- mockito to 4.6.1
74+
- scalatest_2.12 to 3.2.12
75+
- scalatest_2.13 to 3.2.12
76+
1977
## 6.3.0 [2022-06-30]
2078

2179
### Features

‎client-core/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@
118118
<groupId>com.squareup.okio</groupId>
119119
<artifactId>okio</artifactId>
120120
</exclusion>
121+
<exclusion>
122+
<groupId>com.squareup.okio</groupId>
123+
<artifactId>okio-jvm</artifactId>
124+
</exclusion>
121125
</exclusions>
122126
</dependency>
123127

@@ -140,6 +144,10 @@
140144
<groupId>com.squareup.okhttp3</groupId>
141145
<artifactId>okhttp</artifactId>
142146
</exclusion>
147+
<exclusion>
148+
<groupId>org.jetbrains.kotlin</groupId>
149+
<artifactId>kotlin-stdlib-jdk8</artifactId>
150+
</exclusion>
143151
</exclusions>
144152
</dependency>
145153

@@ -167,6 +175,14 @@
167175
<groupId>junit</groupId>
168176
<artifactId>junit</artifactId>
169177
</exclusion>
178+
<exclusion>
179+
<groupId>com.squareup.okhttp3</groupId>
180+
<artifactId>okhttp</artifactId>
181+
</exclusion>
182+
<exclusion>
183+
<groupId>org.jetbrains.kotlin</groupId>
184+
<artifactId>kotlin-stdlib-jdk8</artifactId>
185+
</exclusion>
170186
</exclusions>
171187
<scope>test</scope>
172188
</dependency>

‎client-kotlin/pom.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<plugin>
109109
<groupId>org.jetbrains.dokka</groupId>
110110
<artifactId>dokka-maven-plugin</artifactId>
111-
<version>1.4.30</version>
111+
<version>1.7.10</version>
112112
<executions>
113113
<execution>
114114
<id>dokka-pre-site</id>
@@ -179,12 +179,15 @@
179179
<dependency>
180180
<groupId>org.jetbrains.kotlinx</groupId>
181181
<artifactId>kotlinx-coroutines-core-jvm</artifactId>
182-
<version>1.4.3</version>
183182
<exclusions>
184183
<exclusion>
185184
<groupId>org.jetbrains.kotlin</groupId>
186185
<artifactId>kotlin-stdlib-common</artifactId>
187186
</exclusion>
187+
<exclusion>
188+
<groupId>org.jetbrains.kotlin</groupId>
189+
<artifactId>kotlin-stdlib-jdk8</artifactId>
190+
</exclusion>
188191
</exclusions>
189192
</dependency>
190193

‎client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlin.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/QueryKotlinApi.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -19,7 +19,6 @@
1919
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2020
* THE SOFTWARE.
2121
*/
22-
2322
package com.influxdb.client.kotlin
2423

2524
import com.influxdb.client.domain.Dialect

‎client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/WriteKotlinApi.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/internal/InfluxDBClientKotlinImpl.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -44,6 +44,7 @@ internal class InfluxDBClientKotlinImpl(options: InfluxDBClientOptions) : Abstra
4444
return WriteKotlinApiImpl(retrofit.create(WriteService::class.java), options)
4545
}
4646

47+
@Deprecated("This method is obsolete. Use `ping()` or `version()`", replaceWith = ReplaceWith("ping()"))
4748
override fun health(): HealthCheck {
4849
return health(healthService.getHealth(null))
4950
}

‎client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/internal/QueryKotlinApiImpl.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/internal/WriteKotlinApiImpl.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/AbstractITInfluxDBClientKotlin.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITInfluxDBClientKotlin.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinFactoryTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/WriteKotlinApiTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* The MIT License
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎client-legacy/src/test/java/com/influxdb/client/flux/ITFluxClient.java

+5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.assertj.core.api.Assertions;
3838
import org.junit.jupiter.api.BeforeEach;
3939
import org.junit.jupiter.api.Test;
40+
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
4041
import org.junit.platform.runner.JUnitPlatform;
4142
import org.junit.runner.RunWith;
4243

@@ -144,6 +145,8 @@ void chunkedCancel() {
144145
}
145146

146147
@Test
148+
//https://github.com/influxdata/flux/issues/2505
149+
@DisabledIfSystemProperty(named = "os.arch", matches = "aarch64")
147150
void query() {
148151

149152
String flux = FROM_FLUX_DATABASE + "\n"
@@ -187,6 +190,8 @@ void error() {
187190
}
188191

189192
@Test
193+
//https://github.com/influxdata/flux/issues/2505
194+
@DisabledIfSystemProperty(named = "os.arch", matches = "aarch64")
190195
void callback() {
191196

192197
countDownLatch = new CountDownLatch(3);

‎client-osgi/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<plugin>
9090
<groupId>org.apache.felix</groupId>
9191
<artifactId>maven-bundle-plugin</artifactId>
92-
<version>5.1.2</version>
92+
<version>5.1.7</version>
9393
<extensions>true</extensions>
9494
<configuration>
9595
<instructions>
@@ -144,7 +144,7 @@
144144
<dependency>
145145
<groupId>org.projectlombok</groupId>
146146
<artifactId>lombok</artifactId>
147-
<version>1.18.22</version>
147+
<version>1.18.24</version>
148148
<scope>provided</scope>
149149
</dependency>
150150

‎client-scala/cross/2.12/pom.xml

+7-3
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<plugin>
115115
<groupId>org.scalatest</groupId>
116116
<artifactId>scalatest-maven-plugin</artifactId>
117-
<version>2.0.0</version>
117+
<version>2.1.0</version>
118118
<configuration>
119119
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
120120
<junitxml>.</junitxml>
@@ -164,7 +164,7 @@
164164
<dependency>
165165
<groupId>org.scala-lang.modules</groupId>
166166
<artifactId>scala-collection-compat_2.12</artifactId>
167-
<version>2.7.0</version>
167+
<version>2.8.0</version>
168168
<exclusions>
169169
<exclusion>
170170
<groupId>org.scala-lang</groupId>
@@ -186,6 +186,10 @@
186186
<groupId>org.scala-lang</groupId>
187187
<artifactId>scala-library</artifactId>
188188
</exclusion>
189+
<exclusion>
190+
<groupId>org.reactivestreams</groupId>
191+
<artifactId>reactive-streams</artifactId>
192+
</exclusion>
189193
</exclusions>
190194
</dependency>
191195

@@ -224,7 +228,7 @@
224228
<dependency>
225229
<groupId>org.scalatest</groupId>
226230
<artifactId>scalatest_2.12</artifactId>
227-
<version>3.2.11</version>
231+
<version>3.2.12</version>
228232
<scope>test</scope>
229233
<exclusions>
230234
<exclusion>

0 commit comments

Comments
 (0)