Build improvements (#202)

* Set "openapi-generator-maven-plugin" version to 3.0.0 * Disable maven-install-plugin in "openapi-generator-gradle-plugin" * Changes to the maven wrapper for openapi-generator-gradle-plugin * Remove deploy-file that does not work
OpenAPITools · Jun 3, 2018 · df55ab3 · df55ab3
1 parent 1e5e1d4
commit df55ab3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -8,9 +8,11 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>openapi-generator-gradle-plugin</artifactId>
+    <artifactId>openapi-generator-gradle-plugin-mvn-wrapper</artifactId>
+    <packaging>pom</packaging>
+    <name>openapi-generator-gradle-plugin (maven wrapper)</name>
+    <description>This is a maven wrapper to call gradle during installation phase</description>
 
-    <name>openapi-generator-gradle-plugin (gradle-plugin)</name>
 
     <dependencies>
         <dependency>
@@ -24,7 +26,17 @@
         <plugins>
 
             <!-- NOTE: Consider this temporary, as a way to cleanly hook into our pipeline.
-                We've discussed moving the entire project to gradle, which would avoid this fitting. -->
+                We've discussed moving the entire project to gradle https://github.com/OpenAPITools/openapi-generator/issues/200, which would avoid this fitting. -->
+            <!-- 1) disable maven install. This wrapper is not needed. (gradle will install a jar and a pom into the local maven repo) -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <!-- 2) run gradle -->
             <plugin>
                 <groupId>org.fortasoft</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
@@ -53,6 +65,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- 3) disable maven deploy. This wrapper is not needed. -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/modules/openapi-generator-maven-plugin/README.md b/modules/openapi-generator-maven-plugin/README.md
@@ -11,7 +11,7 @@ Add to your `build->plugins` section (default phase is `generate-sources` phase)
 <plugin>
     <groupId>org.openapitools</groupId>
     <artifactId>openapi-generator-maven-plugin</artifactId>
-    <version>2.3.1</version>
+    <version>3.0.0</version>
     <executions>
         <execution>
             <goals>