You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2019/11/04 16:10:46 UTC
[camel-k] 22/38: chore(quarkus): Move LocalRepository field to
MavenSpec
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit a50369e90db7476b2665bb5a9dce6f23f4dea156
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Fri Oct 25 11:48:10 2019 +0200
chore(quarkus): Move LocalRepository field to MavenSpec
---
pkg/apis/camel/v1alpha1/common_types.go | 5 +++--
pkg/apis/camel/v1alpha1/integrationplatform_types.go | 1 -
pkg/builder/runtime/main.go | 2 +-
pkg/builder/runtime/quarkus.go | 2 +-
pkg/cmd/describe_platform.go | 2 +-
pkg/cmd/install.go | 2 +-
pkg/controller/integrationplatform/initialize.go | 6 +++---
pkg/trait/camel.go | 2 +-
pkg/trait/rest-dsl.go | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pkg/apis/camel/v1alpha1/common_types.go b/pkg/apis/camel/v1alpha1/common_types.go
index 2833890..f54c19c 100644
--- a/pkg/apis/camel/v1alpha1/common_types.go
+++ b/pkg/apis/camel/v1alpha1/common_types.go
@@ -77,8 +77,9 @@ type PlatformInjectable interface {
// MavenSpec --
type MavenSpec struct {
- Settings ValueSource `json:"settings,omitempty"`
- Timeout metav1.Duration `json:"timeout,omitempty"`
+ LocalRepository string `json:"localRepository,omitempty"`
+ Settings ValueSource `json:"settings,omitempty"`
+ Timeout metav1.Duration `json:"timeout,omitempty"`
}
// ValueSource --
diff --git a/pkg/apis/camel/v1alpha1/integrationplatform_types.go b/pkg/apis/camel/v1alpha1/integrationplatform_types.go
index b41aeba..6626eae 100644
--- a/pkg/apis/camel/v1alpha1/integrationplatform_types.go
+++ b/pkg/apis/camel/v1alpha1/integrationplatform_types.go
@@ -100,7 +100,6 @@ type IntegrationPlatformBuildSpec struct {
RuntimeProvider *RuntimeProvider `json:"runtimeProvider,omitempty"`
BaseImage string `json:"baseImage,omitempty"`
Properties map[string]string `json:"properties,omitempty"`
- LocalRepository string `json:"localRepository,omitempty"`
Registry IntegrationPlatformRegistrySpec `json:"registry,omitempty"`
Timeout metav1.Duration `json:"timeout,omitempty"`
PersistentVolumeClaim string `json:"persistentVolumeClaim,omitempty"`
diff --git a/pkg/builder/runtime/main.go b/pkg/builder/runtime/main.go
index e525cc7..c8854f9 100644
--- a/pkg/builder/runtime/main.go
+++ b/pkg/builder/runtime/main.go
@@ -80,7 +80,7 @@ func generateProject(ctx *builder.Context) error {
func computeDependencies(ctx *builder.Context) error {
mc := maven.NewContext(path.Join(ctx.Path, "maven"), ctx.Maven.Project)
mc.SettingsContent = ctx.Maven.SettingsData
- mc.LocalRepository = ctx.Build.Platform.Build.LocalRepository
+ mc.LocalRepository = ctx.Build.Platform.Build.Maven.LocalRepository
mc.Timeout = ctx.Build.Platform.Build.Maven.Timeout.Duration
mc.AddArgumentf("org.apache.camel.k:camel-k-maven-plugin:%s:generate-dependency-list", ctx.Catalog.RuntimeVersion)
diff --git a/pkg/builder/runtime/quarkus.go b/pkg/builder/runtime/quarkus.go
index f25a2ae..7cf1736 100644
--- a/pkg/builder/runtime/quarkus.go
+++ b/pkg/builder/runtime/quarkus.go
@@ -87,7 +87,7 @@ func generateQuarkusProject(ctx *builder.Context) error {
func computeQuarkusDependencies(ctx *builder.Context) error {
mc := maven.NewContext(path.Join(ctx.Path, "maven"), ctx.Maven.Project)
mc.SettingsContent = ctx.Maven.SettingsData
- mc.LocalRepository = ctx.Build.Platform.Build.LocalRepository
+ mc.LocalRepository = ctx.Build.Platform.Build.Maven.LocalRepository
mc.Timeout = ctx.Build.Platform.Build.Maven.Timeout.Duration
// Build the project, as the quarkus-bootstrap plugin build-tree goal
diff --git a/pkg/cmd/describe_platform.go b/pkg/cmd/describe_platform.go
index a1b42c4..58e74a1 100644
--- a/pkg/cmd/describe_platform.go
+++ b/pkg/cmd/describe_platform.go
@@ -92,7 +92,7 @@ func (command *describePlatformCommand) describeIntegrationPlatform(platform v1a
w.Write(0, "Version:\t%s\n", platform.Status.Version)
w.Write(0, "Base Image:\t%s\n", platform.Spec.Build.BaseImage)
w.Write(0, "Camel Version:\t%s\n", platform.Spec.Build.CamelVersion)
- w.Write(0, "Local Repository:\t%s\n", platform.Spec.Build.LocalRepository)
+ w.Write(0, "Local Repository:\t%s\n", platform.Spec.Build.Maven.LocalRepository)
w.Write(0, "Publish Strategy:\t%s\n", platform.Spec.Build.PublishStrategy)
if len(platform.Spec.Resources.Kits) > 0 {
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 5e9caaf..2f54088 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -186,7 +186,7 @@ func (o *installCmdOptions) install(cobraCmd *cobra.Command, _ []string) error {
}
}
if o.localRepository != "" {
- platform.Spec.Build.LocalRepository = o.localRepository
+ platform.Spec.Build.Maven.LocalRepository = o.localRepository
}
if o.camelVersion != "" {
platform.Spec.Build.CamelVersion = o.camelVersion
diff --git a/pkg/controller/integrationplatform/initialize.go b/pkg/controller/integrationplatform/initialize.go
index 2424851..663a3b5 100644
--- a/pkg/controller/integrationplatform/initialize.go
+++ b/pkg/controller/integrationplatform/initialize.go
@@ -183,8 +183,8 @@ func (action *initializeAction) setDefaults(ctx context.Context, platform *v1alp
if platform.Spec.Build.BaseImage == "" {
platform.Spec.Build.BaseImage = defaults.BaseImage
}
- if platform.Spec.Build.LocalRepository == "" {
- platform.Spec.Build.LocalRepository = defaults.LocalRepository
+ if platform.Spec.Build.Maven.LocalRepository == "" {
+ platform.Spec.Build.Maven.LocalRepository = defaults.LocalRepository
}
if platform.Spec.Build.PersistentVolumeClaim == "" {
platform.Spec.Build.PersistentVolumeClaim = platform.Name
@@ -254,7 +254,7 @@ func (action *initializeAction) setDefaults(ctx context.Context, platform *v1alp
action.L.Infof("CamelVersion set to %s", platform.Spec.Build.CamelVersion)
action.L.Infof("RuntimeVersion set to %s", platform.Spec.Build.RuntimeVersion)
action.L.Infof("BaseImage set to %s", platform.Spec.Build.BaseImage)
- action.L.Infof("LocalRepository set to %s", platform.Spec.Build.LocalRepository)
+ action.L.Infof("LocalRepository set to %s", platform.Spec.Build.Maven.LocalRepository)
action.L.Infof("Timeout set to %s", platform.Spec.Build.Timeout)
action.L.Infof("Maven Timeout set to %s", platform.Spec.Build.Maven.Timeout.Duration)
diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go
index 3cd0bd9..9a8281a 100644
--- a/pkg/trait/camel.go
+++ b/pkg/trait/camel.go
@@ -166,7 +166,7 @@ func (t *camelTrait) generateCatalog(e *Environment, camelVersion string, runtim
project := t.generateMavenProject(camelVersion, runtimeVersion)
mc := maven.NewContext(tmpDir, project)
- mc.LocalRepository = e.Platform.Spec.Build.LocalRepository
+ mc.LocalRepository = e.Platform.Spec.Build.Maven.LocalRepository
mc.Timeout = e.Platform.Spec.Build.Maven.Timeout.Duration
mc.AddSystemProperty("catalog.path", tmpDir)
mc.AddSystemProperty("catalog.file", "catalog.yaml")
diff --git a/pkg/trait/rest-dsl.go b/pkg/trait/rest-dsl.go
index 6a03ad4..317873a 100644
--- a/pkg/trait/rest-dsl.go
+++ b/pkg/trait/rest-dsl.go
@@ -111,7 +111,7 @@ func (t *restDslTrait) Apply(e *Environment) error {
}
mc := maven.NewContext(tmpDir, project)
- mc.LocalRepository = e.Platform.Spec.Build.LocalRepository
+ mc.LocalRepository = e.Platform.Spec.Build.Maven.LocalRepository
mc.Timeout = e.Platform.Spec.Build.Maven.Timeout.Duration
mc.AddArgument("-Dopenapi.spec=" + in)
mc.AddArgument("-Ddsl.out=" + out)