Skip to content

Commit

Permalink
Merge branch 'main' into kie-issues#965
Browse files Browse the repository at this point in the history
  • Loading branch information
@yesamer
yesamer committed Mar 12, 2024
2 parents 693b19b + 34c6856 commit d91bbb0
Show file tree
Hide file tree
Showing 20 changed files with 1,038 additions and 221 deletions.
2 changes: 1 addition & 1 deletion packages/kn-plugin-workflow/e2e-tests/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var parentPath string
var TempTestsPath string
var KnExecutable string

var TestPrintCmdOutput = flag.Bool("logs", false, "Print command output during tests")
var TestPrintCmdOutput = flag.Bool("logs", true, "Print command output during tests")

func TestMain(m *testing.M) {

Expand Down
2 changes: 1 addition & 1 deletion packages/kn-plugin-workflow/e2e-tests/quarkus_convert_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ var cfgTestInputQuarkusConvert_Success = []CfgTestInputQuarkusConvert{
Extensions: "quarkus-jsonp,quarkus-smallrye-openapi",
DependenciesVersion: metadata.DependenciesVersion{
QuarkusPlatformGroupId: "io.quarkus.platform",
QuarkusVersion: "2.16.6.Final",
QuarkusVersion: "3.2.9.Final",
},
}},
}
Expand Down
2 changes: 1 addition & 1 deletion packages/kn-plugin-workflow/e2e-tests/quarkus_create_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var cfgTestInputQuarkusCreate_Success = []CfgTestInputQuarkusCreate{
Extensions: "quarkus-jsonp,quarkus-smallrye-openapi",
DependenciesVersion: metadata.DependenciesVersion{
QuarkusPlatformGroupId: "io.quarkus.platform",
QuarkusVersion: "2.16.6.Final",
QuarkusVersion: "3.2.9.Final",
},
}},
}
Expand Down
6 changes: 3 additions & 3 deletions packages/kn-plugin-workflow/env/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ module.exports = composeEnv([require("@kie-tools/root-env/env")], {
},
KN_PLUGIN_WORKFLOW__quarkusVersion: {
name: "KN_PLUGIN_WORKFLOW__quarkusVersion",
default: "2.16.10.Final",
default: "3.2.9.Final",
description: "Quarkus version to be used when creating the SonataFlow project",
},
KN_PLUGIN_WORKFLOW__devModeImage: {
name: "KN_PLUGIN_WORKFLOW__devModeImage",
default: "quay.io/kiegroup/kogito-swf-devmode:1.44",
default: "quay.io/kiegroup/kogito-swf-devmode-nightly:999-20240218",
description: "SonataFlow dev mode image (used on cli run)",
},
KN_PLUGIN_WORKFLOW__kogitoVersion: {
name: "KN_PLUGIN_WORKFLOW__kogitoVersion",
default: "1.44.1.Final",
default: "999-20240218-SNAPSHOT",
description: "Kogito version to be used when creating and converting to Quarkus Projects",
},
}),
Expand Down
31 changes: 18 additions & 13 deletions packages/kn-plugin-workflow/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ module github.com/apache/incubator-kie-tools/packages/kn-plugin-workflow

go 1.21

toolchain go1.21.6

replace github.com/apache/incubator-kie-kogito-serverless-operator/api v0.0.0 => github.com/apache/incubator-kie-kogito-serverless-operator/api v0.0.0-20240126134605-2b5056d12bb9

require (
github.com/apache/incubator-kie-kogito-serverless-operator/workflowproj v0.0.0-20240122.0.20240219180504-5ebaf85efc66
github.com/beevik/etree v1.2.0
github.com/docker/docker v24.0.7+incompatible
github.com/docker/go-connections v0.4.0
github.com/jstemmer/go-junit-report/v2 v2.0.0
github.com/kiegroup/kogito-serverless-operator/workflowproj v1.44.1
github.com/ory/viper v1.7.5
github.com/spf13/afero v1.9.5
github.com/spf13/cobra v1.7.0
Expand All @@ -18,9 +22,10 @@ require (

require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/apache/incubator-kie-kogito-serverless-operator/api v0.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/go-units v0.5.0 // indirect
Expand All @@ -42,15 +47,14 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kiegroup/kogito-serverless-operator/api v1.44.1 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -67,30 +71,31 @@ require (
github.com/pb33f/libopenapi v0.10.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/relvacode/iso8601 v1.3.0 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
github.com/senseyeio/duration v0.0.0-20180430131211-7c2a214ada46 // indirect
github.com/serverlessworkflow/sdk-go/v2 v2.2.4 // indirect
github.com/serverlessworkflow/sdk-go/v2 v2.2.5 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.13.0 // indirect
golang.org/x/tools v0.14.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.31.0 // indirect
Expand All @@ -106,7 +111,7 @@ require (
k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
knative.dev/client-pkg v0.0.0-20230911133121-2bcbd97b17ec // indirect
knative.dev/pkg v0.0.0-20230912052245-8d736b687bf4 // indirect
knative.dev/pkg v0.0.0-20231023151236-29775d7c9e5c // indirect
sigs.k8s.io/controller-runtime v0.16.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
Expand Down
Loading

0 comments on commit d91bbb0

Please sign in to comment.