ARIES-1791 - Mark BMP generate mojo as thread safe

git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1828903 13f79535-47bb-0310-9956-ffa450edef68
apache · Apr 11, 2018 · 9781e93 · 9781e93
1 parent 05c8255
commit 9781e93
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 32 deletions.
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml b/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>blueprint-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.0.1</version>
+        <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>

diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>blueprint-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.0.1</version>
+        <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -75,6 +75,7 @@
                             </pomIncludes>
                             <postBuildHookScript>verify</postBuildHookScript>
                             <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+                            <parallelThreads>4</parallelThreads>
                         </configuration>
                         <executions>
                             <execution>

diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.aries.blueprint.plugin.itest</groupId>
-    <artifactId>simple-project</artifactId>
+    <artifactId>custom-destination</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 

diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.aries.blueprint.plugin.itest</groupId>
-    <artifactId>simple-project</artifactId>
+    <artifactId>fail-on-conflict</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 

diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.aries.blueprint.plugin.itest</groupId>
-    <artifactId>simple-project</artifactId>
+    <artifactId>multiple-invocation</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 

diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.aries.blueprint.plugin.itest</groupId>
-    <artifactId>simple-project</artifactId>
+    <artifactId>pax-cdi-project</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 

diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.aries.blueprint.plugin.itest</groupId>
-    <artifactId>simple-project</artifactId>
+    <artifactId>produced-bean-by-method-name</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 

diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.aries.blueprint.plugin.itest</groupId>
-    <artifactId>simple-project</artifactId>
+    <artifactId>scanpath-restrict</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 

diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.aries.blueprint.plugin.itest</groupId>
-    <artifactId>simple-project</artifactId>
+    <artifactId>transaction-annotation</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 

diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml b/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>blueprint-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.0.1</version>
+        <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>

diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml b/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>blueprint-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.0.1</version>
+        <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>

diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml b/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml
@@ -21,10 +21,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>blueprint-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.0.1</version>
+        <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>

diff --git a/blueprint/plugin/blueprint-maven-plugin/pom.xml b/blueprint/plugin/blueprint-maven-plugin/pom.xml
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>blueprint-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.0.1</version>
+        <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>

diff --git a/.../blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java b/.../blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
@@ -50,7 +50,7 @@
  * Generates blueprint from CDI annotations
  */
 @Mojo(name = "blueprint-generate", requiresDependencyResolution = ResolutionScope.COMPILE,
-        defaultPhase = LifecyclePhase.PROCESS_CLASSES, inheritByDefault = false)
+        defaultPhase = LifecyclePhase.PROCESS_CLASSES, inheritByDefault = false, threadSafe = true)
 public class GenerateMojo extends AbstractMojo {
 
     @Parameter(defaultValue = "${project}", required = true)