Skip to content

Commit f3834c8

Browse files
spaltisspaltis
committed
HERESUP-35862: Dependency convergence update in here-aaa-java-sdk and Dependabot updates
Signed-off-by: Stanislav Paltis <stanislav.paltis@here.com>
1 parent 1424051 commit f3834c8

3 files changed

Lines changed: 49 additions & 3 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ updates:
1616
- "owenkellett"
1717
- "spaltis"
1818
- "ashishKhushiKumar"
19-
- "anishb266"

‎here-oauth-client/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,28 @@
7575
<groupId>org.apache.maven.plugins</groupId>
7676
<artifactId>maven-failsafe-plugin</artifactId>
7777
</plugin>
78+
<plugin>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-enforcer-plugin</artifactId>
81+
<version>3.6.1</version>
82+
<executions>
83+
<execution>
84+
<id>enforce-dependency-convergence</id>
85+
<configuration>
86+
<rules>
87+
<dependencyConvergence/>
88+
<requireUpperBoundDeps>
89+
<uniqueVersions>true</uniqueVersions>
90+
</requireUpperBoundDeps>
91+
</rules>
92+
<fail>true</fail>
93+
</configuration>
94+
<goals>
95+
<goal>enforce</goal>
96+
</goals>
97+
</execution>
98+
</executions>
99+
</plugin>
78100
</plugins>
79101
</build>
80102

‎pom.xml‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,18 +294,23 @@
294294
<version>3.6.1</version>
295295
<executions>
296296
<execution>
297-
<id>enforce</id>
297+
<id>enforce-dependency-convergence</id>
298298
<configuration>
299299
<rules>
300300
<dependencyConvergence/>
301+
<requireUpperBoundDeps>
302+
<uniqueVersions>true</uniqueVersions>
303+
</requireUpperBoundDeps>
301304
</rules>
305+
<fail>true</fail>
302306
</configuration>
303307
<goals>
304308
<goal>enforce</goal>
305309
</goals>
306310
</execution>
307311
</executions>
308312
</plugin>
313+
309314
<plugin>
310315
<groupId>org.apache.maven.plugins</groupId>
311316
<artifactId>maven-resources-plugin</artifactId>
@@ -349,7 +354,6 @@
349354
</executions>
350355
</plugin>
351356

352-
353357
<plugin>
354358
<groupId>org.jacoco</groupId>
355359
<artifactId>jacoco-maven-plugin</artifactId>
@@ -430,6 +434,27 @@
430434
</execution>
431435
</executions>
432436
</plugin>
437+
<plugin>
438+
<groupId>org.apache.maven.plugins</groupId>
439+
<artifactId>maven-enforcer-plugin</artifactId>
440+
<version>3.6.1</version>
441+
<executions>
442+
<execution>
443+
<id>enforce-dependency-convergence</id>
444+
<configuration>
445+
<rules>
446+
<dependencyConvergence/>
447+
<requireUpperBoundDeps/>
448+
</rules>
449+
<fail>true</fail>
450+
</configuration>
451+
<goals>
452+
<goal>enforce</goal>
453+
</goals>
454+
</execution>
455+
</executions>
456+
</plugin>
457+
433458
</plugins>
434459
</pluginManagement>
435460
</build>

0 commit comments

Comments
 (0)