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/05 16:23:53 UTC
[camel-k] 02/02: Use env var to enable stagin profile
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 6853327afeb83f10e5738a2f9b55cb4ac26fa486
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Mar 3 11:23:36 2020 +0100
Use env var to enable stagin profile
---
build/maven/pom-runtime.xml | 8 ++++----
examples/greetings.groovy | 2 +-
script/Makefile | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/build/maven/pom-runtime.xml b/build/maven/pom-runtime.xml
index 6f9ef89..72dd8e0 100644
--- a/build/maven/pom-runtime.xml
+++ b/build/maven/pom-runtime.xml
@@ -74,7 +74,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-servlet</artifactId>
+ <artifactId>camel-k-runtime-inspector</artifactId>
<version>${runtime.version}</version>
</dependency>
<dependency>
@@ -301,14 +301,14 @@
<id>staging</id>
<activation>
<property>
- <name>staging.repo</name>
+ <name>env.STAGING_RUNTIME_REPO</name>
</property>
</activation>
<repositories>
<repository>
<id>staging</id>
- <url>${staging.repo}</url>
+ <url>${env.STAGING_RUNTIME_REPO}</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -321,7 +321,7 @@
<pluginRepositories>
<pluginRepository>
<id>staging</id>
- <url>${staging.repo}</url>
+ <url>${env.STAGING_RUNTIME_REPO}</url>
<releases>
<enabled>true</enabled>
</releases>
diff --git a/examples/greetings.groovy b/examples/greetings.groovy
index 0a96f50..54cccb4 100644
--- a/examples/greetings.groovy
+++ b/examples/greetings.groovy
@@ -17,7 +17,7 @@
*/
//
-// kamel run --dev --name greetings --dependency=camel-rest --dependency camel-undertow --property camel.rest.port=8080 --open-api examples/greetings-api.json --logging-level org.apache.camel.k=DEBUG examples/greetings.groovy
+// kamel run --dev --name greetings --property camel.rest.port=8080 --open-api examples/greetings-api.json examples/greetings.groovy
//
from('direct:greeting-api')
diff --git a/script/Makefile b/script/Makefile
index 6302293..db86084 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -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-1178
# When packaging artifacts into the docker image, you can "copy" them from local maven
# or "download" them from Apache Snapshots and Maven Central
@@ -136,8 +136,8 @@ build-kamel:
go build $(GOFLAGS) -o kamel ./cmd/kamel/*.go
build-resources:
- ./script/build_catalog.sh $(RUNTIME_VERSION) -Dstaging.repo=$(STAGING_RUNTIME_REPO) -Dcatalog.file=camel-catalog-$(RUNTIME_VERSION)-main.yaml
- ./script/build_catalog.sh $(RUNTIME_VERSION) -Dstaging.repo=$(STAGING_RUNTIME_REPO) -Dcatalog.file=camel-catalog-$(RUNTIME_VERSION)-quarkus.yaml -Dcatalog.runtime=quarkus
+ 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/embed_resources.sh deploy
build-olm: