Merge pull request eclipse-che#44 from davidfestal/master

Include the checks / tests by default, but allow skipping them...
Katka92 · Apr 24, 2017 · 2d2814c · 2d2814c
2 parents bc4f064 + 3ed0471
commit 2d2814c
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -80,6 +80,25 @@ Howvever it can removed by adding the following option to the maven command:
 
     -DwithoutKeycloak
 
+##### Enabling / Disabling the checks and tests
+
+By default the build enables various checks (dependency validation, license check, 
+pom sorting, etc ...), and runs the units / integration tests.
+
+However this can be long in development phase, so you can disable these checks as well as
+skip tests by enabling the `fast` profile with the following option:
+
+    -Pfast
+
+##### Enabling / Disabling multi-thread builds
+
+By default the build is single-threaded, to ensure robustness and avoid *any* concurrency issue
+that might occur by one of the involved maven plugins.
+
+However, it is possible to enable multi-thread builds (1 thread per core) by enabling the
+`multiThread` profile with the following option:
+
+    -PmultiThread
 
 
 ## How to build the upstream openshift-connector branch for development purposes

diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml
@@ -23,8 +23,6 @@
         <original-project-name>assembly-ide-war</original-project-name>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    <dependencies>
-    </dependencies>
     <build>
         <plugins>
             <plugin>
@@ -353,30 +351,17 @@
                     <value>true</value>
                 </property>
             </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.che</groupId>
-                    <artifactId>assembly-ide-war</artifactId>
-                    <type>pom</type>
-                    <exclusions>
-                        <exclusion>
-                            <artifactId>che-plugin-ext-dashboard-client</artifactId>
-                            <groupId>org.eclipse.che.plugin</groupId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
             <build>
                 <plugins>
                     <plugin>
                         <artifactId>maven-resources-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>copy-src-without-dashboard</id>
+                                <phase>process-sources</phase>
                                 <goals>
                                     <goal>copy-resources</goal>
                                 </goals>
-                                <phase>process-sources</phase>
                                 <configuration>
                                     <overwrite>true</overwrite>
                                     <outputDirectory>${project.build.directory}/patched/src</outputDirectory>
@@ -394,6 +379,19 @@
                     </plugin>
                 </plugins>
             </build>
+            <dependencies>
+                <dependency>
+                    <groupId>org.eclipse.che</groupId>
+                    <artifactId>assembly-ide-war</artifactId>
+                    <type>pom</type>
+                    <exclusions>
+                        <exclusion>
+                            <artifactId>che-plugin-ext-dashboard-client</artifactId>
+                            <groupId>org.eclipse.che.plugin</groupId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
         </profile>
     </profiles>
 </project>
diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml
@@ -45,6 +45,10 @@
             <groupId>com.redhat.che</groupId>
             <artifactId>che-keycloak-plugin-server</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.redhat.che</groupId>
+            <artifactId>ls-bayesian-agent</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
@@ -58,10 +62,6 @@
             <groupId>org.eclipse.che</groupId>
             <artifactId>go-agents</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.redhat.che</groupId>
-            <artifactId>ls-bayesian-agent</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che</groupId>
             <artifactId>ls-csharp-agent</artifactId>

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -160,10 +160,10 @@
                     <executions>
                         <execution>
                             <id>patch-sources</id>
+                            <phase>process-resources</phase>
                             <goals>
                                 <goal>apply</goal>
                             </goals>
-                            <phase>process-resources</phase>
                         </execution>
                     </executions>
                     <configuration>

diff --git a/invoker/base-che/install.properties b/invoker/base-che/install.properties
@@ -1,3 +1,2 @@
-invoker.mavenOpts = -Dskip-enforce=true -Dskip-validate-sources=true -DskipTests=true -Dfindbugs.skip=true -Dgwt.compiler.localWorkers=2 -Dskip-validate-sources=true -Dmdep.analyze.skip=true
-invoker.goals = -T 1C install
-#invoker.goals = install
+invoker.mavenOpts = -Dgwt.compiler.localWorkers=2
+invoker.goals = ${multiThread} install
diff --git a/invoker/rh-changes/install.properties b/invoker/rh-changes/install.properties
@@ -1,3 +1,3 @@
-invoker.mavenOpts = -Dskip-enforce=true -DskipTests=true -Dfindbugs.skip=true -Dgwt.compiler.localWorkers=2 -Dskip-validate-sources=true -Dmdep.analyze.skip=true -Dlicense.skip=true
-invoker.goals = -T 1C install
+invoker.mavenOpts = -Dgwt.compiler.localWorkers=2 -Dlicense.skip=true
+invoker.goals = ${multiThread} install
 #invoker.goals = install
diff --git a/invoker/rh-changes/pom.xml b/invoker/rh-changes/pom.xml
@@ -23,34 +23,40 @@
         <module>../../assembly</module>
     </modules>
     <properties>
