diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go index 640e385ee1..94f2e63aa7 100644 --- a/pkg/platform/defaults.go +++ b/pkg/platform/defaults.go @@ -97,10 +97,10 @@ func setPlatformDefaults(ctx context.Context, c client.Client, p *v1alpha1.Integ p.Status.Profile = DetermineBestProfile(ctx, c, p) } if p.Status.Build.CamelVersion == "" { - p.Status.Build.CamelVersion = defaults.CamelVersionConstraint + p.Status.Build.CamelVersion = defaults.DefaultCamelVersion } if p.Status.Build.RuntimeVersion == "" { - p.Status.Build.RuntimeVersion = defaults.RuntimeVersionConstraint + p.Status.Build.RuntimeVersion = defaults.DefaultRuntimeVersion } if p.Status.Build.BaseImage == "" { p.Status.Build.BaseImage = defaults.BaseImage diff --git a/pkg/trait/builder_test.go b/pkg/trait/builder_test.go index a9f2c00603..d2ec6c3ac1 100644 --- a/pkg/trait/builder_test.go +++ b/pkg/trait/builder_test.go @@ -148,7 +148,7 @@ func createBuilderTestEnv(cluster v1alpha1.IntegrationPlatformCluster, strategy Build: v1alpha1.IntegrationPlatformBuildSpec{ PublishStrategy: strategy, Registry: v1alpha1.IntegrationPlatformRegistrySpec{Address: "registry"}, - CamelVersion: defaults.CamelVersionConstraint, + CamelVersion: defaults.DefaultCamelVersion, }, }, }, diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go index 12289e26b9..f6c268e6dc 100644 --- a/pkg/util/camel/catalog.go +++ b/pkg/util/camel/catalog.go @@ -43,7 +43,7 @@ func DefaultCatalog() (*RuntimeCatalog, error) { // QuarkusCatalog -- func QuarkusCatalog() (*RuntimeCatalog, error) { return catalogForRuntimeProvider(v1alpha1.QuarkusRuntimeProvider{ - CamelQuarkusVersion: defaults.CamelQuarkusVersionConstraint, + CamelQuarkusVersion: defaults.DefaultCamelQuarkusVersion, QuarkusVersion: defaults.DefaultQuarkusVersion, }) } diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index d9ee9eb46a..5afb15ed2c 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -14,6 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ + package defaults // *********************** @@ -27,27 +28,15 @@ const ( // DefaultCamelVersion -- DefaultCamelVersion = "3.0.0-RC3" - // CamelVersionConstraint -- - CamelVersionConstraint = ">=3.0.0-RC3" - // DefaultRuntimeVersion -- DefaultRuntimeVersion = "1.0.7" - // RuntimeVersionConstraint -- - RuntimeVersionConstraint = ">=1.0.7" - // DefaultCamelQuarkusVersion -- DefaultCamelQuarkusVersion = "0.3.1" - // CamelQuarkusVersionConstraint -- - CamelQuarkusVersionConstraint = ">=0.3.1" - // DefaultQuarkusVersion -- DefaultQuarkusVersion = "0.27.0" - // QuarkusVersionConstraint -- - QuarkusVersionConstraint = ">=0.27.0" - // KanikoVersion -- KanikoVersion = "0.9.0" diff --git a/script/Makefile b/script/Makefile index 7de91f8284..f1c4e008d6 100644 --- a/script/Makefile +++ b/script/Makefile @@ -17,13 +17,9 @@ VERSIONFILE := pkg/util/defaults/defaults.go VERSION := 1.0.0-M5-SNAPSHOT LAST_RELEASED_VERSION := 1.0.0-M3 RUNTIME_VERSION := 1.0.7 -RUNTIME_VERSION_CONSTRAINT := >=1.0.7 CAMEL_VERSION := 3.0.0-RC3 -CAMEL_VERSION_CONSTRAINT := >=3.0.0-RC3 CAMEL_QUARKUS_VERSION := 0.3.1 -CAMEL_QUARKUS_VERSION_CONSTRAINT := >=0.3.1 QUARKUS_VERSION := 0.27.0 -QUARKUS_VERSION_CONSTRAINT := >=0.27.0 KANIKO_VERSION := 0.9.0 BASE_IMAGE := fabric8/s2i-java:3.0-java8 LOCAL_REPOSITORY := /tmp/artifacts/m2 @@ -72,6 +68,7 @@ codegen: @echo "/*" > $(VERSIONFILE) @echo "$$LICENSE_HEADER" >> $(VERSIONFILE) @echo "*/" >> $(VERSIONFILE) + @echo "" >> $(VERSIONFILE) @echo "package defaults" >> $(VERSIONFILE) @echo "" >> $(VERSIONFILE) @echo "// ***********************" >> $(VERSIONFILE) @@ -85,27 +82,15 @@ codegen: @echo " // DefaultCamelVersion -- " >> $(VERSIONFILE) @echo " DefaultCamelVersion = \"$(CAMEL_VERSION)\"" >> $(VERSIONFILE) @echo "" >> $(VERSIONFILE) - @echo " // CamelVersionConstraint -- " >> $(VERSIONFILE) - @echo " CamelVersionConstraint = \"$(CAMEL_VERSION_CONSTRAINT)\"" >> $(VERSIONFILE) - @echo "" >> $(VERSIONFILE) @echo " // DefaultRuntimeVersion -- " >> $(VERSIONFILE) @echo " DefaultRuntimeVersion = \"$(RUNTIME_VERSION)\"" >> $(VERSIONFILE) @echo "" >> $(VERSIONFILE) - @echo " // RuntimeVersionConstraint -- " >> $(VERSIONFILE) - @echo " RuntimeVersionConstraint = \"$(RUNTIME_VERSION_CONSTRAINT)\"" >> $(VERSIONFILE) - @echo "" >> $(VERSIONFILE) @echo " // DefaultCamelQuarkusVersion -- " >> $(VERSIONFILE) @echo " DefaultCamelQuarkusVersion = \"$(CAMEL_QUARKUS_VERSION)\"" >> $(VERSIONFILE) @echo "" >> $(VERSIONFILE) - @echo " // CamelQuarkusVersionConstraint -- " >> $(VERSIONFILE) - @echo " CamelQuarkusVersionConstraint = \"$(CAMEL_QUARKUS_VERSION_CONSTRAINT)\"" >> $(VERSIONFILE) - @echo "" >> $(VERSIONFILE) @echo " // DefaultQuarkusVersion -- " >> $(VERSIONFILE) @echo " DefaultQuarkusVersion = \"$(QUARKUS_VERSION)\"" >> $(VERSIONFILE) @echo "" >> $(VERSIONFILE) - @echo " // QuarkusVersionConstraint -- " >> $(VERSIONFILE) - @echo " QuarkusVersionConstraint = \"$(QUARKUS_VERSION_CONSTRAINT)\"" >> $(VERSIONFILE) - @echo "" >> $(VERSIONFILE) @echo " // KanikoVersion -- " >> $(VERSIONFILE) @echo " KanikoVersion = \"$(KANIKO_VERSION)\"" >> $(VERSIONFILE) @echo "" >> $(VERSIONFILE)