Skip to content

Commit 469527b

Browse files
Ritesh GhodraoRitesh Ghodrao
authored andcommitted
conflicts
1 parent 739362b commit 469527b

3 files changed

Lines changed: 9 additions & 120 deletions

File tree

extra/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<!-- Maven plugin versions -->
2626
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
27-
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
27+
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
2828
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
2929
<maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
3030
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
@@ -60,7 +60,7 @@
6060

6161
<!-- Project test dependency versions -->
6262
<wiremock.version>3.12.1</wiremock.version>
63-
<spock.version>2.4-M5-groovy-4.0</spock.version>
63+
<spock.version>2.4-M6-groovy-4.0</spock.version>
6464
<!--TODO: replace with WireMock -->
6565
<mockserver.version>5.15.0</mockserver.version>
6666

pom.xml

Lines changed: 7 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@
2222
<dockerfileName>Dockerfile</dockerfileName>
2323

2424
<!-- plugin versions -->
25-
<checkstyle-plugin.version>3.4.0</checkstyle-plugin.version>
26-
<checkstyle.version>10.17.0</checkstyle.version>
27-
<download-plugin.version>1.9.0</download-plugin.version>
28-
<git-commmit-plugin.version>4.9.10</git-commmit-plugin.version>
25+
<download-plugin.version>2.0.0</download-plugin.version>
26+
<git-commit-id-plugin.version>9.0.1</git-commit-id-plugin.version>
2927

30-
<gmavenplus-plugin.version>3.0.2</gmavenplus-plugin.version>
28+
<gmavenplus-plugin.version>4.2.1</gmavenplus-plugin.version>
3129
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
3230
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
3331
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
@@ -65,7 +63,6 @@
6563
<dependency>
6664
<groupId>io.vertx</groupId>
6765
<artifactId>vertx-mysql-client</artifactId>
68-
<version>4.5.9</version>
6966
</dependency>
7067
<dependency>
7168
<groupId>io.vertx</groupId>
@@ -236,11 +233,6 @@
236233
<groupId>io.github.jamsesso</groupId>
237234
<artifactId>json-logic-java</artifactId>
238235
</dependency>
239-
<dependency>
240-
<groupId>org.apache.velocity</groupId>
241-
<artifactId>velocity-engine-core</artifactId>
242-
<version>2.3</version>
243-
</dependency>
244236
<!-- Test -->
245237
<dependency>
246238
<groupId>org.junit.jupiter</groupId>
@@ -409,28 +401,6 @@
409401
</execution>
410402
</executions>
411403
</plugin>
412-
<plugin>
413-
<groupId>org.apache.maven.plugins</groupId>
414-
<artifactId>maven-checkstyle-plugin</artifactId>
415-
<version>${checkstyle-plugin.version}</version>
416-
<configuration>
417-
<!-- Project rooted path to CheckStyle configuration file. -->
418-
<configLocation>checkstyle.xml</configLocation>
419-
<encoding>UTF-8</encoding>
420-
<consoleOutput>true</consoleOutput>
421-
<!-- true if project build should fails on any style violation. -->
422-
<failsOnError>true</failsOnError>
423-
<linkXRef>false</linkXRef>
424-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
425-
</configuration>
426-
<dependencies>
427-
<dependency>
428-
<groupId>com.puppycrawl.tools</groupId>
429-
<artifactId>checkstyle</artifactId>
430-
<version>${checkstyle.version}</version>
431-
</dependency>
432-
</dependencies>
433-
</plugin>
434404
<plugin>
435405
<groupId>org.codehaus.gmavenplus</groupId>
436406
<artifactId>gmavenplus-plugin</artifactId>
@@ -466,18 +436,6 @@
466436
</execution>
467437
</executions>
468438
</plugin>
469-
<plugin>
470-
<groupId>org.apache.maven.plugins</groupId>
471-
<artifactId>maven-checkstyle-plugin</artifactId>
472-
<executions>
473-
<execution>
474-
<phase>validate</phase>
475-
<goals>
476-
<goal>checkstyle</goal>
477-
</goals>
478-
</execution>
479-
</executions>
480-
</plugin>
481439
<plugin>
482440
<groupId>org.xolstice.maven.plugins</groupId>
483441
<artifactId>protobuf-maven-plugin</artifactId>
@@ -503,7 +461,7 @@
503461
</configuration>
504462
</plugin>
505463
<plugin>
506-
<groupId>com.googlecode.maven-download-plugin</groupId>
464+
<groupId>io.github.download-maven-plugin</groupId>
507465
<artifactId>download-maven-plugin</artifactId>
508466
<version>${download-plugin.version}</version>
509467
<executions>
@@ -566,9 +524,9 @@
566524
</configuration>
567525
</plugin>
568526
<plugin>
569-
<groupId>pl.project13.maven</groupId>
570-
<artifactId>git-commit-id-plugin</artifactId>
571-
<version>${git-commmit-plugin.version}</version>
527+
<groupId>io.github.git-commit-id</groupId>
528+
<artifactId>git-commit-id-maven-plugin</artifactId>
529+
<version>${git-commit-id-plugin.version}</version>
572530
<executions>
573531
<execution>
574532
<id>get-the-git-infos</id>
@@ -701,35 +659,6 @@
701659
</plugins>
702660
</build>
703661

704-
<repositories>
705-
<repository>
706-
<id>central</id>
707-
<url>https://repo.maven.apache.org/maven2</url>
708-
<releases>
709-
<enabled>true</enabled>
710-
</releases>
711-
<snapshots>
712-
<enabled>false</enabled>
713-
</snapshots>
714-
</repository>
715-
</repositories>
716-
717-
<reporting>
718-
<plugins>
719-
<plugin>
720-
<groupId>org.apache.maven.plugins</groupId>
721-
<artifactId>maven-checkstyle-plugin</artifactId>
722-
<reportSets>
723-
<reportSet>
724-
<reports>
725-
<report>checkstyle</report>
726-
</reports>
727-
</reportSet>
728-
</reportSets>
729-
</plugin>
730-
</plugins>
731-
</reporting>
732-
733662
<profiles>
734663
<profile>
735664
<!-- Run only one application container instance on fixed ports for debugging purposes -->

src/test/java/org/prebid/server/it/ShowheroesBSTest.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)