-        <rh.che.plugins.version>1.0.0-SNAPSHOT</rh.che.plugins.version>
         <keycloak.version>2.5.0.Final</keycloak.version>
+        <rh.che.plugins.version>1.0.0-SNAPSHOT</rh.che.plugins.version>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>com.redhat.che</groupId>
-                <artifactId>fabric8-ide-assembly-ide-war</artifactId>
-                <version>${redhat.che.version}</version>
-                <type>war</type>
+                <artifactId>che-keycloak-plugin-ide</artifactId>
+                <version>${rh.che.plugins.version}</version>
+                <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>com.redhat.che</groupId>
-                <artifactId>fabric8-ide-assembly-wsagent-server</artifactId>
-                <version>${redhat.che.version}</version>
-                <type>tar.gz</type>
+                <artifactId>che-keycloak-plugin-server</artifactId>
+                <version>${rh.che.plugins.version}</version>
+                <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>com.redhat.che</groupId>
                 <artifactId>che-plugin-bayesian-lang-server</artifactId>
                 <version>${rh.che.plugins.version}</version>
                 <type>jar</type>
             </dependency>
-           <dependency>
+            <dependency>
                 <groupId>com.redhat.che</groupId>
-                <artifactId>ls-bayesian-agent</artifactId>
-                <version>${rh.che.plugins.version}</version>
-                <type>jar</type>
+                <artifactId>fabric8-ide-assembly-ide-war</artifactId>
+                <version>${redhat.che.version}</version>
+                <type>war</type>
+            </dependency>
+            <dependency>
+                <groupId>com.redhat.che</groupId>
+                <artifactId>fabric8-ide-assembly-wsagent-server</artifactId>
+                <version>${redhat.che.version}</version>
+                <type>tar.gz</type>
             </dependency>
             <dependency>
                 <groupId>com.redhat.che</groupId>
@@ -76,15 +82,9 @@
                 <version>${redhat.che.version}</version>
                 <type>war</type>
             </dependency>
-            <dependency>
-                <groupId>com.redhat.che</groupId>
-                <artifactId>che-keycloak-plugin-ide</artifactId>
-                <version>${rh.che.plugins.version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
+           <dependency>
                 <groupId>com.redhat.che</groupId>
-                <artifactId>che-keycloak-plugin-server</artifactId>
+                <artifactId>ls-bayesian-agent</artifactId>
                 <version>${rh.che.plugins.version}</version>
                 <type>jar</type>
             </dependency>

diff --git a/pom.xml b/pom.xml
@@ -25,6 +25,7 @@
         <che.version>5.6.0-openshift-connector-SNAPSHOT</che.version>
         <redhat.che.without-dashboard.suffix>without-dashboard</redhat.che.without-dashboard.suffix>
         <redhat.che.version.suffix>fabric8</redhat.che.version.suffix>
+        <multiThread></multiThread>
     </properties>
     <build>
         <plugins>
@@ -241,13 +242,20 @@
                         <withoutKeycloak>${withoutKeycloak}</withoutKeycloak>
                         <redhat.che.version>${redhat.che.version}</redhat.che.version>
                         <che.version>${che.version}</che.version>
+                        <multiThread>${multiThread}</multiThread>
                     </filterProperties>
                     <properties>
                         <baseCheRepository>${baseCheRepository}</baseCheRepository>
                         <withoutDashboard>${withoutDashboard}</withoutDashboard>
                         <withoutKeycloak>${withoutKeycloak}</withoutKeycloak>
                         <redhat.che.version>${redhat.che.version}</redhat.che.version>
                         <che.version>${che.version}</che.version>
+                        <skip-enforce>${skip-enforce}</skip-enforce>
+                        <skipTests>${skipTests}</skipTests>
+                        <findbugs.skip>${findbugs.skip}</findbugs.skip>
+                        <skip-validate-sources>${skip-validate-sources}</skip-validate-sources>
+                        <mdep.analyze.skip>${mdep.analyze.skip}</mdep.analyze.skip>
+                        <license.skip>${license.skip}</license.skip>
                     </properties>
                     <debug>false</debug>
                 </configuration>
@@ -487,5 +495,21 @@
                 <redhat-version-qualifier>${redhat.che.version.suffix}</redhat-version-qualifier>
             </properties>
         </profile>
+        <profile>
+            <id>fast</id>
+            <properties>
+                <skipTests>true</skipTests>
+                <findbugs.skip>true</findbugs.skip>
+                <skip-validate-sources>true</skip-validate-sources>
+                <mdep.analyze.skip>true</mdep.analyze.skip>
+                <license.skip>true</license.skip>
+            </properties>
+        </profile>
+        <profile>
+            <id>multiThread</id>
+            <properties>
+                <multiThread>-T 1C</multiThread>
+            </properties>
+        </profile>
     </profiles>
 </project>