You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/03/08 08:57:31 UTC
[camel-k-runtime] branch release-1.15.x updated (d3021ea8 -> a92a8462)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
from d3021ea8 [maven-release-plugin] prepare for next development iteration
new 41a50487 feat(ci): publish snapshot on release branches
new fbb1aee7 fix(ci): proper directory
new f9f7c628 fix(ci): settings dir
new 6a968790 fix(ci): using a profile for distribution artifact
new a92a8462 fix(ci): publish distro within the rest of modules
The 5 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/ci-build.yml | 7 ++--
distribution/pom.xml | 77 ++++++++++++++++++++----------------------
2 files changed, 41 insertions(+), 43 deletions(-)
[camel-k-runtime] 01/05: feat(ci): publish snapshot on release branches
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 41a5048711ec18ded669852e303ff7f0f3028fd5
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Oct 21 16:29:56 2022 +0200
feat(ci): publish snapshot on release branches
and push also sources and m2 (required by Camel K)
---
.github/workflows/ci-build.yml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 1716ed6e..0faad693 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -180,7 +180,8 @@ jobs:
needs:
- build-native
- build-native-examples
- if: github.ref == 'refs/heads/main'
+ # Run only when pushing to the branches (either main or release), never on merge requests
+ if: ${{ github.event_name == 'push' }}
env:
NEXUS_DEPLOY_USERNAME: ${{ secrets.NEXUS_USER }}
NEXUS_DEPLOY_PASSWORD: ${{ secrets.NEXUS_PW }}
@@ -193,4 +194,8 @@ jobs:
with:
version: '11'
- name: Deploy to ASF Snapshots Repository
- run: ./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml
+ # Deploy both artifacts and sources (may be required by Camel K)
+ run: |
+ ./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml
+ cd distribution
+ ./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml -Prelease
[camel-k-runtime] 02/05: fix(ci): proper directory
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit fbb1aee74fa1af50eb1c933007b8bf7b44549791
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Oct 24 10:51:20 2022 +0200
fix(ci): proper directory
---
.github/workflows/ci-build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 0faad693..5a380f51 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -198,4 +198,4 @@ jobs:
run: |
./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml
cd distribution
- ./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml -Prelease
+ ../mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml -Prelease
[camel-k-runtime] 05/05: fix(ci): publish distro within the rest of modules
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit a92a84626bfd446c8d24251d2c3d2ea37ae1bc85
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Oct 24 13:29:10 2022 +0200
fix(ci): publish distro within the rest of modules
---
.github/workflows/ci-build.yml | 3 --
distribution/pom.xml | 77 ++++++++++++++++++++----------------------
2 files changed, 36 insertions(+), 44 deletions(-)
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 5b04e035..c2719d6a 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -197,6 +197,3 @@ jobs:
# Deploy both artifacts and sources (may be required by Camel K)
run: |
./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml
- ./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml \
- -Pdistribution \
- -f distribution/pom.xml
diff --git a/distribution/pom.xml b/distribution/pom.xml
index d46ad666..e5277198 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,45 +27,40 @@
<packaging>pom</packaging>
<artifactId>apache-camel-k-runtime</artifactId>
- <profiles>
- <profile>
- <id>distribution</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin-version}</version>
- <executions>
- <execution>
- <id>source-release</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>apache-camel-k-runtime-${project.version}</finalName>
- <descriptors>
- <descriptor>src/main/assemblies/source-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>maven-repository</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assemblies/repository.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>source-release</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>apache-camel-k-runtime-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/main/assemblies/source-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>maven-repository</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assemblies/repository.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
[camel-k-runtime] 03/05: fix(ci): settings dir
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit f9f7c6284f8f7467fcf23f29670793cac544682d
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Oct 24 10:52:13 2022 +0200
fix(ci): settings dir
---
.github/workflows/ci-build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 5a380f51..1d001356 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -198,4 +198,4 @@ jobs:
run: |
./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml
cd distribution
- ../mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml -Prelease
+ ../mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings ../.github/asf-deploy-settings.xml -Prelease
[camel-k-runtime] 04/05: fix(ci): using a profile for distribution artifact
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 6a9687901898b5c6198ccf197a46cab1f94c0560
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Oct 24 13:15:43 2022 +0200
fix(ci): using a profile for distribution artifact
---
.github/workflows/ci-build.yml | 5 +++--
distribution/pom.xml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 1d001356..5b04e035 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -197,5 +197,6 @@ jobs:
# Deploy both artifacts and sources (may be required by Camel K)
run: |
./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml
- cd distribution
- ../mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings ../.github/asf-deploy-settings.xml -Prelease
+ ./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml \
+ -Pdistribution \
+ -f distribution/pom.xml
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 7132dacd..d46ad666 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -29,7 +29,7 @@
<artifactId>apache-camel-k-runtime</artifactId>
<profiles>
<profile>
- <id>release</id>
+ <id>distribution</id>
<build>
<plugins>
<plugin>