This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push: new 9e7a630 chore(regen): regenerate defaults 9e7a630 is described below commit 9e7a63040e8ee47752eb4238c6ca630fb2fcf1d2 Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Fri Jun 7 10:52:34 2019 +0200 chore(regen): regenerate defaults --- pkg/util/defaults/defaults.go | 2 +- script/Makefile | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index 2e948e8..69d6a1a 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -28,7 +28,7 @@ const ( CamelVersionConstraint = "~2.24.x" // RuntimeVersion -- - RuntimeVersion = "0.3.2" + RuntimeVersion = "0.3.3" // BaseImage -- BaseImage = "fabric8/s2i-java:3.0-java8" diff --git a/script/Makefile b/script/Makefile index 88a14d2..70ff17e 100644 --- a/script/Makefile +++ b/script/Makefile @@ -30,13 +30,34 @@ GPG_PASS := $(GPG_PASS) GOLDFLAGS += -X main.GitCommit=$(GIT_COMMIT) GOFLAGS = -ldflags "$(GOLDFLAGS)" +define LICENSE_HEADER +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +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. +endef + +export LICENSE_HEADER default: test # # Generates the version file # codegen: - @echo "package defaults" > $(VERSIONFILE) + @echo "/*" > $(VERSIONFILE) + @echo "$$LICENSE_HEADER" >> $(VERSIONFILE) + @echo "*/" >> $(VERSIONFILE) + @echo "package defaults" >> $(VERSIONFILE) @echo "" >> $(VERSIONFILE) @echo "// ***********************" >> $(VERSIONFILE) @echo "// DO NOT EDIT THIS FILE" >> $(VERSIONFILE)