Merge remote-tracking branch 'origin/master'

cloudsoft · Apr 29, 2020 · c994f95 · c994f95
2 parents 02a89e1 + 94fc21a
commit c994f95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "alien4cloud"]
 	path = alien4cloud
 	url = ../alien4cloud.git
+	commit = add5ed5a
diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
         <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</brooklyn.version>  <!-- BROOKLYN_VERSION -->
+        <brooklyn.version>1.1.0-SNAPSHOT</brooklyn.version>  <!-- BROOKLYN_VERSION -->
     </properties>
 
     <scm>