This is an automated email from the ASF dual-hosted git repository.
wmedvedeo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new b982107b9bc kie-issues#1386: Improve pom.xml generated by
kn-workflow-plugin (#2468)
b982107b9bc is described below
commit b982107b9bc607d4c2eb519236c733eb898a0611
Author: Dmitrii Tikhomirov <[email protected]>
AuthorDate: Mon Aug 5 23:48:58 2024 -0700
kie-issues#1386: Improve pom.xml generated by kn-workflow-plugin (#2468)
---
.../e2e-tests/quarkus_build_test.go | 3 +--
.../pkg/command/quarkus/quarkus_project.go | 30 ++++++++++++++++++++-
.../pkg/command/quarkus/quarkus_project_test.go | 2 ++
.../testdata/pom1-expected.xml_no_auto_formatting | 31 +++++++++++++++++++---
.../kn-plugin-workflow/pkg/metadata/constants.go | 4 ++-
5 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/packages/kn-plugin-workflow/e2e-tests/quarkus_build_test.go
b/packages/kn-plugin-workflow/e2e-tests/quarkus_build_test.go
index 89e1837c4be..753677c86e3 100644
--- a/packages/kn-plugin-workflow/e2e-tests/quarkus_build_test.go
+++ b/packages/kn-plugin-workflow/e2e-tests/quarkus_build_test.go
@@ -123,8 +123,7 @@ func RunQuarkusBuildTest(t *testing.T,
cfgTestInputQuarkusCreate CfgTestInputQua
require.NoErrorf(t, err, "Expected nil error, got %v", err)
// Run `quarkus build` command
- args := transformQuarkusBuildCmdCfgToArgs(test.input);
- AddSnapshotRepositoryDeclarationToPom(t, projectDir)
+ args := transformQuarkusBuildCmdCfgToArgs(test.input)
_, err = ExecuteKnWorkflowQuarkus(args...)
require.NoErrorf(t, err, "Expected nil error, got %v", err)
diff --git a/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project.go
b/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project.go
index c39e124e9ba..7befb9aa0a9 100644
--- a/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project.go
+++ b/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project.go
@@ -33,6 +33,12 @@ type CreateQuarkusProjectConfig struct {
DependenciesVersion metadata.DependenciesVersion
}
+type Repository struct {
+ Id string
+ Name string
+ Url string
+}
+
func CreateQuarkusProject(cfg CreateQuarkusProjectConfig) error {
if err := common.CheckProjectName(cfg.ProjectName); err != nil {
return err
@@ -94,6 +100,9 @@ func manipulatePomToKogito(filename string, cfg
CreateQuarkusProjectConfig) erro
}
versionElement.SetText(cfg.DependenciesVersion.QuarkusVersion)
+
properties.CreateElement("kie.version").SetText(metadata.KogitoBomDependency.Version)
+
properties.CreateElement("kie.tooling.version").SetText(metadata.PluginVersion)
+
//Add kogito bom dependency
depManagement := doc.FindElement("//dependencyManagement")
if depManagement == nil {
@@ -108,7 +117,7 @@ func manipulatePomToKogito(filename string, cfg
CreateQuarkusProjectConfig) erro
dependencyElement :=
dependenciesManagendChild.CreateElement("dependency")
dependencyElement.CreateElement("groupId").SetText(metadata.KogitoBomDependency.GroupId)
dependencyElement.CreateElement("artifactId").SetText(metadata.KogitoBomDependency.ArtifactId)
-
dependencyElement.CreateElement("version").SetText(metadata.KogitoBomDependency.Version)
+ dependencyElement.CreateElement("version").SetText("${kie.version}")
dependencyElement.CreateElement("type").SetText(metadata.KogitoBomDependency.Type)
dependencyElement.CreateElement("scope").SetText(metadata.KogitoBomDependency.Scope)
@@ -127,6 +136,25 @@ func manipulatePomToKogito(filename string, cfg
CreateQuarkusProjectConfig) erro
}
}
+ //add apache repository after profiles declaration
+ var repositories = []Repository{
+ {Id: "apache-public-repository-group", Name: "Apache Public
Repository Group", Url: "https://repository.apache.org/content/groups/public/"},
+ {Id: "apache-snapshot-repository-group", Name: "Apache Snapshot
Repository Group", Url:
"https://repository.apache.org/content/groups/snapshots/"},
+ }
+
+ var project = doc.FindElement("//project")
+ repositoriesElement := project.FindElement("//repositories")
+ if repositoriesElement == nil {
+ repositoriesElement = project.CreateElement("repositories")
+ }
+
+ for _, repo := range repositories {
+ var repository = repositoriesElement.CreateElement("repository")
+ repository.CreateElement("id").SetText(repo.Id)
+ repository.CreateElement("name").SetText(repo.Name)
+ repository.CreateElement("url").SetText(repo.Url)
+ }
+
doc.Indent(4)
if err := doc.WriteToFile(filename); err != nil {
diff --git
a/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project_test.go
b/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project_test.go
index fc04e96a4d1..98ccab8c5e9 100644
--- a/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project_test.go
+++ b/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project_test.go
@@ -30,6 +30,8 @@ func TestManipulatePom(t *testing.T) {
//setup
metadata.KogitoVersion = "1.0.0.Final"
+ metadata.PluginVersion = "0.0.0"
+ metadata.KogitoBomDependency.Version = "0.0.0"
inputPath := "testdata/pom1-input.xml_no_auto_formatting"
expectedPath := "testdata/pom1-expected.xml_no_auto_formatting"
diff --git
a/packages/kn-plugin-workflow/pkg/command/quarkus/testdata/pom1-expected.xml_no_auto_formatting
b/packages/kn-plugin-workflow/pkg/command/quarkus/testdata/pom1-expected.xml_no_auto_formatting
index ecb8faa0730..bb3565def75 100644
---
a/packages/kn-plugin-workflow/pkg/command/quarkus/testdata/pom1-expected.xml_no_auto_formatting
+++
b/packages/kn-plugin-workflow/pkg/command/quarkus/testdata/pom1-expected.xml_no_auto_formatting
@@ -14,6 +14,8 @@
<quarkus.platform.version>0.0.1</quarkus.platform.version>
<skipITs>true</skipITs>
<surefire-plugin.version>3.2.5</surefire-plugin.version>
+ <kie.version>0.0.0</kie.version>
+ <kie.tooling.version>0.0.0</kie.tooling.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -34,7 +36,7 @@
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-bom</artifactId>
- <version/>
+ <version>${kie.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -85,20 +87,29 @@
</dependency>
<dependency>
<groupId>org.kie</groupId>
- <artifactId>kie-addons-quarkus-source-files</artifactId>
+ <artifactId>kie-addons-quarkus-process-management</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.kie.sonataflow</groupId>
- <artifactId>sonataflow-quarkus-devui</artifactId>
+ <groupId>org.kie</groupId>
+ <artifactId>kie-addons-quarkus-source-files</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
<artifactId>kogito-addons-quarkus-data-index-inmemory</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.kie</groupId>
+
<artifactId>kogito-addons-quarkus-jobs-service-embedded</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.kie.sonataflow</groupId>
<artifactId>sonataflow-quarkus</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.kie.sonataflow</groupId>
+ <artifactId>sonataflow-quarkus-devui</artifactId>
+ <version>${kie.tooling.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -172,4 +183,16 @@
</properties>
</profile>
</profiles>
+ <repositories>
+ <repository>
+ <id>apache-public-repository-group</id>
+ <name>Apache Public Repository Group</name>
+ <url>https://repository.apache.org/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>apache-snapshot-repository-group</id>
+ <name>Apache Snapshot Repository Group</name>
+ <url>https://repository.apache.org/content/groups/snapshots/</url>
+ </repository>
+ </repositories>
</project>
diff --git a/packages/kn-plugin-workflow/pkg/metadata/constants.go
b/packages/kn-plugin-workflow/pkg/metadata/constants.go
index 2b84c2b3361..601dee87cb6 100644
--- a/packages/kn-plugin-workflow/pkg/metadata/constants.go
+++ b/packages/kn-plugin-workflow/pkg/metadata/constants.go
@@ -40,10 +40,12 @@ var KogitoBomDependency = Dependency{
// of created and converted Quarkus projects.
var KogitoDependencies = []Dependency{
{GroupId: "org.kie", ArtifactId: "kie-addons-quarkus-knative-eventing"},
+ {GroupId: "org.kie", ArtifactId:
"kie-addons-quarkus-process-management"},
{GroupId: "org.kie", ArtifactId: "kie-addons-quarkus-source-files"},
- {GroupId: "org.apache.kie.sonataflow", ArtifactId:
"sonataflow-quarkus-devui", Version: PluginVersion},
{GroupId: "org.kie", ArtifactId:
"kogito-addons-quarkus-data-index-inmemory"},
+ {GroupId: "org.kie", ArtifactId:
"kogito-addons-quarkus-jobs-service-embedded"},
{GroupId: "org.apache.kie.sonataflow", ArtifactId:
"sonataflow-quarkus"},
+ {GroupId: "org.apache.kie.sonataflow", ArtifactId:
"sonataflow-quarkus-devui", Version: "${kie.tooling.version}"},
}
const (
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
