Move requestfactory-apt to executableDependency

tbroyer · Jan 2, 2025 · 9a6d100 · 9a6d100
1 parent 4979a83
commit 9a6d100
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 18 deletions.
diff --git a/...r-requestfactory/src/main/resources/archetype-resources/__rootArtifactId__-server/pom.xml b/...r-requestfactory/src/main/resources/archetype-resources/__rootArtifactId__-server/pom.xml
@@ -18,14 +18,6 @@
       <artifactId>${rootArtifactId}-shared</artifactId>
       <version>${dollar}{project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.gwtproject.web.bindery</groupId>
-      <artifactId>requestfactory-apt</artifactId>
-      <!-- This is an annotation processor, it's only needed at compile-time -->
-      <optional>true</optional>
-      <!-- The provided scope will exclude the dependency from the webapp classpath in jetty-maven-plugin -->
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.gwtproject.web.bindery</groupId>
       <artifactId>requestfactory-server-jakarta</artifactId>
@@ -60,9 +52,21 @@
                 <argument>${dollar}{project.build.outputDirectory}</argument>
                 <argument>${package}.${module}Factory</argument>
               </arguments>
+              <includePluginDependencies>true</includePluginDependencies>
+              <executableDependency>
+                <groupId>org.gwtproject.web.bindery</groupId>
+                <artifactId>requestfactory-apt</artifactId>
+              </executableDependency>
             </configuration>
           </execution>
         </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.gwtproject.web.bindery</groupId>
+            <artifactId>requestfactory-apt</artifactId>
+            <version>${dollar}{gwt.version}</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
     <pluginManagement>

diff --git a/modular-requestfactory/src/main/resources/archetype-resources/pom.xml b/modular-requestfactory/src/main/resources/archetype-resources/pom.xml
@@ -10,14 +10,16 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+    <gwt.version>2.12.1</gwt.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
-        <version>2.12.1</version>
+        <version>${dollar}{gwt.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/...lar-requestfactory/src/test/resources/projects/basic-rf/reference/basic-rf-server/pom.xml b/...lar-requestfactory/src/test/resources/projects/basic-rf/reference/basic-rf-server/pom.xml
@@ -17,14 +17,6 @@
       <artifactId>basic-rf-shared</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.gwtproject.web.bindery</groupId>
-      <artifactId>requestfactory-apt</artifactId>
-      <!-- This is an annotation processor, it's only needed at compile-time -->
-      <optional>true</optional>
-      <!-- The provided scope will exclude the dependency from the webapp classpath in jetty-maven-plugin -->
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.gwtproject.web.bindery</groupId>
       <artifactId>requestfactory-server-jakarta</artifactId>
@@ -59,9 +51,21 @@
                 <argument>${project.build.outputDirectory}</argument>
                 <argument>it.pkg.BasicFactory</argument>
               </arguments>
+              <includePluginDependencies>true</includePluginDependencies>
+              <executableDependency>
+                <groupId>org.gwtproject.web.bindery</groupId>
+                <artifactId>requestfactory-apt</artifactId>
+              </executableDependency>
             </configuration>
           </execution>
         </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.gwtproject.web.bindery</groupId>
+            <artifactId>requestfactory-apt</artifactId>
+            <version>${gwt.version}</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
     <pluginManagement>

diff --git a/modular-requestfactory/src/test/resources/projects/basic-rf/reference/pom.xml b/modular-requestfactory/src/test/resources/projects/basic-rf/reference/pom.xml
@@ -9,14 +9,16 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+    <gwt.version>2.12.1</gwt.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
-        <version>2.12.1</version>
+        <version>${gwt.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>