Migrate from GMaven to GMavenPlus

rest-assured · Nov 22, 2023 · 023c9a5 · 023c9a5
1 parent 718ad4b
commit 023c9a5
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 48 deletions.
diff --git a/json-path/pom.xml b/json-path/pom.xml
@@ -35,8 +35,8 @@
  <build>
  <plugins>
  <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
  </plugin>
  <plugin>
  <groupId>org.apache.felix</groupId>

diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <groovy.version>4.0.11</groovy.version>
  <groovy.range>[4.0,5.0)</groovy.range>
- <gmaven.version>1.5</gmaven.version>
+ <gmavenplus.version>3.0.2</gmavenplus.version>
  <hamcrest.version>2.2</hamcrest.version>
  <jackson1.version>1.9.11</jackson1.version>
  <jackson2.version>2.14.3</jackson2.version>
@@ -125,43 +125,6 @@
  <artifactId>maven-bundle-plugin</artifactId>
  <version>5.1.4</version>
  </plugin>
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>${gmaven.version}</version>
- <configuration>
- <providerSelection>2.0</providerSelection>
- <source />
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.gmaven.runtime</groupId>
- <artifactId>gmaven-runtime-2.0</artifactId>
- <version>${gmaven.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>generateTestStubs</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
  <plugin>
  <groupId>org.basepom.maven</groupId>
  <artifactId>duplicate-finder-maven-plugin</artifactId>
@@ -211,6 +174,25 @@
  </plugins>
  </pluginManagement>
  <plugins>
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>${gmavenplus.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>addSources</goal>
+ <goal>addTestSources</goal>
+ <goal>generateStubs</goal>
+ <goal>compile</goal>
+ <goal>generateTestStubs</goal>
+ <goal>compileTests</goal>
+ <goal>removeStubs</goal>
+ <goal>removeTestStubs</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-compiler-plugin</artifactId>

diff --git a/rest-assured-common/pom.xml b/rest-assured-common/pom.xml
@@ -36,8 +36,8 @@
  <build>
  <plugins>
  <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
  </plugin>
  <plugin>
  <groupId>org.apache.felix</groupId>

diff --git a/rest-assured/pom.xml b/rest-assured/pom.xml
@@ -37,8 +37,8 @@
  <build>
  <plugins>
  <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
  </plugin>
  <plugin>
  <groupId>org.apache.felix</groupId>

diff --git a/rest-assured/src/test/groovy/io/restassured/SpecificationMergerTest.groovy b/rest-assured/src/test/groovy/io/restassured/SpecificationMergerTest.groovy
@@ -92,7 +92,7 @@ class SpecificationMergerTest {
 
  SpecificationMerger.merge(merge, with)
 
- assertEquals 1, merge.filters.size
+ assertEquals 1, merge.filters.size()
  }
 
  @Test
@@ -152,7 +152,7 @@ class SpecificationMergerTest {
 
  SpecificationMerger.merge(merge, with)
 
- assertTrue merge.multiParts.size == 2
+ assertTrue merge.multiParts.size() == 2
  }
 
 

diff --git a/xml-path/pom.xml b/xml-path/pom.xml
@@ -29,8 +29,8 @@
  <build>
  <plugins>
  <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
  </plugin>
  <plugin>
  <groupId>org.apache.felix</groupId>