You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/04/28 12:42:50 UTC
[camel-kamelets] branch main updated (5c3d6e0 -> f3d1bad)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git.
from 5c3d6e0 Cron Source Kamelet better description in properties
new 9a9258e Move wrapper into maven modules
new bf3157e Maven Wrapper moved in maven modules
new f3d1bad Reflect new Maven Wrapper position in gh action
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:
.github/workflows/main-push-regen.yaml | 3 ++-
.../.mvn}/wrapper/MavenWrapperDownloader.java | 0
.../.mvn}/wrapper/maven-wrapper.jar | Bin
.../.mvn}/wrapper/maven-wrapper.properties | 0
mvnw => camel-kamelets-catalog/mvnw | 0
mvnw.cmd => camel-kamelets-catalog/mvnw.cmd | 0
6 files changed, 2 insertions(+), 1 deletion(-)
rename {.mvn => camel-kamelets-catalog/.mvn}/wrapper/MavenWrapperDownloader.java (100%)
rename {.mvn => camel-kamelets-catalog/.mvn}/wrapper/maven-wrapper.jar (100%)
rename {.mvn => camel-kamelets-catalog/.mvn}/wrapper/maven-wrapper.properties (100%)
rename mvnw => camel-kamelets-catalog/mvnw (100%)
rename mvnw.cmd => camel-kamelets-catalog/mvnw.cmd (100%)
[camel-kamelets] 03/03: Reflect new Maven Wrapper position in gh
action
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit f3d1badcc5cdcdad612f8cd66b7578b0f09f1477
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 28 14:42:19 2021 +0200
Reflect new Maven Wrapper position in gh action
---
.github/workflows/main-push-regen.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/main-push-regen.yaml b/.github/workflows/main-push-regen.yaml
index 9f955f3..7fc765c 100644
--- a/.github/workflows/main-push-regen.yaml
+++ b/.github/workflows/main-push-regen.yaml
@@ -42,7 +42,8 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build catalog
- run: ./mvnw clean install -f camel-kamelets-catalog/pom.xml
+ working-directory: ./camel-kamelets-catalog
+ run: ./mvnw clean install
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
[camel-kamelets] 01/03: Move wrapper into maven modules
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 9a9258ea5f4b8ce01e06e195724e25beb571d35d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 28 14:40:43 2021 +0200
Move wrapper into maven modules
---
.../.mvn}/wrapper/MavenWrapperDownloader.java | 0
.../.mvn}/wrapper/maven-wrapper.jar | Bin
.../.mvn}/wrapper/maven-wrapper.properties | 0
mvnw => camel-kamelets-catalog/mvnw | 0
mvnw.cmd => camel-kamelets-catalog/mvnw.cmd | 0
camel-kamelets-catalog/pom.xml | 2 +-
6 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/camel-kamelets-catalog/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from .mvn/wrapper/MavenWrapperDownloader.java
rename to camel-kamelets-catalog/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/.mvn/wrapper/maven-wrapper.jar b/camel-kamelets-catalog/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from .mvn/wrapper/maven-wrapper.jar
rename to camel-kamelets-catalog/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/camel-kamelets-catalog/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from .mvn/wrapper/maven-wrapper.properties
rename to camel-kamelets-catalog/.mvn/wrapper/maven-wrapper.properties
diff --git a/mvnw b/camel-kamelets-catalog/mvnw
similarity index 100%
rename from mvnw
rename to camel-kamelets-catalog/mvnw
diff --git a/mvnw.cmd b/camel-kamelets-catalog/mvnw.cmd
similarity index 100%
rename from mvnw.cmd
rename to camel-kamelets-catalog/mvnw.cmd
diff --git a/camel-kamelets-catalog/pom.xml b/camel-kamelets-catalog/pom.xml
index 229509b..2d12dc9 100644
--- a/camel-kamelets-catalog/pom.xml
+++ b/camel-kamelets-catalog/pom.xml
@@ -295,7 +295,7 @@
<outputDirectory>src/main/resources/kamelets</outputDirectory>
<resources>
<resource>
- <directory>../</directory>
+ <directory>${project.basedir}/../</directory>
<includes>
<include>*.kamelet.yaml</include>
</includes>
[camel-kamelets] 02/03: Maven Wrapper moved in maven modules
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit bf3157e769420e2024d47a60d9d0e2025f91b852
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 28 14:41:17 2021 +0200
Maven Wrapper moved in maven modules
---
camel-kamelets-catalog/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-kamelets-catalog/pom.xml b/camel-kamelets-catalog/pom.xml
index 2d12dc9..229509b 100644
--- a/camel-kamelets-catalog/pom.xml
+++ b/camel-kamelets-catalog/pom.xml
@@ -295,7 +295,7 @@
<outputDirectory>src/main/resources/kamelets</outputDirectory>
<resources>
<resource>
- <directory>${project.basedir}/../</directory>
+ <directory>../</directory>
<includes>
<include>*.kamelet.yaml</include>
</includes>