include the correct a4c branch as a submodule

cloudsoft · Dec 12, 2019 · 0995ab9 · 0995ab9
1 parent a64e733
commit 0995ab9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "alien4cloud"]
+	path = alien4cloud
+	url = [email protected]:cloudsoft/alien4cloud.git
diff --git a/alien4cloud b/alien4cloud
diff --git a/brooklyn-tosca-dist/pom.xml b/brooklyn-tosca-dist/pom.xml
@@ -49,11 +49,11 @@
                                 <artifactItem>
                                     <groupId>alien4cloud</groupId>
                                     <artifactId>alien4cloud-ui</artifactId>
-                                    <version>${alien.version}</version>
+                                    <version>${alien.base.version}</version>
                                     <type>war</type>
                                     <classifier>standalone</classifier>
 
-                                    <destFileName>alien4cloud-ui-${alien.version}.war</destFileName>
+                                    <destFileName>alien4cloud-ui-${alien.base.version}.war</destFileName>
                                     <outputDirectory>${project.build.directory}/overlay/alien4cloud-standalone
                                     </outputDirectory>
                                 </artifactItem>

diff --git a/brooklyn-tosca-dist/src/main/assembly/scripts/alien4cloud-standalone/alien4cloud.sh b/brooklyn-tosca-dist/src/main/assembly/scripts/alien4cloud-standalone/alien4cloud.sh
@@ -9,8 +9,8 @@ if [ ! -x "$JAVA" ] ; then
   exit 1
 fi
 
-if [[ ! `ls alien4cloud-ui-${alien.version}.war 2> /dev/null` ]] ; then
-  if [[ ! `ls alien4cloud-standalone/alien4cloud-ui-${alien.version}.war 2> /dev/null` ]] ; then
+if [[ ! `ls alien4cloud-ui-${alien.base.version}.war 2> /dev/null` ]] ; then
+  if [[ ! `ls alien4cloud-standalone/alien4cloud-ui-${alien.base.version}.war 2> /dev/null` ]] ; then
     echo Command must be run from the directory where the WAR is installed or its parent.
     exit 4
   fi
@@ -23,5 +23,5 @@ fi
 
 #    java -jar target/dependency/jetty-runner.jar target/*.war
 $JAVA ${JAVA_OPTS} \
-    -jar alien4cloud-ui-${alien.version}.war \
+    -jar alien4cloud-ui-${alien.base.version}.war \
     "$@"
diff --git a/pom.xml b/pom.xml
@@ -17,6 +17,10 @@
     <name>Brooklyn TOSCA parent project</name>
 
     <modules>
+        <module>alien4cloud/alien4cloud-common</module>
+        <module>alien4cloud/alien4cloud-security</module>
+        <module>alien4cloud/alien4cloud-core</module>
+
         <module>a4c-brooklyn-plugin</module>
         <module>brooklyn-tosca-common</module>
         <module>brooklyn-tosca-transformer</module>
@@ -27,7 +31,8 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <alien.version>1.1.0-SM8.cloudsoft</alien.version>
+        <alien.base.version>1.1.0-SM8</alien.base.version>
+        <alien.custom.version>1.1.0-SM8.cloudsoft</alien.custom.version>
         <spring.version>4.1.4.RELEASE</spring.version>
         <mockito-core.version>2.7.12</mockito-core.version>
         <brooklyn.version>1.0.0-SNAPSHOT</brooklyn.version>  <!-- BROOKLYN_VERSION -->
@@ -119,7 +124,7 @@
             <dependency>
                 <groupId>alien4cloud</groupId>
                 <artifactId>alien4cloud-core</artifactId>
-                <version>${alien.version}</version>
+                <version>${alien.custom.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>