reorder profiles in pom (no changes)
(backport cherry-pick from master)

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/27b8a410
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/27b8a410
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/27b8a410

Branch: refs/heads/0.4.0
Commit: 27b8a410a2e0fc7f1d3e1ddb7ae9fb51d7af3ce8
Parents: bbce102
Author: Alex Heneveld <[email protected]>
Authored: Wed Jan 9 21:58:07 2013 +0000
Committer: Alex Heneveld <[email protected]>
Committed: Mon Jan 14 16:50:53 2013 +0000

----------------------------------------------------------------------
 pom.xml | 114 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 56 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/27b8a410/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 46c3fba..a290a8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -740,70 +740,46 @@
                 </plugins>
             </build>
         </profile>
-
         <profile>
-            <id>CI</id>
+            <id>Integration</id>
+            <properties>
+                <includedTestGroups>Integration</includedTestGroups>
+                <excludedTestGroups>Live,WIP</excludedTestGroups>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>findbugs-maven-plugin</artifactId>
-                        <configuration>
-                            <xmlOutput>true</xmlOutput>
-                            
<xmlOutputDirectory>target/site</xmlOutputDirectory>
-                        </configuration>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <inherited>true</inherited>
                         <executions>
                             <execution>
-                                <phase>process-classes</phase>
+                                <id>run-tests</id>
                                 <goals>
-                                    <goal>findbugs</goal>
+                                    <goal>run</goal>
                                 </goals>
+                                <phase>integration-test</phase>
                             </execution>
                         </executions>
                     </plugin>
                     <plugin>
-                        <artifactId>maven-source-plugin</artifactId>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-pmd-plugin</artifactId>
-                        <version>2.5</version>
-                        <inherited>true</inherited>
-                        <configuration>
-                            <failOnViolation>false</failOnViolation>
-                            <linkXref>true</linkXref>
-                            <sourceEncoding>utf-8</sourceEncoding>
-                            <minimumTokens>100</minimumTokens>
-                            <targetJdk>1.6</targetJdk>
-                            <excludes>
-                                <exclude>**/*Test.java</exclude>
-                                <exclude>**/tests/**/*.java</exclude>
-                                <!-- add any more generated source code 
directories here -->
-                            </excludes>
-                            <excludeRoots>
-                                <excludeRoot>
-                                    
${pom.basedir}/target/generated-sources/groovy-stubs/main
-                                </excludeRoot>
-                            </excludeRoots>
-                        </configuration>
+                        <artifactId>maven-jar-plugin</artifactId>
                         <executions>
                             <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>check</goal>
-                                    <goal>cpd-check</goal>
-                                </goals>
+                                <id>test-jar-creation</id>
+                                <configuration>
+                                    <skip>true</skip>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
                 </plugins>
             </build>
         </profile>
-
         <profile>
-            <id>Integration</id>
+            <id>Live</id>
             <properties>
-                <includedTestGroups>Integration</includedTestGroups>
-                <excludedTestGroups>Live,WIP</excludedTestGroups>
+                <includedTestGroups>Live</includedTestGroups>
+                <excludedTestGroups>WIP</excludedTestGroups>
             </properties>
             <build>
                 <plugins>
@@ -834,42 +810,64 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
-            <id>Live</id>
-            <properties>
-                <includedTestGroups>Live</includedTestGroups>
-                <excludedTestGroups>WIP</excludedTestGroups>
-            </properties>
+            <id>CI</id>
             <build>
                 <plugins>
                     <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <inherited>true</inherited>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>findbugs-maven-plugin</artifactId>
+                        <configuration>
+                            <xmlOutput>true</xmlOutput>
+                            
<xmlOutputDirectory>target/site</xmlOutputDirectory>
+                        </configuration>
                         <executions>
                             <execution>
-                                <id>run-tests</id>
+                                <phase>process-classes</phase>
                                 <goals>
-                                    <goal>run</goal>
+                                    <goal>findbugs</goal>
                                 </goals>
-                                <phase>integration-test</phase>
                             </execution>
                         </executions>
                     </plugin>
                     <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
+                        <artifactId>maven-source-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-pmd-plugin</artifactId>
+                        <version>2.5</version>
+                        <inherited>true</inherited>
+                        <configuration>
+                            <failOnViolation>false</failOnViolation>
+                            <linkXref>true</linkXref>
+                            <sourceEncoding>utf-8</sourceEncoding>
+                            <minimumTokens>100</minimumTokens>
+                            <targetJdk>1.6</targetJdk>
+                            <excludes>
+                                <exclude>**/*Test.java</exclude>
+                                <exclude>**/tests/**/*.java</exclude>
+                                <!-- add any more generated source code 
directories here -->
+                            </excludes>
+                            <excludeRoots>
+                                <excludeRoot>
+                                    
${pom.basedir}/target/generated-sources/groovy-stubs/main
+                                </excludeRoot>
+                            </excludeRoots>
+                        </configuration>
                         <executions>
                             <execution>
-                                <id>test-jar-creation</id>
-                                <configuration>
-                                    <skip>true</skip>
-                                </configuration>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                    <goal>cpd-check</goal>
+                                </goals>
                             </execution>
                         </executions>
                     </plugin>
                 </plugins>
             </build>
         </profile>
-
         <profile>
             <id>Coverage</id>
             <dependencies>

Reply via email to