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/03/24 10:06:02 UTC
[camel-k] branch master updated (688673c -> cc9f468)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 688673c Support for configuring uninstall commmand through files and env vars
new 0c83120 chore(build): bump runtime to 1.2.1
new 794902b chore(build): fix build_catalog.sh script call
new cc9f468 chore(build): fix package_artifact.sh script call
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build/maven/pom-runtime.xml | 6 +++---
...PSHOT-main.yaml => camel-catalog-1.2.1-main.yaml} | 6 +++---
...quarkus.yaml => camel-catalog-1.2.1-quarkus.yaml} | 6 +++---
deploy/resources.go | 20 ++++++++++----------
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 8 ++++----
6 files changed, 24 insertions(+), 24 deletions(-)
rename deploy/{camel-catalog-1.2.0-SNAPSHOT-main.yaml => camel-catalog-1.2.1-main.yaml} (99%)
rename deploy/{camel-catalog-1.2.0-SNAPSHOT-quarkus.yaml => camel-catalog-1.2.1-quarkus.yaml} (99%)
[camel-k] 01/03: chore(build): bump runtime to 1.2.1
Posted by nf...@apache.org.
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
commit 0c83120e96ec2810d451b95fc8fa9a94c04983d4
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Fri Mar 20 16:32:08 2020 +0100
chore(build): bump runtime to 1.2.1
---
...PSHOT-main.yaml => camel-catalog-1.2.1-main.yaml} | 6 +++---
...quarkus.yaml => camel-catalog-1.2.1-quarkus.yaml} | 6 +++---
deploy/resources.go | 20 ++++++++++----------
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 4 ++--
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/deploy/camel-catalog-1.2.0-SNAPSHOT-main.yaml b/deploy/camel-catalog-1.2.1-main.yaml
similarity index 99%
rename from deploy/camel-catalog-1.2.0-SNAPSHOT-main.yaml
rename to deploy/camel-catalog-1.2.1-main.yaml
index 67eab49..fca16c6 100644
--- a/deploy/camel-catalog-1.2.0-SNAPSHOT-main.yaml
+++ b/deploy/camel-catalog-1.2.1-main.yaml
@@ -18,16 +18,16 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.2.0-snapshot-main
+ name: camel-catalog-1.2.1-main
labels:
app: camel-k
camel.apache.org/catalog.version: 3.1.0
camel.apache.org/catalog.loader.version: 3.1.0
- camel.apache.org/runtime.version: 1.2.0-SNAPSHOT
+ camel.apache.org/runtime.version: 1.2.1
camel.apache.org/runtime.provider: main
spec:
runtime:
- version: 1.2.0-SNAPSHOT
+ version: 1.2.1
provider: main
applicationClass: org.apache.camel.k.main.Application
metadata:
diff --git a/deploy/camel-catalog-1.2.0-SNAPSHOT-quarkus.yaml b/deploy/camel-catalog-1.2.1-quarkus.yaml
similarity index 99%
rename from deploy/camel-catalog-1.2.0-SNAPSHOT-quarkus.yaml
rename to deploy/camel-catalog-1.2.1-quarkus.yaml
index 0894b14..bd096c1 100644
--- a/deploy/camel-catalog-1.2.0-SNAPSHOT-quarkus.yaml
+++ b/deploy/camel-catalog-1.2.1-quarkus.yaml
@@ -18,16 +18,16 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.2.0-snapshot-quarkus
+ name: camel-catalog-1.2.1-quarkus
labels:
app: camel-k
camel.apache.org/catalog.version: 3.1.0
camel.apache.org/catalog.loader.version: 3.1.0
- camel.apache.org/runtime.version: 1.2.0-SNAPSHOT
+ camel.apache.org/runtime.version: 1.2.1
camel.apache.org/runtime.provider: quarkus
spec:
runtime:
- version: 1.2.0-SNAPSHOT
+ version: 1.2.1
provider: quarkus
applicationClass: io.quarkus.runner.GeneratedMain
metadata:
diff --git a/deploy/resources.go b/deploy/resources.go
index 24e11f4..f21b32a 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.2.0-SNAPSHOT-main.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.2.0-SNAPSHOT-main.yaml",
+ "/camel-catalog-1.2.1-main.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.2.1-main.yaml",
modTime: time.Time{},
- uncompressedSize: 87237,
+ uncompressedSize: 87210,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x7d\x5b\x77\xdb\x38\xb2\xee\x7b\x7e\x05\xd7\xe4\x65\xef\x75\x46\x98\x6e\x67\x66\xfa\xec\x3e\x4f\xb6\x1c\x27\x76\x6c\xc7\x1d\x7a\x92\xcc\xbc\xf4\x82\x48\x48\x82\x45\x12\x34\x00\xc9\xb2\x7f\xfd\x59\xb8\xf0\x2a\x08\x12\x59\x86\xd7\xf6\x83\x49\x11\x55\x5f\xb1\x00\x10\xd7\x42\xd5\xfb\x68\xf2\x7a\x7f\xef\xde\x47\xd7\x34\x21\x85\x20\x69\x24\x59\x24\x97\x24\x3a\x2d\x71\xb2\x24\x51\xcc\xe6\xf2\x09\x73\x12\x5d\xb0\x75\x91\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x7d\x5b\x77\xdb\x38\xb2\xee\x7b\x7e\x05\xd7\xe4\x65\xef\x75\x46\x98\x6e\x67\x66\xfa\xec\x3e\x4f\xb6\x1c\x27\x76\x6c\xc7\x1d\x7a\x92\xcc\xbc\xf4\x82\x48\x48\x82\x45\x12\x34\x00\xc9\xb2\x7f\xfd\x59\xb8\xf0\x2a\x08\x12\x59\x86\xd7\xf6\x83\x49\x11\x55\x5f\xb1\x08\x12\x97\x42\xa1\xea\x7d\x34\x79\xbd\xbf\x77\xef\xa3\x6b\x9a\x90\x42\x90\x34\x92\x2c\x92\x4b\x12\x9d\x96\x38\x59\x92\x28\x66\x73\xf9\x84\x39\x89\x2e\xd8\xba\x [...]
},
- "/camel-catalog-1.2.0-SNAPSHOT-quarkus.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.2.0-SNAPSHOT-quarkus.yaml",
+ "/camel-catalog-1.2.1-quarkus.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.2.1-quarkus.yaml",
modTime: time.Time{},
- uncompressedSize: 29208,
+ uncompressedSize: 29181,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x5d\x4b\x77\xdb\xb6\xf2\xdf\xeb\x53\xe0\xc4\x9b\x7b\xcf\x29\xd1\xb4\xf9\xb7\x8b\xfc\x57\xb6\x63\xb7\x76\x6c\xc7\x37\xd4\x6d\xd2\xee\x20\x12\x12\x61\x91\x00\x0d\x40\x0f\xfb\xd3\xdf\x03\x10\x14\x1f\xa6\x87\xa4\x0c\xc6\x0b\x8b\x22\x66\x7e\x83\x19\x3c\x06\x18\x3c\x74\x82\x02\x7f\x7f\xb3\x13\x74\xc3\x22\xca\x15\x8d\x91\x16\x48\x27\x14\x9d\xe6\x24\x4a\x28\x0a\xc5\x52\xef\x88\xa4\xe8\x52\x6c\x78\x4c\x34\x13\x1c\xfd\xeb\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x5d\x5b\x57\xdb\xba\xf2\x7f\xcf\xa7\xd0\x2a\x2f\xe7\xac\x55\xab\x17\xfe\x7b\x3f\xf0\x7f\x02\x0a\xdd\x50\x42\x7b\x1a\x4e\xdb\xbd\xdf\x14\x5b\x49\x44\x6c\xc9\x48\xca\x05\x3e\xfd\x59\x92\xe5\x2b\x66\x6c\x07\xb9\x3c\x10\xc7\x9a\xf9\x8d\x66\x74\x19\x69\x74\xc9\x11\x0a\xfc\xfd\x4d\x8e\xd0\x0d\x0b\x29\x57\x34\x42\x5a\x20\xbd\xa2\xe8\x34\x25\xe1\x8a\xa2\x99\x58\xe8\x1d\x91\x14\x5d\x8a\x0d\x8f\x88\x66\x82\xa3\x7f\x9d\xce\x [...]
},
"/cr-example.yaml": &vfsgen۰CompressedFileInfo{
name: "cr-example.yaml",
@@ -351,8 +351,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.2.0-SNAPSHOT-main.yaml"].(os.FileInfo),
- fs["/camel-catalog-1.2.0-SNAPSHOT-quarkus.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.2.1-main.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.2.1-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/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 55768ad..494f4fc 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.0.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.2.0-SNAPSHOT"
+ DefaultRuntimeVersion = "1.2.1"
// BuildahVersion --
BuildahVersion = "1.14.0"
diff --git a/script/Makefile b/script/Makefile
index 570a90a..99f1384 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -16,7 +16,7 @@
VERSIONFILE := pkg/util/defaults/defaults.go
VERSION := 1.0.0-SNAPSHOT
LAST_RELEASED_VERSION := 1.0.0-RC2
-RUNTIME_VERSION := 1.2.0-SNAPSHOT
+RUNTIME_VERSION := 1.2.1
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
BASE_IMAGE := adoptopenjdk/openjdk8: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 := https://repository.apache.org/content/repositories/orgapachecamel-1178
+STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1189
# When packaging artifacts into the docker image, you can "copy" them from local maven
# or "download" them from Apache Snapshots and Maven Central
[camel-k] 02/03: chore(build): fix build_catalog.sh script call
Posted by nf...@apache.org.
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
commit 794902bd7c91e886545cfd7a8051b551b4689ae2
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Fri Mar 20 17:31:37 2020 +0100
chore(build): fix build_catalog.sh script call
---
script/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/script/Makefile b/script/Makefile
index 99f1384..a029314 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -136,8 +136,8 @@ build-kamel:
go build $(GOFLAGS) -o kamel ./cmd/kamel/*.go
build-resources:
- STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" ./script/build_catalog.sh $(RUNTIME_VERSION) -Dcatalog.file=camel-catalog-$(RUNTIME_VERSION)-main.yaml
- STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" ./script/build_catalog.sh $(RUNTIME_VERSION) -Dcatalog.file=camel-catalog-$(RUNTIME_VERSION)-quarkus.yaml -Dcatalog.runtime=quarkus
+ ./script/build_catalog.sh $(RUNTIME_VERSION) -Dcatalog.file=camel-catalog-$(RUNTIME_VERSION)-main.yaml -Dstaging.repo="$(STAGING_RUNTIME_REPO)"
+ ./script/build_catalog.sh $(RUNTIME_VERSION) -Dcatalog.file=camel-catalog-$(RUNTIME_VERSION)-quarkus.yaml -Dcatalog.runtime=quarkus -Dstaging.repo="$(STAGING_RUNTIME_REPO)"
./script/embed_resources.sh deploy
build-olm:
[camel-k] 03/03: chore(build): fix package_artifact.sh script call
Posted by nf...@apache.org.
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
commit cc9f468548e05eb67728f89c6e92854475dba6ee
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Fri Mar 20 17:40:04 2020 +0100
chore(build): fix package_artifact.sh script call
---
build/maven/pom-runtime.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/maven/pom-runtime.xml b/build/maven/pom-runtime.xml
index 3afdd4a..748bcdb 100644
--- a/build/maven/pom-runtime.xml
+++ b/build/maven/pom-runtime.xml
@@ -327,14 +327,14 @@
<id>staging</id>
<activation>
<property>
- <name>env.STAGING_RUNTIME_REPO</name>
+ <name>staging.repo</name>
</property>
</activation>
<repositories>
<repository>
<id>staging</id>
- <url>${env.STAGING_RUNTIME_REPO}</url>
+ <url>${staging.repo}</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -347,7 +347,7 @@
<pluginRepositories>
<pluginRepository>
<id>staging</id>
- <url>${env.STAGING_RUNTIME_REPO}</url>
+ <url>${staging.repo}</url>
<releases>
<enabled>true</enabled>
</releases>