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 022e126 preparing for next release
022e126 is described below
commit 022e12665d498cbbf68090f9d9948595d45e676d
Author: Nicola Ferraro <ni.ferr...@gmail.com>
AuthorDate: Tue Jul 21 14:53:51 2020 +0200
preparing for next release
---
pkg/util/flow/flow.go | 24 ++++++++++++------------
pkg/util/flow/flow_test.go | 28 ++++++++++++++--------------
release.adoc | 6 ++++++
script/Makefile | 2 +-
4 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/pkg/util/flow/flow.go b/pkg/util/flow/flow.go
index aaabd4d..e495d55 100644
--- a/pkg/util/flow/flow.go
+++ b/pkg/util/flow/flow.go
@@ -1,18 +1,18 @@
/*
- 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
+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
+ 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.
+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 flow
diff --git a/pkg/util/flow/flow_test.go b/pkg/util/flow/flow_test.go
index 4afb2ef..c9248cb 100644
--- a/pkg/util/flow/flow_test.go
+++ b/pkg/util/flow/flow_test.go
@@ -1,18 +1,18 @@
/*
- 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.
+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 flow
diff --git a/release.adoc b/release.adoc
index e142d5c..03a133f 100644
--- a/release.adoc
+++ b/release.adoc
@@ -61,6 +61,12 @@ The following tasks need to be done:
make clean codegen set-version build-resources check-licenses
```
+Rebuild auto-generated data, including trait info:
+
+```
+make generate
+```
+
Remove all snapshot files in the `/deploy` directory, then run again:
```
# After removing snapshots from /deploy
diff --git a/script/Makefile b/script/Makefile
index 7e42d29..fabc398 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -15,7 +15,7 @@
VERSIONFILE := pkg/util/defaults/defaults.go
VERSION := 1.1.0-SNAPSHOT
-LAST_RELEASED_VERSION := 1.0.0
+LAST_RELEASED_VERSION := 1.0.1
RUNTIME_VERSION := 1.4.1
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
