This is an automated email from the ASF dual-hosted git repository. nferraro 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 e997073 Preparing Camel K 1.0.0 release e997073 is described below commit e99707333b1838dc1bb217b7aec4e09c70928816 Author: Nicola Ferraro <ni.ferr...@gmail.com> AuthorDate: Fri Jun 5 19:52:50 2020 +0200 Preparing Camel K 1.0.0 release --- deploy/resources.go | 4 ++-- e2e/knative/files/petstore-api.yaml | 17 +++++++++++++++++ e2e/yaks/knative/yaks-config.yaml | 17 +++++++++++++++++ e2e/yaks/yaks-config.yaml | 17 +++++++++++++++++ examples/petstore-api.yaml | 17 +++++++++++++++++ pkg/cmd/run_test.go | 1 - pkg/event/injectable.go | 17 +++++++++++++++++ pkg/util/jitpack/jitpack_test.go | 2 +- pkg/util/kubernetes/conditions.go | 17 +++++++++++++++++ pkg/util/modeline/parser.go | 17 +++++++++++++++++ pkg/util/modeline/parser_test.go | 17 +++++++++++++++++ pkg/util/modeline/types.go | 17 +++++++++++++++++ script/check_licenses.sh | 2 +- 13 files changed, 157 insertions(+), 5 deletions(-) diff --git a/deploy/resources.go b/deploy/resources.go index 1dfcb38..6ee950c 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -354,9 +354,9 @@ var assets = func() http.FileSystem { "/traits.yaml": &vfsgen۰CompressedFileInfo{ name: "traits.yaml", modTime: time.Time{}, - uncompressedSize: 32863, + uncompressedSize: 32888, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x73\x1b\x37\xd2\xe0\x77\xff\x0a\x94\xee\xaa\x24\xaa\xc8\x91\x9d\xad\xdd\x64\x75\xe7\x4b\xe9\x6c\x67\x57\x4e\x6c\xeb\x6c\x27\x7b\x57\xb9\xd4\x12\x9c\x69\x92\x08\x31\xc0\x2c\x80\xa1\xcc\x5c\x5d\xd5\xfd\x8d\xfb\x7b\xcf\x2f\x79\xaa\x1b\x2f\x83\x21\x47\xd2\xc8\x89\x52\x51\xd5\x93\x7c\xb0\x28\xcd\x34\x1a\x8d\x7e\x7f\x01\x9d\xe1\xc2\xd9\xf3\x27\x33\xa6\x78\x0d\xe7\x8c\x2f\x97\x42\x09\xb7\x7b\xc2\x58\x23\xb9\x5b\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xed\x6e\x1c\x37\x96\xe8\x7f\x3f\x05\xa1\x7b\x01\x7d\xa0\xbb\x24\x67\x90\x49\x46\xf7\xfa\x06\xba\xb6\x33\xa3\x24\xb6\xb5\xb6\x32\xb3\x8b\x6c\x30\xcd\xae\x3a\xdd\xcd\x88\x45\xd6\x90\x2c\xc9\x9d\xc5\x02\xfb\x1a\xfb\x7a\xfb\x24\x8b\x73\xf8\x51\xac\xea\x92\x54\x72\xa2\x20\x02\x36\xf9\x61\xb5\x54\x75\x78\x78\x78\xbe\x3f\xd8\xce\x70\xe1\xec\xe9\xb3\x39\x53\xbc\x86\x53\xc6\x57\x2b\xa1\x84\xdb\x3e\x63\xac\x91\xdc\xad\x [...] }, "/user-cluster-role.yaml": &vfsgen۰CompressedFileInfo{ name: "user-cluster-role.yaml", diff --git a/e2e/knative/files/petstore-api.yaml b/e2e/knative/files/petstore-api.yaml index 10f4c49..1b6d69c 100644 --- a/e2e/knative/files/petstore-api.yaml +++ b/e2e/knative/files/petstore-api.yaml @@ -1,3 +1,20 @@ +# --------------------------------------------------------------------------- +# 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. +# --------------------------------------------------------------------------- + openapi: "3.0.0" info: version: 1.0.0 diff --git a/e2e/yaks/knative/yaks-config.yaml b/e2e/yaks/knative/yaks-config.yaml index 2b0d425..b2bebf2 100644 --- a/e2e/yaks/knative/yaks-config.yaml +++ b/e2e/yaks/knative/yaks-config.yaml @@ -1,3 +1,20 @@ +# --------------------------------------------------------------------------- +# 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. +# --------------------------------------------------------------------------- + config: namespace: temporary: true diff --git a/e2e/yaks/yaks-config.yaml b/e2e/yaks/yaks-config.yaml index bcaaed9..d8958e6 100644 --- a/e2e/yaks/yaks-config.yaml +++ b/e2e/yaks/yaks-config.yaml @@ -1,2 +1,19 @@ +# --------------------------------------------------------------------------- +# 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. +# --------------------------------------------------------------------------- + config: recursive: true diff --git a/examples/petstore-api.yaml b/examples/petstore-api.yaml index 10f4c49..1b6d69c 100644 --- a/examples/petstore-api.yaml +++ b/examples/petstore-api.yaml @@ -1,3 +1,20 @@ +# --------------------------------------------------------------------------- +# 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. +# --------------------------------------------------------------------------- + openapi: "3.0.0" info: version: 1.0.0 diff --git a/pkg/cmd/run_test.go b/pkg/cmd/run_test.go index 2110fbd..a0c9f9c 100644 --- a/pkg/cmd/run_test.go +++ b/pkg/cmd/run_test.go @@ -4,7 +4,6 @@ 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 diff --git a/pkg/event/injectable.go b/pkg/event/injectable.go index 6854054..c1b3ee3 100644 --- a/pkg/event/injectable.go +++ b/pkg/event/injectable.go @@ -1,3 +1,20 @@ +/* +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. +*/ + package event import "k8s.io/client-go/tools/record" diff --git a/pkg/util/jitpack/jitpack_test.go b/pkg/util/jitpack/jitpack_test.go index 777e7d5..108f9a0 100644 --- a/pkg/util/jitpack/jitpack_test.go +++ b/pkg/util/jitpack/jitpack_test.go @@ -6,7 +6,7 @@ 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 - hvalp://www.apache.org/licenses/LICENSE-2.0 + 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, diff --git a/pkg/util/kubernetes/conditions.go b/pkg/util/kubernetes/conditions.go index 1cf9bf4..bb8e3c4 100644 --- a/pkg/util/kubernetes/conditions.go +++ b/pkg/util/kubernetes/conditions.go @@ -1,3 +1,20 @@ +/* +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. +*/ + package kubernetes import ( diff --git a/pkg/util/modeline/parser.go b/pkg/util/modeline/parser.go index f1ce980..627f496 100644 --- a/pkg/util/modeline/parser.go +++ b/pkg/util/modeline/parser.go @@ -1,3 +1,20 @@ +/* +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. +*/ + package modeline import ( diff --git a/pkg/util/modeline/parser_test.go b/pkg/util/modeline/parser_test.go index 9e91c3f..ce47578 100644 --- a/pkg/util/modeline/parser_test.go +++ b/pkg/util/modeline/parser_test.go @@ -1,3 +1,20 @@ +/* +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. +*/ + package modeline import ( diff --git a/pkg/util/modeline/types.go b/pkg/util/modeline/types.go index e7c6840..dce5e88 100644 --- a/pkg/util/modeline/types.go +++ b/pkg/util/modeline/types.go @@ -1,3 +1,20 @@ +/* +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. +*/ + package modeline // Option represents a key/(optional)value modeline option diff --git a/script/check_licenses.sh b/script/check_licenses.sh index 9d8e23d..eb3dbc6 100755 --- a/script/check_licenses.sh +++ b/script/check_licenses.sh @@ -18,7 +18,7 @@ location=$(dirname $0) rootdir=$location/../ -blacklist=("zz_generated" "./.mvn/wrapper" "./docs/" "./.idea" "./build/") +blacklist=("zz_generated" "zz_desc_generated" "./.mvn/wrapper" "./docs/" "./.idea" "./build/" "./deploy/traits.yaml") cd $rootdir go build ./cmd/util/license-check/