Skip to content

Commit f332faf

Browse files
authored
Merge branch 'master' into dependabot/maven/io.micrometer-micrometer-registry-influx-1.15.2
2 parents a9cbbd8 + bd85243 commit f332faf

File tree

10 files changed

+40
-40
lines changed

10 files changed

+40
-40
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ jacoco-maven-plugin: 0.8.5, maven-checkstyle: 3.1.1, maven-javadoc: 3.2.0, maven
11201120
1. [#40](https://github.com/influxdata/influxdb-client-java/issues/40): The client is hosted in Maven Central repository
11211121
- Repackaged from `org.influxdata` to `com.influxdb`
11221122
- Changed _groupId_ from `org.influxdata` to `com.influxdb`
1123-
- Snapshots are located in the _OSS Snapshot repository_: `https://oss.sonatype.org/content/repositories/snapshots/`
1123+
- Snapshots are located in the _OSS Snapshot repository_: `https://central.sonatype.com/repository/maven-snapshots/`
11241124

11251125
### Features
11261126
1. [#34](https://github.com/influxdata/influxdb-client-java/issues/34): Auto-configure client from configuration file

client-kotlin/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,14 @@ dependencies {
315315
```
316316

317317
### Snapshot Repository
318-
The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.org/content/repositories/snapshots/).
318+
The snapshots are deployed into [OSS Snapshot repository](https://central.sonatype.com/repository/maven-snapshots/).
319319

320320
#### Maven
321321
```xml
322322
<repository>
323323
<id>ossrh</id>
324324
<name>OSS Snapshot repository</name>
325-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
325+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
326326
<releases>
327327
<enabled>false</enabled>
328328
</releases>
@@ -334,6 +334,6 @@ The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.o
334334
#### Gradle
335335
```
336336
repositories {
337-
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
337+
maven { url "https://central.sonatype.com/repository/maven-snapshots" }
338338
}
339339
```

client-legacy/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,14 @@ dependencies {
174174
```
175175

176176
### Snapshot Repository
177-
The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.org/content/repositories/snapshots/).
177+
The snapshots are deployed into [OSS Snapshot repository](https://central.sonatype.com/repository/maven-snapshots/).
178178

179179
#### Maven
180180
```xml
181181
<repository>
182182
<id>ossrh</id>
183183
<name>OSS Snapshot repository</name>
184-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
184+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
185185
<releases>
186186
<enabled>false</enabled>
187187
</releases>
@@ -193,6 +193,6 @@ The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.o
193193
#### Gradle
194194
```
195195
repositories {
196-
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
196+
maven { url "https://central.sonatype.com/repository/maven-snapshots" }
197197
}
198198
```

client-reactive/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,14 +445,14 @@ dependencies {
445445
```
446446

447447
### Snapshot Repository
448-
The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.org/content/repositories/snapshots/).
448+
The snapshots are deployed into [OSS Snapshot repository](https://central.sonatype.com/repository/maven-snapshots/).
449449

450450
#### Maven
451451
```xml
452452
<repository>
453453
<id>ossrh</id>
454454
<name>OSS Snapshot repository</name>
455-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
455+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
456456
<releases>
457457
<enabled>false</enabled>
458458
</releases>
@@ -464,6 +464,6 @@ The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.o
464464
#### Gradle
465465
```
466466
repositories {
467-
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
467+
maven { url "https://central.sonatype.com/repository/maven-snapshots" }
468468
}
469469
```

client-scala/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,14 @@ dependencies {
287287
```
288288

289289
### Snapshot Repository
290-
The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.org/content/repositories/snapshots/).
290+
The snapshots are deployed into [OSS Snapshot repository](https://central.sonatype.com/repository/maven-snapshots/).
291291

292292
#### Maven
293293
```xml
294294
<repository>
295295
<id>ossrh</id>
296296
<name>OSS Snapshot repository</name>
297-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
297+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
298298
<releases>
299299
<enabled>false</enabled>
300300
</releases>
@@ -306,6 +306,6 @@ The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.o
306306
#### Gradle
307307
```
308308
repositories {
309-
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
309+
maven { url "https://central.sonatype.com/repository/maven-snapshots" }
310310
}
311311
```

client/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,14 +1334,14 @@ dependencies {
13341334
```
13351335

13361336
### Snapshot Repository
1337-
The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.org/content/repositories/snapshots/).
1337+
The snapshots are deployed into [OSS Snapshot repository](https://central.sonatype.com/repository/maven-snapshots/).
13381338

13391339
#### Maven
13401340
```xml
13411341
<repository>
13421342
<id>ossrh</id>
13431343
<name>OSS Snapshot repository</name>
1344-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
1344+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
13451345
<releases>
13461346
<enabled>false</enabled>
13471347
</releases>
@@ -1353,7 +1353,7 @@ The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.o
13531353
#### Gradle
13541354
```
13551355
repositories {
1356-
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
1356+
maven { url "https://central.sonatype.com/repository/maven-snapshots" }
13571357
}
13581358
```
13591359

examples/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,6 @@
155155
<version>${influxdb-client.version}</version>
156156
<scope>compile</scope>
157157
</dependency>
158-
<dependency>
159-
<groupId>commons-io</groupId>
160-
<artifactId>commons-io</artifactId>
161-
<version>2.16.1</version>
162-
</dependency>
163158
<dependency>
164159
<groupId>commons-cli</groupId>
165160
<artifactId>commons-cli</artifactId>
@@ -171,7 +166,7 @@
171166
<repository>
172167
<id>ossrh</id>
173168
<name>OSS Snapshot repository</name>
174-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
169+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
175170
<releases>
176171
<enabled>false</enabled>
177172
</releases>

flux-dsl/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,14 +1109,14 @@ dependencies {
11091109
```
11101110

11111111
### Snapshot Repository
1112-
The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.org/content/repositories/snapshots/).
1112+
The snapshots are deployed into [OSS Snapshot repository](https://central.sonatype.com/repository/maven-snapshots/).
11131113

11141114
#### Maven
11151115
```xml
11161116
<repository>
11171117
<id>ossrh</id>
11181118
<name>OSS Snapshot repository</name>
1119-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
1119+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
11201120
<releases>
11211121
<enabled>false</enabled>
11221122
</releases>
@@ -1128,6 +1128,6 @@ The snapshots are deployed into [OSS Snapshot repository](https://oss.sonatype.o
11281128
#### Gradle
11291129
```
11301130
repositories {
1131-
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
1131+
maven { url "https://central.sonatype.com/repository/maven-snapshots" }
11321132
}
11331133
```

pom.xml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@
9393
<distributionManagement>
9494
<snapshotRepository>
9595
<id>ossrh</id>
96-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
96+
<url>https://central.sonatype.com/repository/maven-snapshots</url>
9797
</snapshotRepository>
9898
<repository>
9999
<id>ossrh</id>
100-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
100+
<url>https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/</url>
101101
</repository>
102102
<site>
103103
<id>GitHubPages</id>
@@ -110,18 +110,18 @@
110110

111111
<dependency.retrofit.version>2.11.0</dependency.retrofit.version>
112112
<dependency.okhttp3.version>4.12.0</dependency.okhttp3.version>
113-
<dependency.com.squareup.okio>3.9.0</dependency.com.squareup.okio>
113+
<dependency.com.squareup.okio>3.16.0</dependency.com.squareup.okio>
114114
<dependency.gson.version>2.12.1</dependency.gson.version>
115115
<dependency.io.reactivex.rxjava3>3.1.10</dependency.io.reactivex.rxjava3>
116116

117117
<plugin.surefire.version>3.5.2</plugin.surefire.version>
118-
<plugin.javadoc.version>3.10.1</plugin.javadoc.version>
118+
<plugin.javadoc.version>3.11.2</plugin.javadoc.version>
119119
<plugin.checkstyle.version>3.6.0</plugin.checkstyle.version>
120120
<plugin.jacoco.version>0.8.12</plugin.jacoco.version>
121-
<plugin.site.version>3.20.0</plugin.site.version>
121+
<plugin.site.version>3.21.0</plugin.site.version>
122122
<plugin.scala.version>4.9.2</plugin.scala.version>
123123

124-
<pekko.version>1.1.2</pekko.version>
124+
<pekko.version>1.1.5</pekko.version>
125125
<kotlin.version>2.1.10</kotlin.version>
126126
<junit-jupiter.version>5.11.4</junit-jupiter.version>
127127
<kotlin-coroutines.version>1.8.1</kotlin-coroutines.version>
@@ -412,12 +412,6 @@
412412
<groupId>org.sonatype.plugins</groupId>
413413
<artifactId>nexus-staging-maven-plugin</artifactId>
414414
<version>1.7.0</version>
415-
<extensions>true</extensions>
416-
<configuration>
417-
<serverId>ossrh</serverId>
418-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
419-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
420-
</configuration>
421415
</plugin>
422416

423417
<plugin>
@@ -659,7 +653,7 @@
659653
<dependency>
660654
<groupId>org.apache.commons</groupId>
661655
<artifactId>commons-csv</artifactId>
662-
<version>1.11.0</version>
656+
<version>1.14.1</version>
663657
</dependency>
664658

665659
<dependency>
@@ -707,7 +701,7 @@
707701
<dependency>
708702
<groupId>org.assertj</groupId>
709703
<artifactId>assertj-core</artifactId>
710-
<version>3.26.3</version>
704+
<version>3.27.4</version>
711705
</dependency>
712706

713707
<dependency>
@@ -781,6 +775,17 @@
781775
</execution>
782776
</executions>
783777
</plugin>
778+
<plugin>
779+
<groupId>org.sonatype.plugins</groupId>
780+
<artifactId>nexus-staging-maven-plugin</artifactId>
781+
<version>1.7.0</version>
782+
<extensions>true</extensions>
783+
<configuration>
784+
<serverId>ossrh</serverId>
785+
<nexusUrl>https://ossrh-staging-api.central.sonatype.com/</nexusUrl>
786+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
787+
</configuration>
788+
</plugin>
784789
</plugins>
785790
</build>
786791
</profile>

spring/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
<properties>
7575
<micrometer.version>1.15.2</micrometer.version>
76-
<spring-boot.version>3.3.5</spring-boot.version>
76+
<spring-boot.version>3.5.4</spring-boot.version>
7777
<spring.version>6.1.3</spring.version>
7878
</properties>
7979

0 commit comments

Comments
 (0)