Merge pull request #185 from marekkopecky/mainBranchForHttpClient

Use main branch of HTTP client

Author: tadamski

multinode/pom-wildfly-client/pom.xml

@@ -38,6 +38,7 @@
         <version.plugin.maven-checkstyle-plugin>3.6.0</version.plugin.maven-checkstyle-plugin>
         <version.plugin.surefire>3.0.0</version.plugin.surefire>
         <version.wf.core>26.0.1.Final</version.wf.core>
+        <version.wf.launcher>1.0.2.Final</version.wf.launcher>
 
 
         <!-- Path to server zip archive, has to be specified at command line -->
@@ -503,6 +504,10 @@
                     <groupId>org.wildfly.core</groupId>
                     <artifactId>wildfly-launcher</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.wildfly.launcher</groupId>
+                    <artifactId>wildfly-launcher</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -512,9 +517,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.wildfly.core</groupId>
+            <groupId>org.wildfly.launcher</groupId>
             <artifactId>wildfly-launcher</artifactId>
-            <version>${version.wf.core}</version>
+            <version>${version.wf.launcher}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

multinode/pom.xml

@@ -249,6 +249,10 @@
                     <groupId>org.wildfly.core</groupId>
                     <artifactId>wildfly-launcher</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.wildfly.launcher</groupId>
+                    <artifactId>wildfly-launcher</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -257,7 +261,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.wildfly.core</groupId>
+            <groupId>org.wildfly.launcher</groupId>
             <artifactId>wildfly-launcher</artifactId>
             <scope>test</scope>
         </dependency>

pom.xml

@@ -85,7 +85,8 @@
          and be sure that wf-core-launcher version works correctly with new arquillian-container -->
         <version.arquillian-container>5.1.0.Final</version.arquillian-container>
         <!-- the following version needs to be >= than version used in arquillian-container dependency -->
-        <version.wf.core>25.0.2.Final</version.wf.core>
+        <version.wf.core>28.0.1.Final</version.wf.core>
+        <version.wf.launcher>1.0.2.Final</version.wf.launcher>
 
         <!-- MULTINODE -->
         <version.creaper>2.0.3</version.creaper>
@@ -285,9 +286,9 @@
                 <version>${version.arquillian-container}</version>
             </dependency>
             <dependency>
-                <groupId>org.wildfly.core</groupId>
+                <groupId>org.wildfly.launcher</groupId>
                 <artifactId>wildfly-launcher</artifactId>
-                <version>${version.wf.core}</version>
+                <version>${version.wf.launcher}</version>
             </dependency>
             <dependency>
                 <groupId>org.wildfly.extras.creaper</groupId>

snapshots/src/main/script/createSnapshots.groovy

@@ -43,7 +43,7 @@ setProjectVersion(TESTSUITE_VERSION, ejbClientDir)
 buildProject(ejbClientDir)
 
 def httpClientDir = new File(TARGET_DIR, HTTP_CLIENT_NAME)
-cloneProject(HTTP_CLIENT_REPOSITORY_PROPERTY, HTTP_CLIENT_BRANCH_PROPERTY, HTTP_CLIENT_REPOSITORY, HTTP_CLIENT_NAME, "2.0")
+cloneProject(HTTP_CLIENT_REPOSITORY_PROPERTY, HTTP_CLIENT_BRANCH_PROPERTY, HTTP_CLIENT_REPOSITORY, HTTP_CLIENT_NAME)
 setProjectVersion(TESTSUITE_VERSION, httpClientDir)
 buildProject(httpClientDir)