Fix quarkusio#3321 create-extension Maven mojo should allow creating …

…from scratch
ppalaga · Aug 5, 2019 · c508b44 · c508b44
1 parent 5120227
commit c508b44
Show file tree

Hide file tree

Showing 16 changed files with 373 additions and 109 deletions.
diff --git a/devtools/maven/pom.xml b/devtools/maven/pom.xml
@@ -164,16 +164,12 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
                 <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/templates</directory>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
+            </testResource>
+        </testResources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
@@ -254,6 +250,14 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <escapeString>@@</escapeString>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java
diff --git a/devtools/maven/src/main/resources/create-extension-templates/deployment-pom.xml b/devtools/maven/src/main/resources/create-extension-templates/deployment-pom.xml
@@ -12,6 +12,20 @@
 
     <artifactId>[=artifactId]-deployment</artifactId>
 [#if nameBase?? ]    <name>[=namePrefix][=nameBase][=nameSegmentDelimiter]Deployment</name>
+[/#if]
+[#if !multipleExtensions ]
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bom-deployment</artifactId>
+                <version>[=quarkusVersion]</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 [/#if]
 
     <dependencies>
@@ -24,7 +38,7 @@
         <dependency>
             <groupId>[=groupId]</groupId>
             <artifactId>[=artifactId]</artifactId>
-[#if !assumeManaged ]            <version>[=r"$"]{project.version}</version>
+[#if !assumeManaged ]            <version>${project.version}</version>
 [/#if]
         </dependency>
     </dependencies>

diff --git a/devtools/maven/src/main/resources/create-extension-templates/parent-pom.xml b/devtools/maven/src/main/resources/create-extension-templates/parent-pom.xml
@@ -7,7 +7,8 @@
         <groupId>[=grandParentGroupId]</groupId>
         <artifactId>[=grandParentArtifactId]</artifactId>
         <version>[=grandParentVersion]</version>
-        <relativePath>[=grandParentRelativePath]</relativePath>
+[#if grandParentRelativePath?? ]        <relativePath>[=grandParentRelativePath]</relativePath>
+[/#if]
     </parent>
 [/#if]
 
@@ -20,6 +21,23 @@
 [/#if]
 
     <packaging>pom</packaging>
+[#if !multipleExtensions ]
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>[=groupId]</groupId>
+                <artifactId>[=artifactId]</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>[=groupId]</groupId>
+                <artifactId>[=artifactId]-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+[/#if]
     <modules>
         <module>deployment</module>
         <module>runtime</module>

diff --git a/devtools/maven/src/main/resources/create-extension-templates/runtime-pom.xml b/devtools/maven/src/main/resources/create-extension-templates/runtime-pom.xml
@@ -27,7 +27,7 @@
                         </goals>
                         <phase>compile</phase>
                         <configuration>
-                            <deployment>[=r"$"]{project.groupId}:[=r"$"]{project.artifactId}-deployment:[=r"$"]{project.version}
+                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
                             </deployment>
                         </configuration>
                     </execution>

diff --git a/devtools/maven/src/test/java/io/quarkus/maven/CreateExtensionMojoTest.java b/devtools/maven/src/test/java/io/quarkus/maven/CreateExtensionMojoTest.java
@@ -16,15 +16,15 @@
 
 public class CreateExtensionMojoTest {
 
-    static CreateExtensionMojo createMojo(String testProjectName) throws IllegalArgumentException,
+    static CreateExtensionMojo copyTestTree(String testProjectName, String testName) throws IllegalArgumentException,
             IllegalAccessException, IOException, NoSuchFieldException, SecurityException {
         final Path srcDir = Paths.get("src/test/resources/projects/" + testProjectName);
         /*
          * We want to run on the same project multiple times with different args so let's create a copy with a random
          * suffix
          */
         final Path copyDir = Paths
-                .get("target/test-classes/projects/" + testProjectName + "-" + ((int) (Math.random() * 1000)));
+                .get("target/test-classes/projects/" + testProjectName + "-" + testName);
         Files.walk(srcDir).forEach(source -> {
             try {
                 final Path dest = copyDir.resolve(srcDir.relativize(source));
@@ -34,8 +34,12 @@ static CreateExtensionMojo createMojo(String testProjectName) throws IllegalArgu
             }
         });
 
+        return defaultMojo(copyDir);
+    }
+
+    public static CreateExtensionMojo defaultMojo(Path basedir) {
         final CreateExtensionMojo mojo = new CreateExtensionMojo();
-        mojo.basedir = copyDir;
+        mojo.basedir = basedir;
         mojo.encoding = CreateExtensionMojo.DEFAULT_ENCODING;
         mojo.templatesUriBase = CreateExtensionMojo.DEFAULT_TEMPLATES_URI_BASE;
         mojo.quarkusVersion = CreateExtensionMojo.DEFAULT_QUARKUS_VERSION;
@@ -44,22 +48,36 @@ static CreateExtensionMojo createMojo(String testProjectName) throws IllegalArgu
         return mojo;
     }
 
+    @Test
+    void singleExtensionFromScratch() throws IOException, MojoExecutionException, MojoFailureException {
+        final Path basedir = Paths
+                .get("target/test-classes/projects/single-from-scratch");
+        Files.createDirectories(basedir);
+        final CreateExtensionMojo mojo = defaultMojo(basedir);
+        mojo.groupId = "io.quarkus.example";
+        mojo.artifactId = "single-ext";
+        mojo.execute();
+
+        assertTreesMatch(Paths.get("target/test-classes/expected/single-from-scratch"),
+                mojo.basedir);
+    }
+
     @Test
     void createExtensionUnderExistingPomMinimal() throws MojoExecutionException, MojoFailureException,
             IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException, IOException {
-        final CreateExtensionMojo mojo = createMojo("create-extension-pom");
+        final CreateExtensionMojo mojo = copyTestTree("create-extension-pom", "minimal");
         mojo.artifactId = "my-project-(minimal-extension)";
         mojo.assumeManaged = false;
         mojo.execute();
 
-        assertTreesMatch(Paths.get("src/test/resources/expected/create-extension-pom-minimal"),
+        assertTreesMatch(Paths.get("target/test-classes/expected/create-extension-pom-minimal"),
                 mojo.basedir);
     }
 
     @Test
     void createExtensionUnderExistingPomCustomGrandParent() throws MojoExecutionException, MojoFailureException,
             IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException, IOException {
-        final CreateExtensionMojo mojo = createMojo("create-extension-pom");
+        final CreateExtensionMojo mojo = copyTestTree("create-extension-pom", "grand-parent");
         mojo.artifactId = "myproject-(with-grand-parent)";
         mojo.grandParentArtifactId = "build-bom";
         mojo.grandParentRelativePath = "../../build-bom/pom.xml";
@@ -70,7 +88,7 @@ void createExtensionUnderExistingPomCustomGrandParent() throws MojoExecutionExce
         mojo.execute();
 
         assertTreesMatch(
-                Paths.get("src/test/resources/expected/create-extension-pom-with-grand-parent"),
+                Paths.get("target/test-classes/expected/create-extension-pom-with-grand-parent"),
                 mojo.basedir);
     }
 

diff --git a/...test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml b/...test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml
@@ -17,12 +17,12 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
-            <version>${quarkus.version}</version>
+            <version>@@${quarkus.version}</version>
         </dependency>
         <dependency>
             <groupId>org.acme</groupId>
             <artifactId>my-project-minimal-extension</artifactId>
-            <version>${project.version}</version>
+            <version>@@${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -36,7 +36,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>@@${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

diff --git a/...rc/test/resources/expected/create-extension-pom-minimal/minimal-extension/runtime/pom.xml b/...rc/test/resources/expected/create-extension-pom-minimal/minimal-extension/runtime/pom.xml
@@ -18,15 +18,15 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>@@${quarkus.version}</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>extension-descriptor</goal>
                         </goals>
                         <phase>compile</phase>
                         <configuration>
-                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
+                            <deployment>@@${project.groupId}:@@${project.artifactId}-deployment:@@${project.version}
                             </deployment>
                         </configuration>
                     </execution>
@@ -40,7 +40,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>@@${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

diff --git a/...rc/test/resources/expected/create-extension-pom-with-grand-parent/boms/deployment/pom.xml b/...rc/test/resources/expected/create-extension-pom-with-grand-parent/boms/deployment/pom.xml
@@ -16,7 +16,7 @@
             <dependency>
                 <groupId>org.acme</groupId>
                 <artifactId>myproject-with-grand-parent-deployment</artifactId>
-                <version>${project.version}</version>
+                <version>@@${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/...n/src/test/resources/expected/create-extension-pom-with-grand-parent/boms/runtime/pom.xml b/...n/src/test/resources/expected/create-extension-pom-with-grand-parent/boms/runtime/pom.xml
@@ -16,7 +16,7 @@
             <dependency>
                 <groupId>org.acme</groupId>
                 <artifactId>myproject-with-grand-parent</artifactId>
-                <version>${project.version}</version>
+                <version>@@${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/...rces/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml b/...rces/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml
@@ -34,7 +34,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>@@${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

diff --git a/...sources/expected/create-extension-pom-with-grand-parent/with-grand-parent/runtime/pom.xml b/...sources/expected/create-extension-pom-with-grand-parent/with-grand-parent/runtime/pom.xml
@@ -27,7 +27,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>@@${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

diff --git a/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/deployment/pom.xml b/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/deployment/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.quarkus.example</groupId>
+        <artifactId>single-ext-parent</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>single-ext-deployment</artifactId>
+    <name>Single Ext - Deployment</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bom-deployment</artifactId>
+                <version>@@${quarkus.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.example</groupId>
+            <artifactId>single-ext</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>@@${quarkus.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/...deployment/src/main/java/io/quarkus/example/single/ext/deployment/SingleExtProcessor.java b/...deployment/src/main/java/io/quarkus/example/single/ext/deployment/SingleExtProcessor.java
@@ -0,0 +1,15 @@
+package io.quarkus.example.single.ext.deployment;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+
+class SingleExtProcessor {
+
+    private static final String FEATURE = "single-ext";
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(FEATURE);
+    }
+
+}
diff --git a/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/pom.xml b/devtools/maven/src/test/resources/expected/single-from-scratch/single-ext/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-build-parent</artifactId>
+        <version>${project.version}</version>
+    </parent>
+
+    <groupId>io.quarkus.example</groupId>
+    <artifactId>single-ext-parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>Single Ext - Parent</name>
+
+    <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.quarkus.example</groupId>
+                <artifactId>single-ext</artifactId>
+                <version>@@${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus.example</groupId>
+                <artifactId>single-ext-deployment</artifactId>
+                <version>@@${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>