Remove unneeded IT properties

ascopes · Feb 25, 2024 · f88921e · f88921e
1 parent 2f5f2ed
commit f88921e
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 48 deletions.
diff --git a/src/it/grpc-plugin/pom.xml b/src/it/grpc-plugin/pom.xml
@@ -94,9 +94,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <binaryMavenPlugins>

diff --git a/src/it/http-url-grpc-plugin/pom.xml b/src/it/http-url-grpc-plugin/pom.xml
@@ -94,9 +94,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <binaryUrlPlugins>

diff --git a/src/it/http-url-protoc/pom.xml b/src/it/http-url-protoc/pom.xml
@@ -66,9 +66,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <protocVersion>https://repo1.maven.org/maven2/com/google/protobuf/protoc/${protobuf.version}/protoc-${protobuf.version}-linux-x86_64.exe</protocVersion>

diff --git a/src/it/invoker.properties b/src/it/invoker.properties
@@ -1,7 +1,4 @@
 invoker.mavenOpts = \
-  -Dplugin-group-id=${project.groupId} \
-  -Dplugin-artifact-id=${project.artifactId} \
-  -Dplugin-version=${project.version} \
   -Dmaven.compiler.release=11 \
   -Dmaven.compiler.source=11 \
   -Dmaven.compiler.target=11 \

diff --git a/src/it/java-main-empty/pom.xml b/src/it/java-main-empty/pom.xml
@@ -33,9 +33,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <protocVersion>${protobuf.version}</protocVersion>

diff --git a/src/it/java-main-lite/pom.xml b/src/it/java-main-lite/pom.xml
@@ -66,9 +66,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <liteOnly>true</liteOnly>

diff --git a/src/it/java-main/pom.xml b/src/it/java-main/pom.xml
@@ -66,9 +66,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <protocVersion>${protobuf.version}</protocVersion>

diff --git a/src/it/java-test-empty/pom.xml b/src/it/java-test-empty/pom.xml
@@ -34,9 +34,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <protocVersion>${protobuf.version}</protocVersion>

diff --git a/src/it/java-test-lite/pom.xml b/src/it/java-test-lite/pom.xml
@@ -66,9 +66,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <liteOnly>true</liteOnly>

diff --git a/src/it/java-test/pom.xml b/src/it/java-test/pom.xml
@@ -66,9 +66,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <protocVersion>${protobuf.version}</protocVersion>

diff --git a/src/it/kotlin-main/pom.xml b/src/it/kotlin-main/pom.xml
@@ -90,9 +90,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <kotlinEnabled>true</kotlinEnabled>

diff --git a/src/it/kotlin-test/pom.xml b/src/it/kotlin-test/pom.xml
@@ -83,9 +83,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <kotlinEnabled>true</kotlinEnabled>

diff --git a/src/it/maven-dependency-protopath/pom.xml b/src/it/maven-dependency-protopath/pom.xml
@@ -74,9 +74,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <protocVersion>${protobuf.version}</protocVersion>

diff --git a/src/it/path-protoc/pom.xml b/src/it/path-protoc/pom.xml
@@ -66,9 +66,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <protocVersion>PATH</protocVersion>

diff --git a/src/it/reactor-grpc-binary-plugin/pom.xml b/src/it/reactor-grpc-binary-plugin/pom.xml
@@ -106,9 +106,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <binaryMavenPlugins>

diff --git a/src/it/reactor-grpc-jvm-plugin/pom.xml b/src/it/reactor-grpc-jvm-plugin/pom.xml
@@ -106,9 +106,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${plugin-group-id}</groupId>
-        <artifactId>${plugin-artifact-id}</artifactId>
-        <version>${plugin-version}</version>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
 
         <configuration>
           <binaryMavenPlugins>