HAWKULAR-871 - Removed distribution

hawkular · Dec 16, 2015 · ee5c076 · ee5c076
1 parent b1a22f2
commit ee5c076
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 261 deletions.
diff --git a/dist/assembly.xml b/dist/assembly.xml
diff --git a/dist/pom.xml b/dist/pom.xml
diff --git a/dist/src/distribution/resources/bin/product.conf b/dist/src/distribution/resources/bin/product.conf
diff --git a/...odules/system/layers/base/org/jboss/as/product/hawkular-accounts/dir/META-INF/MANIFEST.MF b/...odules/system/layers/base/org/jboss/as/product/hawkular-accounts/dir/META-INF/MANIFEST.MF
diff --git a/...on/resources/modules/system/layers/base/org/jboss/as/product/hawkular-accounts/module.xml b/...on/resources/modules/system/layers/base/org/jboss/as/product/hawkular-accounts/module.xml
diff --git a/integration-tests/all-others/pom.xml b/integration-tests/all-others/pom.xml
@@ -35,11 +35,6 @@
   </description>
 
   <dependencies>
-    <dependency>
-      <groupId>org.hawkular.accounts</groupId>
-      <artifactId>hawkular-accounts-distribution</artifactId>
-      <type>zip</type>
-    </dependency>
   </dependencies>
 </project>
 
diff --git a/integration-tests/important/pom.xml b/integration-tests/important/pom.xml
@@ -35,11 +35,6 @@
   </description>
 
   <dependencies>
-    <dependency>
-      <groupId>org.hawkular.accounts</groupId>
-      <artifactId>hawkular-accounts-distribution</artifactId>
-      <type>zip</type>
-    </dependency>
   </dependencies>
 </project>
 
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -44,9 +44,23 @@
     <dependencies>
       <dependency>
         <groupId>org.hawkular.accounts</groupId>
-        <artifactId>hawkular-accounts-distribution</artifactId>
+        <artifactId>hawkular-accounts-feature-pack</artifactId>
+        <version>2.0.8.Final-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.hawkular.accounts</groupId>
+        <artifactId>hawkular-accounts-feature-pack</artifactId>
         <version>2.0.8.Final-SNAPSHOT</version>
         <type>zip</type>
+        <exclusions>
+          <exclusion>
+            <groupId>*</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
@@ -82,21 +96,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <!-- Fork every test because it will launch a separate AS instance -->
-          <!--<forkMode>always</forkMode>-->
-          <systemPropertyVariables>
-            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-            <!-- the maven dependency plugin will have already downloaded the server on /target -->
-            <jboss.home>${project.basedir}/target/hawkular-accounts-distribution-${project.version}/</jboss.home>
-          </systemPropertyVariables>
-          <redirectTestOutputToFile>false</redirectTestOutputToFile>
-        </configuration>
-      </plugin>
-
       <!-- We want to clean the environment for the tests all the time we run -->
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>

diff --git a/integration-tests/smoke/pom.xml b/integration-tests/smoke/pom.xml
@@ -75,25 +75,17 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
+        <groupId>org.wildfly.build</groupId>
+        <artifactId>wildfly-server-provisioning-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>unpack</id>
-            <phase>generate-test-resources</phase>
+            <id>server-provisioning</id>
             <goals>
-              <goal>unpack</goal>
+              <goal>build</goal>
             </goals>
+            <phase>compile</phase>
             <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.hawkular.accounts</groupId>
-                  <artifactId>hawkular-accounts-distribution</artifactId>
-                  <type>zip</type>
-                  <overWrite>false</overWrite>
-                  <outputDirectory>target/hawkular-accounts-distribution-${project.version}</outputDirectory>
-                </artifactItem>
-              </artifactItems>
+              <config-file>server-provisioning.xml</config-file>
             </configuration>
           </execution>
         </executions>
@@ -112,19 +104,31 @@
             <configuration>
               <transformationSets>
                 <transformationSet>
-                  <dir>${project.basedir}/target/hawkular-accounts-distribution-${project.version}/standalone/configuration</dir>
+                  <dir>${project.basedir}/target/hawkular-accounts-integration-tests-smoke-${project.version}/standalone/configuration</dir>
                   <stylesheet>${project.basedir}/src/test/resources/change-smtp-port.xsl</stylesheet>
                   <includes>
                     <include>standalone*.xml</include>
                   </includes>
-                  <outputDir>${project.basedir}/target/hawkular-accounts-distribution-${project.version}/standalone/configuration</outputDir>
+                  <outputDir>${project.basedir}/target/hawkular-accounts-integration-tests-smoke-${project.version}/standalone/configuration</outputDir>
                 </transformationSet>
               </transformationSets>
             </configuration>
           </execution>
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+            <jboss.home>${project.basedir}/target/hawkular-accounts-integration-tests-smoke-${project.version}/</jboss.home>
+          </systemPropertyVariables>
+          <redirectTestOutputToFile>false</redirectTestOutputToFile>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
 </project>

diff --git a/dist/server-provisioning.xml → ...ation-tests/smoke/server-provisioning.xml b/dist/server-provisioning.xml → ...ation-tests/smoke/server-provisioning.xml
diff --git a/pom.xml b/pom.xml
@@ -237,14 +237,6 @@
   </dependencyManagement>
 
   <profiles>
-    <profile>
-      <id>distribution</id>
-      <modules>
-        <module>dist</module>
-        <module>feature-pack</module>
-        <module>feature-pack-resources</module>
-      </modules>
-    </profile>
     <profile>
       <id>sample</id>
       <modules>
@@ -257,7 +249,18 @@
     <profile>
       <id>itest</id>
       <modules>
-        <module>dist</module>
+        <module>feature-pack</module>
+        <module>feature-pack-resources</module>
+        <module>integration-tests</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>release</id>
+      <modules>
+        <module>sample</module>
+        <module>sample-websocket-secured</module>
+        <module>sample-websocket-backend</module>
+        <module>sample-websocket-frontend</module>
         <module>feature-pack</module>
         <module>feature-pack-resources</module>
         <module>integration-tests</module>