Merge pull request #226 from galasa-dev/mcobbett-generated-project-builds-test-catalogs

generated project builds test catalogs

Author: techcobweb

pkg/cmd/projectCreate.go

@@ -7,6 +7,7 @@ package cmd
 
 import (
 	"log"
+	"sort"
 	"strings"
 
 	"github.com/galasa-dev/cli/pkg/embedded"
@@ -269,7 +270,7 @@ func createParentFolderContents(
 
 	if useMaven {
 		err = createParentFolderPom(fileGenerator, packageName, featureNames,
-			isOBRProjectRequired, forceOverwrite)
+			isOBRProjectRequired, forceOverwrite, isDevelopment)
 	}
 
 	if err == nil {
@@ -331,6 +332,8 @@ func separateFeatureNamesFromCommaSeparatedList(featureNamesCommaSeparated strin
 		}
 	}
 
+	sort.Strings(featureNames)
+
 	return featureNames, err
 }
 
@@ -341,6 +344,7 @@ func createParentFolderPom(
 	featureNames []string,
 	isOBRRequired bool,
 	forceOverwrite bool,
+	IsDevelopment bool,
 ) error {
 
 	type ParentPomParameters struct {
@@ -352,6 +356,7 @@ func createParentFolderPom(
 		IsOBRRequired    bool
 		ObrName          string
 		ChildModuleNames []string
+		IsDevelopment    bool
 	}
 
 	galasaVersion, err := embedded.GetGalasaVersion()
@@ -363,6 +368,7 @@ func createParentFolderPom(
 			IsOBRRequired:    isOBRRequired,
 			ObrName:          packageName + ".obr",
 			ChildModuleNames: make([]string, len(featureNames)),
+			IsDevelopment:    IsDevelopment,
 		}
 		// Populate the child module names
 		for index, featureName := range featureNames {

pkg/cmd/projectCreate_test.go

@@ -826,3 +826,22 @@ func TestProjectCreateAllFlagsReturnsNoOk(t *testing.T) {
 	assert.Equal(t, cmd.Values().(*ProjectCreateCmdValues).useMaven, true)
 	assert.Equal(t, cmd.Values().(*ProjectCreateCmdValues).useGradle, true)
 }
+
+func TestSeparateFeatureNamesSortsTheResults(t *testing.T) {
+
+	features1, err := separateFeatureNamesFromCommaSeparatedList("payee,account")
+	assert.Nil(t, err)
+	assert.NotNil(t, features1)
+	assert.Equal(t, 2, len(features1))
+	assert.Equal(t, features1[0], "account")
+	assert.Equal(t, features1[1], "payee")
+
+	// When we do the same thing in a different order...
+	features2, err2 := separateFeatureNamesFromCommaSeparatedList("account,payee")
+	// We should get the same results.
+	assert.Nil(t, err2)
+	assert.NotNil(t, features2)
+	assert.Equal(t, 2, len(features2))
+	assert.Equal(t, features2[0], "account")
+	assert.Equal(t, features2[1], "payee")
+}

pkg/embedded/templates/projectCreate/parent-project/deploy.sh.template

@@ -16,4 +16,7 @@
 
 # Ignore any built java artifacts
 **/*.class
-**/*.jar
+**/*.jar
+
+# Ignore any temporary folder locally
+temp/

pkg/embedded/templates/projectCreate/parent-project/git-ignore.template

@@ -2,7 +2,8 @@
 plugins {
     id 'base'
     id 'maven-publish'
-    id 'dev.galasa.obr' version '0.15.0'
+    id 'dev.galasa.obr' version '0.33.0'
+    id 'dev.galasa.testcatalog' version '0.33.0'
 }
 
 // Set the variables which will control what the built OSGi bundle will be called
@@ -30,4 +31,14 @@ publishing {
             artifact obrFile
         }
     }
+}
+
+// If we are deploying a test catalog using the galasa plugin,
+// directly to the ecosystem, then we can get the properties
+// we need from the system properties, passed on the command line using
+// -DGALASA_STREAM=xxx -DGALASA_BOOTSTRAP=xxx -DGALASA_TOKEN=xxx
+deployTestCatalog {
+    bootstrap = System.getProperty("GALASA_BOOTSTRAP")
+    stream = System.getProperty("GALASA_STREAM")
+    token = System.getProperty("GALASA_TOKEN");
 }

pkg/embedded/templates/projectCreate/parent-project/obr-project/build.gradle.template

@@ -13,6 +13,7 @@
 		IsOBRRequired    bool
 		ObrName          string
 		ChildModuleNames []string
+		IsDevelopment    bool 
 	}
 */}}
 	<groupId>{{.Coordinates.GroupId}}</groupId>
@@ -57,6 +58,20 @@
 {{- end}}
 	</modules>
 
+    <!-- 
+	The following is used if you are publishing built artifacts into github's maven repository.
+	Set it to something different if you are publishing to a different maven repository.
+
+	GITHUB_REPOSITORY is expected to hold a value of something like {github-org}/{repo-name}
+	-->
+	<distributionManagement>
+		<repository>
+			<id>github</id>
+			<name>GitHub Packages</name>
+			<url>https://maven.pkg.github.com/${GITHUB_REPOSITORY}</url>
+		</repository>
+  	</distributionManagement>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -97,7 +112,7 @@
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>4.1.0</version>
+					<version>5.1.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -107,7 +122,7 @@
 				<plugin>
 					<groupId>dev.galasa</groupId>
 					<artifactId>galasa-maven-plugin</artifactId>
-					<version>0.29.0</version>
+					<version>0.33.0</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -127,7 +142,7 @@
 						<id>build-testcatalog</id>
 						<phase>package</phase>
 						<goals>
-						<goal>bundletestcat</goal>
+							<goal>bundletestcat</goal>
 						</goals>
 					</execution>
 
@@ -146,4 +161,48 @@
 		</plugins>
 	</build>
 
+	<repositories>
+		<repository>
+			<id>maven.central</id>
+			<url>https://repo.maven.apache.org/maven2/</url>
+		</repository>
+{{if .IsDevelopment}}
+		<!-- To use the bleeding edge version of galasa, use the development obr -->
+		<repository>
+			<id>galasa.repo</id>
+			<url>https://development.galasa.dev/main/maven-repo/obr</url> 
+		</repository>
+{{- else }}
+		<!-- To use the bleeding edge version of galasa, use the development obr -->
+		<!--
+		<repository>
+			<id>galasa.repo</id>
+			<url>https://development.galasa.dev/main/maven-repo/obr</url> 
+		</repository>
+		-->
+{{- end }}
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>maven.central</id>
+			<url>https://repo.maven.apache.org/maven2/</url>
+		</pluginRepository>
+{{if .IsDevelopment}}
+		<!-- To use the bleeding edge version of galasa, use the development obr -->
+		<pluginRepository>
+			<id>galasa.repo</id>    
+			<url>https://development.galasa.dev/main/maven-repo/obr</url> 
+		</pluginRepository> 
+{{- else }}
+		<!-- To use the bleeding edge version of galasa, use the development obr -->
+		<!--
+		<pluginRepository>
+			<id>galasa.repo</id>    
+			<url>https://development.galasa.dev/main/maven-repo/obr</url> 
+		</pluginRepository>
+		-->
+{{- end }}
+	</pluginRepositories>
+
 </project>

pkg/embedded/templates/projectCreate/parent-project/pom.xml

@@ -1,9 +1,21 @@
+{{/*
+	This template expects the following parameters:
+
+	type ParentGradleParameters struct {
+		Coordinates GradleCoordinates
+
+		IsOBRRequired    bool
+		ObrName          string
+		ChildModuleNames []string
+		IsDevelopment    bool
+	}
+ */}}
+
 
 // Tell gradle where it should look to find the plugins and dependencies it needs to build.
 pluginManagement {
     repositories {
         mavenLocal()
-        mavenCentral()
 
         {{- if .IsDevelopment }}
         // To use the bleeding edge version of galasa's obr plugin, use the development obr
@@ -18,6 +30,7 @@ pluginManagement {
         {{- end }}
 
         gradlePluginPortal()
+        mavenCentral()
     }
 }