BZ-1025416: Unify BPMS and BRMS modules distributions in a single build.

kiegroup · Nov 3, 2013 · f3f1631 · f3f1631
1 parent 163152e
commit f3f1631
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/kie-eap-integration/kie-eap-integration-core/pom.xml b/kie-eap-integration/kie-eap-integration-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-eap-integration</artifactId>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.kie</groupId>

diff --git a/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-bpms/pom.xml b/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-bpms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-eap-integration-distributions</artifactId>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.kie</groupId>

diff --git a/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-brms/pom.xml b/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-brms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-eap-integration-distributions</artifactId>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.kie</groupId>

diff --git a/kie-eap-integration/kie-eap-integration-distributions/pom.xml b/kie-eap-integration/kie-eap-integration-distributions/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-eap-integration</artifactId>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.kie</groupId>
@@ -48,7 +48,7 @@
     <eap-modules.eap-configuration.path>${eap-modules.core.output.path}/eap-modules/eap-configurations/eap-6.1.1/eap-6.1.1-modules-config.properties</eap-modules.eap-configuration.path>
 
     <!-- Assemby final name for artifacts. -->
-    <eap-modules.assembly.name>eap-modules-distrbutions-${project.version}</eap-modules.assembly.name>
+    <eap-modules.assembly.name>eap-modules-distributions-${project.version}</eap-modules.assembly.name>
   </properties>
 
   <build>

diff --git a/kie-eap-integration/pom.xml b/kie-eap-integration/pom.xml
@@ -1,20 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<<<<<<< HEAD
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-      <groupId>org.kie</groupId>
-      <artifactId>kie-parent-with-dependencies</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
-    </parent>
-
-=======
   <modelVersion>4.0.0</modelVersion>
   <parent>
->>>>>>> b1ba180... BZ-1025416: Unify BPMS and BRMS modules distributions in a single build.
     <groupId>org.kie</groupId>
-    <artifactId>kie-wb-distributions</artifactId>
-    <version>6.1.0-SNAPSHOT</version>
+    <artifactId>kie-parent-with-dependencies</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.kie</groupId>