You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2020/10/08 17:08:50 UTC
[camel-k] branch master updated: preparing for next release
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 c79dc9b preparing for next release
c79dc9b is described below
commit c79dc9b40ddaa82c38fca405aa484ce60ce5983d
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Thu Oct 8 19:08:23 2020 +0200
preparing for next release
---
.asf.yaml | 17 +++++++++++++++++
addons/strimzi/strimzi_test.go | 17 +++++++++++++++++
build/maven/pom-catalog.xml | 5 +----
build/maven/pom-runtime.xml | 4 ----
...PSHOT-main.yaml => camel-catalog-1.5.0-main.yaml} | 6 +++---
...quarkus.yaml => camel-catalog-1.5.0-quarkus.yaml} | 6 +++---
deploy/resources.go | 20 ++++++++++----------
e2e/yaks/common/kamelet-binding/display.groovy | 1 +
.../common/kamelet-binding/logger-sink-binding.yaml | 17 +++++++++++++++++
.../common/kamelet-binding/logger-sink.kamelet.yaml | 17 +++++++++++++++++
.../timer-source-binding-display.yaml | 17 +++++++++++++++++
.../common/kamelet-binding/timer-source-binding.yaml | 17 +++++++++++++++++
.../common/kamelet-binding/timer-source.kamelet.yaml | 17 +++++++++++++++++
e2e/yaks/common/kamelet/echo-sink.kamelet.yaml | 17 +++++++++++++++++
e2e/yaks/common/kamelet/timer-source.kamelet.yaml | 17 +++++++++++++++++
e2e/yaks/openshift/monitoring/app/pom.xml | 14 ++++++++++++++
e2e/yaks/openshift/monitoring/obtainToken.sh | 15 +++++++++++++++
examples/SampleModeline.java | 2 +-
examples/kamelets/kamelet-binding-example.yaml | 17 +++++++++++++++++
examples/kamelets/timer-source.kamelet.yaml | 17 +++++++++++++++++
jitpack.yml | 17 +++++++++++++++++
pkg/apis/camel/group.go | 17 +++++++++++++++++
pkg/apis/camel/v1alpha1/doc.go | 17 +++++++++++++++++
pkg/controller/kamelet/common.go | 17 +++++++++++++++++
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 4 ++--
26 files changed, 306 insertions(+), 28 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index f574147..2cf8b81 100644
--- a/.asf.yaml
+++ b/.asf.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.
+# ---------------------------------------------------------------------------
+
github:
description: "Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers"
homepage: https://camel.apache.org
diff --git a/addons/strimzi/strimzi_test.go b/addons/strimzi/strimzi_test.go
index ad90835..627283c 100644
--- a/addons/strimzi/strimzi_test.go
+++ b/addons/strimzi/strimzi_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 strimzi
import (
diff --git a/build/maven/pom-catalog.xml b/build/maven/pom-catalog.xml
index 297a1ce..9e09c6c 100644
--- a/build/maven/pom-catalog.xml
+++ b/build/maven/pom-catalog.xml
@@ -1,22 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
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.
-
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/build/maven/pom-runtime.xml b/build/maven/pom-runtime.xml
index 891f31c..7c9a5e8 100644
--- a/build/maven/pom-runtime.xml
+++ b/build/maven/pom-runtime.xml
@@ -1,21 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
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.
-
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml b/deploy/camel-catalog-1.5.0-main.yaml
similarity index 99%
rename from deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml
rename to deploy/camel-catalog-1.5.0-main.yaml
index bf29fdb..b13fece 100644
--- a/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml
+++ b/deploy/camel-catalog-1.5.0-main.yaml
@@ -18,16 +18,16 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.5.1-snapshot-main
+ name: camel-catalog-1.5.0-main
labels:
app: camel-k
camel.apache.org/catalog.version: 3.5.0
camel.apache.org/catalog.loader.version: 3.5.0
- camel.apache.org/runtime.version: 1.5.1-SNAPSHOT
+ camel.apache.org/runtime.version: 1.5.0
camel.apache.org/runtime.provider: main
spec:
runtime:
- version: 1.5.1-SNAPSHOT
+ version: 1.5.0
provider: main
applicationClass: org.apache.camel.k.main.Application
metadata:
diff --git a/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml b/deploy/camel-catalog-1.5.0-quarkus.yaml
similarity index 99%
rename from deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
rename to deploy/camel-catalog-1.5.0-quarkus.yaml
index 971e41b..f4963bc 100644
--- a/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
+++ b/deploy/camel-catalog-1.5.0-quarkus.yaml
@@ -18,16 +18,16 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.5.1-snapshot-quarkus
+ name: camel-catalog-1.5.0-quarkus
labels:
app: camel-k
camel.apache.org/catalog.version: 3.5.0
camel.apache.org/catalog.loader.version: 3.5.0
- camel.apache.org/runtime.version: 1.5.1-SNAPSHOT
+ camel.apache.org/runtime.version: 1.5.0
camel.apache.org/runtime.provider: quarkus
spec:
runtime:
- version: 1.5.1-SNAPSHOT
+ version: 1.5.0
provider: quarkus
applicationClass: io.quarkus.runner.GeneratedMain
metadata:
diff --git a/deploy/resources.go b/deploy/resources.go
index 85a4c7f..e136bde 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -88,19 +88,19 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x3d\x6f\xdb\x30\x14\xdc\xf9\x2b\x0e\xd6\x92\x00\xfe\x68\x3b\xba\x93\x9a\xd8\xa8\xd0\xc0\x06\x22\xa7\x41\xc6\x67\xf1\x59\x7a\x08\x45\xaa\x24\x15\xc5\xff\xbe\xa0\x6c\x37\x09\xba\x86\x9b\xa0\xd3\x7d\xf0\x4e\x19\x66\x9f\x77\x54\x86\x3b\xa9\xd8\x06\xd6\x88\x0e\xb1\x61\xe4\x1d\x55\x0d\xa3\x74\x87\x38\x90\x67\xac\x5d\x6f\x35\x45\x71\x16\x57\x79\xb9\xbe\x46\x6f\x35\x7b\x38\xcb\x70\x1e\xad\xf3\xac\x32\x54\xce\x46\x2f\x [...]
},
- "/camel-catalog-1.5.1-SNAPSHOT-main.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.5.1-SNAPSHOT-main.yaml",
+ "/camel-catalog-1.5.0-main.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.5.0-main.yaml",
modTime: time.Time{},
- uncompressedSize: 91768,
+ uncompressedSize: 91741,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x7d\x5b\x77\xdb\x38\xb2\xee\x7b\x7e\x05\xd7\xe4\x65\xef\x75\x46\x98\x6e\x67\x66\x7a\xef\x3e\x4f\xb6\x1c\x27\x76\x6c\xc7\x1d\x79\x92\xcc\xbc\xf4\x82\x48\x48\x82\x44\x12\x34\x00\x5d\xec\x5f\x7f\x16\x2e\xbc\x0a\x82\x44\x96\xe1\xb5\x8e\x1f\x4c\x8a\xa8\xfa\x8a\x45\x90\xb8\x14\x0a\x55\xef\xa3\xd1\xeb\xfd\xbd\x7b\x1f\xdd\xd2\x98\xe4\x82\x24\x91\x64\x91\x5c\x90\xe8\xbc\xc0\xf1\x82\x44\x13\x36\x93\x5b\xcc\x49\x74\xc5\xd6\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x7d\x5b\x77\xdb\x38\xb2\xee\x7b\x7e\x05\xd7\xe4\x65\xef\x75\x46\x98\x6e\x67\x66\x7a\xef\x3e\x4f\xb6\x1c\x27\x76\x6c\xc7\x1d\x79\x92\xcc\xbc\xf4\x82\x48\x48\x82\x44\x12\x34\x00\x5d\xec\x5f\x7f\x16\x2e\xbc\x0a\x82\x44\x96\xe1\xb5\x8e\x1f\x4c\x8a\xa8\xfa\x8a\x45\x90\xb8\x14\x0a\x55\xef\xa3\xd1\xeb\xfd\xbd\x7b\x1f\xdd\xd2\x98\xe4\x82\x24\x91\x64\x91\x5c\x90\xe8\xbc\xc0\xf1\x82\x44\x13\x36\x93\x5b\xcc\x49\x74\xc5\xd6\x [...]
},
- "/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml",
+ "/camel-catalog-1.5.0-quarkus.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.5.0-quarkus.yaml",
modTime: time.Time{},
- uncompressedSize: 88236,
+ uncompressedSize: 88209,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x38\xb2\xff\x3e\x9f\x82\xa7\xb3\xb9\xf7\xfc\x87\x98\x6e\x67\x66\xfa\x9e\xfe\xaf\x64\x39\x4e\xec\xd8\x8e\x13\x79\x92\x4c\x6f\xfa\x40\x24\x24\xc1\x22\x09\x1a\x80\x24\x3b\x9f\xfe\x1e\x3c\xf8\x14\x5d\x7c\x18\xf0\xf5\xc2\x24\x85\xc2\xaf\x88\x02\x01\x14\x0a\x85\xc2\xdb\x20\x74\xf7\xf7\xe6\x6d\x70\x45\x23\x92\x09\x12\x07\x92\x05\x72\x43\x82\x59\x8e\xa3\x0d\x09\x16\x6c\x25\x0f\x98\x93\xe0\x9c\xed\xb2\x18\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x38\xb2\xff\x3e\x9f\x82\xa7\xb3\xb9\xf7\xfc\x87\x98\x6e\x67\x66\xfa\x9e\xfe\xaf\x6c\xf9\x11\x3b\xb6\xe3\x44\x9e\x24\xd3\x9b\x3e\x10\x09\x49\xb0\x48\x82\x06\x20\xc9\xce\xa7\xbf\x07\x0f\x3e\x45\x17\x1f\x06\x7c\xbd\x30\x49\xa1\xf0\x2b\xa2\x40\x00\x85\x42\xa1\xf0\x3e\x08\xdd\xfd\xbd\x7b\x1f\x5c\xd3\x88\x64\x82\xc4\x81\x64\x81\x5c\x93\xe0\x38\xc7\xd1\x9a\x04\x73\xb6\x94\x7b\xcc\x49\x70\xce\xb6\x59\x8c\x [...]
},
"/cr-example.yaml": &vfsgen۰CompressedFileInfo{
name: "cr-example.yaml",
@@ -344,8 +344,8 @@ var assets = func() http.FileSystem {
fs["/builder-role-kubernetes.yaml"].(os.FileInfo),
fs["/builder-role-openshift.yaml"].(os.FileInfo),
fs["/builder-service-account.yaml"].(os.FileInfo),
- fs["/camel-catalog-1.5.1-SNAPSHOT-main.yaml"].(os.FileInfo),
- fs["/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.5.0-main.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.5.0-quarkus.yaml"].(os.FileInfo),
fs["/cr-example.yaml"].(os.FileInfo),
fs["/crd-build.yaml"].(os.FileInfo),
fs["/crd-camel-catalog.yaml"].(os.FileInfo),
diff --git a/e2e/yaks/common/kamelet-binding/display.groovy b/e2e/yaks/common/kamelet-binding/display.groovy
index a6e32c3..97c879e 100644
--- a/e2e/yaks/common/kamelet-binding/display.groovy
+++ b/e2e/yaks/common/kamelet-binding/display.groovy
@@ -1,4 +1,5 @@
// camel-k: language=groovy
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
index bcdd95e..72f2e8e 100644
--- a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/logger-sink-binding.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.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: KameletBinding
metadata:
diff --git a/e2e/yaks/common/kamelet-binding/logger-sink.kamelet.yaml b/e2e/yaks/common/kamelet-binding/logger-sink.kamelet.yaml
index d401a7a..edc710f 100644
--- a/e2e/yaks/common/kamelet-binding/logger-sink.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-binding/logger-sink.kamelet.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.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
metadata:
diff --git a/e2e/yaks/common/kamelet-binding/timer-source-binding-display.yaml b/e2e/yaks/common/kamelet-binding/timer-source-binding-display.yaml
index b217445..91cbf37 100644
--- a/e2e/yaks/common/kamelet-binding/timer-source-binding-display.yaml
+++ b/e2e/yaks/common/kamelet-binding/timer-source-binding-display.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.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: KameletBinding
metadata:
diff --git a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
index 32aeefb..a47fdf6 100644
--- a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/timer-source-binding.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.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: KameletBinding
metadata:
diff --git a/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml
index 48df261..dc64b57 100644
--- a/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-binding/timer-source.kamelet.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.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
metadata:
diff --git a/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml b/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml
index 08a3a0e..4d40780 100644
--- a/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml
+++ b/e2e/yaks/common/kamelet/echo-sink.kamelet.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.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
metadata:
diff --git a/e2e/yaks/common/kamelet/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet/timer-source.kamelet.yaml
index 48df261..dc64b57 100644
--- a/e2e/yaks/common/kamelet/timer-source.kamelet.yaml
+++ b/e2e/yaks/common/kamelet/timer-source.kamelet.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.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
metadata:
diff --git a/e2e/yaks/openshift/monitoring/app/pom.xml b/e2e/yaks/openshift/monitoring/app/pom.xml
index c3c172c..aa77c9e 100644
--- a/e2e/yaks/openshift/monitoring/app/pom.xml
+++ b/e2e/yaks/openshift/monitoring/app/pom.xml
@@ -1,4 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/e2e/yaks/openshift/monitoring/obtainToken.sh b/e2e/yaks/openshift/monitoring/obtainToken.sh
index 86c81cd..6c32107 100755
--- a/e2e/yaks/openshift/monitoring/obtainToken.sh
+++ b/e2e/yaks/openshift/monitoring/obtainToken.sh
@@ -1,5 +1,20 @@
#!/bin/bash
+# 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.
+
SOURCE_DIR=$( dirname "${BASH_SOURCE[0]}")
TEST_FILE="${SOURCE_DIR}/metrics.feature"
diff --git a/examples/SampleModeline.java b/examples/SampleModeline.java
index 556eb2a..2226d50 100644
--- a/examples/SampleModeline.java
+++ b/examples/SampleModeline.java
@@ -1,6 +1,6 @@
// camel-k: dependency=mvn:com.google.guava/guava:28.0-jre
+
/*
- *
* 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.
diff --git a/examples/kamelets/kamelet-binding-example.yaml b/examples/kamelets/kamelet-binding-example.yaml
index d2fe9e6..33f51bb 100644
--- a/examples/kamelets/kamelet-binding-example.yaml
+++ b/examples/kamelets/kamelet-binding-example.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.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: KameletBinding
metadata:
diff --git a/examples/kamelets/timer-source.kamelet.yaml b/examples/kamelets/timer-source.kamelet.yaml
index 74f5824..467bca7 100644
--- a/examples/kamelets/timer-source.kamelet.yaml
+++ b/examples/kamelets/timer-source.kamelet.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.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
metadata:
diff --git a/jitpack.yml b/jitpack.yml
index 10b1ec6..49b98b8 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -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.
+# ---------------------------------------------------------------------------
+
jdk:
- openjdk11
install:
diff --git a/pkg/apis/camel/group.go b/pkg/apis/camel/group.go
index 90958df..4b483da 100644
--- a/pkg/apis/camel/group.go
+++ b/pkg/apis/camel/group.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 camel contains camel API versions.
//
// This file ensures Go source parsers acknowledge the camel package
diff --git a/pkg/apis/camel/v1alpha1/doc.go b/pkg/apis/camel/v1alpha1/doc.go
index 102912e..c9e1c78 100644
--- a/pkg/apis/camel/v1alpha1/doc.go
+++ b/pkg/apis/camel/v1alpha1/doc.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 v1alpha1 contains API Schema definitions for the camel v1alpha1 API group
// +k8s:deepcopy-gen=package,register
// +groupName=camel.apache.org
diff --git a/pkg/controller/kamelet/common.go b/pkg/controller/kamelet/common.go
index f0e9d97..437170e 100644
--- a/pkg/controller/kamelet/common.go
+++ b/pkg/controller/kamelet/common.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 kamelet
import (
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 95df4b8..fe1b5dd 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.2.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.5.1-SNAPSHOT"
+ DefaultRuntimeVersion = "1.5.0"
// BuildahVersion --
BuildahVersion = "1.14.0"
diff --git a/script/Makefile b/script/Makefile
index 1438292..ea48457 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -16,7 +16,7 @@
VERSIONFILE := pkg/util/defaults/defaults.go
VERSION := 1.2.0-SNAPSHOT
LAST_RELEASED_VERSION := 1.1.1
-RUNTIME_VERSION := 1.5.1-SNAPSHOT
+RUNTIME_VERSION := 1.5.0
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
BASE_IMAGE := adoptopenjdk/openjdk11:slim
@@ -30,7 +30,7 @@ LINT_DEADLINE := 10m
# Used to push pre-release artifacts
STAGING_IMAGE_NAME := docker.io/camelk/camel-k
-STAGING_RUNTIME_REPO :=
+STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1251
# Define here the repo containing the default Kamelet catalog (if any)
KAMELET_CATALOG_REPO :=