You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2021/11/02 06:55:43 UTC
[camel-k-runtime] branch main updated (345af2c -> 316264f)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git.
from 345af2c Updated CHANGELOG.md
new 9bbdc6b deps: update to camel-quarkus 2.4.0
new d0d582c fix: move tests classes to a dedicate package to avoid split package warning
new 6cd3ad4 deps: update directory-maven-plugin to v1.0.0
new 3f28222 deps: update gmavenplus-plugin to v1.13.0
new ec69384 deps: update maven-pmd-plugin to v3.15.0
new 88cdc7f deps: update checkstyle to v8.44
new bfb51db deps: update directory-maven-plugin to v1.0
new 5c51027 ci: switch to actions/setup-java@v2, use temurin distribution, build on java 17
new 9f7f52d deps: force asm version for maven-pmd-plugin
new c726ce5 chore: fix deprecation warnings
new fd84ba3 fix: adapt pom to build on Java 17
new 316264f chore: remove staging repo
The 12 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-camel-main.yaml | 7 +-
.github/workflows/ci-build.yml | 20 ++++--
.github/workflows/pr-validate.yml | 11 ++-
.../jsh/quarkus/{ => it}/JshApplication.java | 2 +-
.../camel/k/loader/jsh/{ => it}/JshLoaderTest.java | 2 +-
pom.xml | 80 +++++++++++++++-------
.../tooling/maven/GenerateDependencyListMojo.java | 6 +-
.../camel/k/tooling/maven/GenerateSupport.java | 4 +-
support/camel-k-runtime-bom/pom.xml | 31 ++++++++-
9 files changed, 119 insertions(+), 44 deletions(-)
rename itests/camel-k-itests-loader-jsh/src/main/java/org/apache/camel/k/loader/jsh/quarkus/{ => it}/JshApplication.java (96%)
rename itests/camel-k-itests-loader-jsh/src/test/java/org/apache/camel/k/loader/jsh/{ => it}/JshLoaderTest.java (97%)
[camel-k-runtime] 06/12: deps: update checkstyle to v8.44
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 88cdc7f0a976c2321819196ef7626037342faee2
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 22 18:31:58 2021 +0200
deps: update checkstyle to v8.44
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0346df6..6880cab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
<exec-maven-plugin-version>3.0.0</exec-maven-plugin-version>
<mycila-license-version>4.1</mycila-license-version>
<maven-checkstyle-plugin-version>3.1.2</maven-checkstyle-plugin-version>
- <maven-checkstyle-version>8.43</maven-checkstyle-version>
+ <maven-checkstyle-version>8.44</maven-checkstyle-version>
<maven-gpg-plugin-version>3.0.1</maven-gpg-plugin-version>
<maven-deploy-plugin-version>3.0.0-M1</maven-deploy-plugin-version>
<maven-javadoc-plugin-version>3.3.1</maven-javadoc-plugin-version>
[camel-k-runtime] 09/12: deps: force asm version for
maven-pmd-plugin
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 9f7f52d7ed9fe71275481d168fb567d20f4edd1b
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 22 19:03:07 2021 +0200
deps: force asm version for maven-pmd-plugin
---
pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/pom.xml b/pom.xml
index 3c5800b..4739e11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
<maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
<maven-site-plugin-version>3.9.1</maven-site-plugin-version>
<maven-pmd-plugin-version>3.15.0</maven-pmd-plugin-version>
+ <maven-pmd-plugin-asm-version>9.2</maven-pmd-plugin-asm-version>
<maven-plugin-plugin-version>3.6.1</maven-plugin-plugin-version>
<maven-version>3.6.3</maven-version>
<maven-plugin-tools-version>3.6.1</maven-plugin-tools-version>
@@ -1046,6 +1047,13 @@
<excludeRoot>${project.build.directory}/generated-sources</excludeRoot>
</excludeRoots>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${maven-pmd-plugin-asm-version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
[camel-k-runtime] 02/12: fix: move tests classes to a dedicate
package to avoid split package warning
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit d0d582ce9884308344f306e35f1822d83ab487b0
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 22 18:24:43 2021 +0200
fix: move tests classes to a dedicate package to avoid split package warning
---
.../org/apache/camel/k/loader/jsh/quarkus/{ => it}/JshApplication.java | 2 +-
.../test/java/org/apache/camel/k/loader/jsh/{ => it}/JshLoaderTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/itests/camel-k-itests-loader-jsh/src/main/java/org/apache/camel/k/loader/jsh/quarkus/JshApplication.java b/itests/camel-k-itests-loader-jsh/src/main/java/org/apache/camel/k/loader/jsh/quarkus/it/JshApplication.java
similarity index 96%
rename from itests/camel-k-itests-loader-jsh/src/main/java/org/apache/camel/k/loader/jsh/quarkus/JshApplication.java
rename to itests/camel-k-itests-loader-jsh/src/main/java/org/apache/camel/k/loader/jsh/quarkus/it/JshApplication.java
index fa9dfbf..33db01d 100644
--- a/itests/camel-k-itests-loader-jsh/src/main/java/org/apache/camel/k/loader/jsh/quarkus/JshApplication.java
+++ b/itests/camel-k-itests-loader-jsh/src/main/java/org/apache/camel/k/loader/jsh/quarkus/it/JshApplication.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.loader.jsh.quarkus;
+package org.apache.camel.k.loader.jsh.quarkus.it;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
diff --git a/itests/camel-k-itests-loader-jsh/src/test/java/org/apache/camel/k/loader/jsh/JshLoaderTest.java b/itests/camel-k-itests-loader-jsh/src/test/java/org/apache/camel/k/loader/jsh/it/JshLoaderTest.java
similarity index 97%
rename from itests/camel-k-itests-loader-jsh/src/test/java/org/apache/camel/k/loader/jsh/JshLoaderTest.java
rename to itests/camel-k-itests-loader-jsh/src/test/java/org/apache/camel/k/loader/jsh/it/JshLoaderTest.java
index d2b11ec..5a7e3c2 100644
--- a/itests/camel-k-itests-loader-jsh/src/test/java/org/apache/camel/k/loader/jsh/JshLoaderTest.java
+++ b/itests/camel-k-itests-loader-jsh/src/test/java/org/apache/camel/k/loader/jsh/it/JshLoaderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.loader.jsh;
+package org.apache.camel.k.loader.jsh.it;
import java.io.IOException;
import java.io.InputStream;
[camel-k-runtime] 11/12: fix: adapt pom to build on Java 17
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit fd84ba3606c2bf6ebc88a601d85a28516c0b1785
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 22 19:59:40 2021 +0200
fix: adapt pom to build on Java 17
---
support/camel-k-runtime-bom/pom.xml | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml
index b8ca927..030aab4 100644
--- a/support/camel-k-runtime-bom/pom.xml
+++ b/support/camel-k-runtime-bom/pom.xml
@@ -33,9 +33,12 @@
<properties>
<camel-version>3.11.0</camel-version>
-
+
<!-- reproduceable builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
<project.build.outputTimestamp>1</project.build.outputTimestamp>
+
+ <maven-enforcer-plugin-version>3.0.0</maven-enforcer-plugin-version>
+ <maven-version>3.6.3</maven-version>
</properties>
<developers>
@@ -222,6 +225,32 @@
</dependencies>
</dependencyManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>${maven-version}</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<profiles>
<profile>
<id>release</id>
[camel-k-runtime] 07/12: deps: update directory-maven-plugin to v1.0
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit bfb51dbb2dc3917267d1d8f6876a13325f1a1835
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 22 18:33:04 2021 +0200
deps: update directory-maven-plugin to v1.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6880cab..3c5800b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<maven-remote-resources-plugin-version>1.7.0</maven-remote-resources-plugin-version>
<maven-failsafe-plugin-version>3.0.0-M5</maven-failsafe-plugin-version>
<versions-maven-plugin-version>2.8.1</versions-maven-plugin-version>
- <directory-maven-plugin-version>1.0.0</directory-maven-plugin-version>
+ <directory-maven-plugin-version>1.0</directory-maven-plugin-version>
<exec-maven-plugin-version>3.0.0</exec-maven-plugin-version>
<mycila-license-version>4.1</mycila-license-version>
<maven-checkstyle-plugin-version>3.1.2</maven-checkstyle-plugin-version>
[camel-k-runtime] 08/12: ci: switch to actions/setup-java@v2,
use temurin distribution, build on java 17
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 5c51027a80a837192650e4c5b1d8130cb069f4e8
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 22 18:52:52 2021 +0200
ci: switch to actions/setup-java@v2, use temurin distribution, build on java 17
---
.github/workflows/ci-build-camel-main.yaml | 7 ++++---
.github/workflows/ci-build.yml | 20 +++++++++++++-------
.github/workflows/pr-validate.yml | 11 ++++++++---
3 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/ci-build-camel-main.yaml b/.github/workflows/ci-build-camel-main.yaml
index 3de0679..7ac83ab 100644
--- a/.github/workflows/ci-build-camel-main.yaml
+++ b/.github/workflows/ci-build-camel-main.yaml
@@ -49,10 +49,11 @@ jobs:
- uses: actions/checkout@v2
with:
persist-credentials: false
- - name: Set up JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v2
with:
- version: '11'
+ distribution: 'temurin'
+ java-version: ${{ matrix.java }}
- name: Cache Maven packages
uses: actions/cache@v2
with:
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 51cc111..2acfec9 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -46,14 +46,19 @@ on:
jobs:
build:
runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ java:
+ - '11'
steps:
- uses: actions/checkout@v2
with:
persist-credentials: false
- - name: Set up JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v2
with:
- version: '11'
+ distribution: 'temurin'
+ java-version: ${{ matrix.java }}
- name: Build camel-k-runtime
run: ./mvnw -V -ntp clean install
- name: Tar Maven Repo
@@ -69,15 +74,16 @@ jobs:
strategy:
matrix:
java:
- - '14'
+ - '17'
steps:
- uses: actions/checkout@v2
with:
persist-credentials: false
- - name: Set up JDK - ${{ matrix.java }}
- uses: AdoptOpenJDK/install-jdk@v1
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v2
with:
- version: ${{ matrix.java }}
+ distribution: 'temurin'
+ java-version: ${{ matrix.java }}
- name: Build on ${{ matrix.java }}
run: |
./mvnw ${MAVEN_ARGS} -B clean install
diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
index 09b59f9..384ceed 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -35,12 +35,17 @@ on:
jobs:
build:
runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ java:
+ - '11'
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v2
with:
- version: '11'
+ distribution: 'temurin'
+ java-version: ${{ matrix.java }}
- name: mvn package
run: |
./mvnw ${MAVEN_ARGS} \
[camel-k-runtime] 03/12: deps: update directory-maven-plugin to
v1.0.0
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 6cd3ad408efb572cb119fa8fa7586507f754ec62
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 22 18:29:09 2021 +0200
deps: update directory-maven-plugin to v1.0.0
---
pom.xml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index e94a7e3..410277c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<maven-remote-resources-plugin-version>1.7.0</maven-remote-resources-plugin-version>
<maven-failsafe-plugin-version>3.0.0-M5</maven-failsafe-plugin-version>
<versions-maven-plugin-version>2.8.1</versions-maven-plugin-version>
- <directory-maven-plugin-version>0.3.1</directory-maven-plugin-version>
+ <directory-maven-plugin-version>1.0.0</directory-maven-plugin-version>
<exec-maven-plugin-version>3.0.0</exec-maven-plugin-version>
<mycila-license-version>4.1</mycila-license-version>
<maven-checkstyle-plugin-version>3.1.2</maven-checkstyle-plugin-version>
@@ -204,13 +204,13 @@
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>${jandex-maven-plugin-version}</version>
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
<version>${jandex-version}</version>
- </dependency>
- </dependencies>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -264,25 +264,25 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-component-maven-plugin</artifactId>
<version>${camel-version}</version>
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
<version>${jandex-version}</version>
- </dependency>
- </dependencies>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
<version>${camel-version}</version>
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
<version>${jandex-version}</version>
- </dependency>
- </dependencies>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
[camel-k-runtime] 05/12: deps: update maven-pmd-plugin to v3.15.0
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit ec693847604d552fb8debd71fbdc0087e814e58b
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 22 18:31:17 2021 +0200
deps: update maven-pmd-plugin to v3.15.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7b20123..0346df6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
<maven-enforcer-plugin-version>3.0.0</maven-enforcer-plugin-version>
<maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
<maven-site-plugin-version>3.9.1</maven-site-plugin-version>
- <maven-pmd-plugin-version>3.14.0</maven-pmd-plugin-version>
+ <maven-pmd-plugin-version>3.15.0</maven-pmd-plugin-version>
<maven-plugin-plugin-version>3.6.1</maven-plugin-plugin-version>
<maven-version>3.6.3</maven-version>
<maven-plugin-tools-version>3.6.1</maven-plugin-tools-version>
[camel-k-runtime] 01/12: deps: update to camel-quarkus 2.4.0
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 9bbdc6b02b7a101dadd0b300bbdc48a56a906d94
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 22 18:24:05 2021 +0200
deps: update to camel-quarkus 2.4.0
---
pom.xml | 30 ++++++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index da99cbe..e94a7e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.11.2</version>
+ <version>3.12.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,12 +38,12 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
- <camel-version>3.11.2</camel-version>
+ <camel-version>3.12.0</camel-version>
<!-- quarkus -->
- <camel-quarkus-version>2.3.0</camel-quarkus-version>
+ <camel-quarkus-version>2.4.0</camel-quarkus-version>
<graalvm-version>21.2.0</graalvm-version>
- <quarkus-version>2.3.0.Final</quarkus-version>
+ <quarkus-version>2.4.0.Final</quarkus-version>
<!-- camel-k -->
<groovy-version>3.0.9</groovy-version>
@@ -382,6 +382,17 @@
<repositories>
<repository>
+ <id>camel.quarkus.staging</id>
+ <url>https://repository.apache.org/content/repositories/orgapachecamel-1370</url>
+ <name>Apache Snapshot Repo</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
<id>apache.snapshots</id>
<url>https://repository.apache.org/snapshots/</url>
<name>Apache Snapshot Repo</name>
@@ -396,6 +407,17 @@
<pluginRepositories>
<pluginRepository>
+ <id>camel.quarkus.staging</id>
+ <url>https://repository.apache.org/content/repositories/orgapachecamel-1370</url>
+ <name>Apache Snapshot Repo</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
<id>apache.snapshots</id>
<url>https://repository.apache.org/snapshots/</url>
<snapshots>
[camel-k-runtime] 12/12: chore: remove staging repo
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 316264f125a3a1fbe1bbd297fdb76fb8e0262845
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Tue Nov 2 07:28:15 2021 +0100
chore: remove staging repo
---
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pom.xml b/pom.xml
index 4739e11..dc796a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -382,6 +382,7 @@
</modules>
<repositories>
+ <!--
<repository>
<id>camel.quarkus.staging</id>
<url>https://repository.apache.org/content/repositories/orgapachecamel-1370</url>
@@ -393,6 +394,7 @@
<enabled>true</enabled>
</releases>
</repository>
+ -->
<repository>
<id>apache.snapshots</id>
<url>https://repository.apache.org/snapshots/</url>
@@ -407,6 +409,7 @@
</repositories>
<pluginRepositories>
+ <!--
<pluginRepository>
<id>camel.quarkus.staging</id>
<url>https://repository.apache.org/content/repositories/orgapachecamel-1370</url>
@@ -418,6 +421,7 @@
<enabled>true</enabled>
</releases>
</pluginRepository>
+ -->
<pluginRepository>
<id>apache.snapshots</id>
<url>https://repository.apache.org/snapshots/</url>
[camel-k-runtime] 10/12: chore: fix deprecation warnings
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit c726ce5ef11e6ff509a33799075098bc9c032d2d
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 22 19:07:38 2021 +0200
chore: fix deprecation warnings
---
.../apache/camel/k/tooling/maven/GenerateDependencyListMojo.java | 6 +++---
.../main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
index 09ba7f7..5cac698 100644
--- a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
+++ b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
@@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
import org.apache.maven.artifact.Artifact;
@@ -40,7 +41,6 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.utils.StringUtils;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
@@ -93,8 +93,8 @@ public class GenerateDependencyListMojo extends AbstractMojo {
}
private boolean isCompileOrRuntime(Artifact artifact) {
- return StringUtils.equals(artifact.getScope(), DefaultArtifact.SCOPE_COMPILE)
- || StringUtils.equals(artifact.getScope(), DefaultArtifact.SCOPE_RUNTIME);
+ return Objects.equals(artifact.getScope(), DefaultArtifact.SCOPE_COMPILE)
+ || Objects.equals(artifact.getScope(), DefaultArtifact.SCOPE_RUNTIME);
}
private Map<String, String> artifactToMap(Artifact artifact) {
diff --git a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java
index e8369d0..2f17bdf 100644
--- a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java
+++ b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import org.apache.maven.shared.utils.io.IOUtil;
+import org.apache.commons.io.IOUtils;
public final class GenerateSupport {
private GenerateSupport() {
@@ -32,7 +32,7 @@ public final class GenerateSupport {
throw new IllegalStateException("Unable to find catalog-license.txt");
}
- return IOUtil.toString(is, StandardCharsets.UTF_8.name());
+ return IOUtils.toString(is, StandardCharsets.UTF_8.name());
}
}
}
[camel-k-runtime] 04/12: deps: update gmavenplus-plugin to v1.13.0
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 3f282220923cdce336e5fd3c6380a0e40219dec1
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 22 18:29:37 2021 +0200
deps: update gmavenplus-plugin to v1.13.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 410277c..7b20123 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
<jandex-version>2.4.1.Final</jandex-version>
<!-- plugins -->
- <gmavenplus-plugin-version>1.12.1</gmavenplus-plugin-version>
+ <gmavenplus-plugin-version>1.13.0</gmavenplus-plugin-version>
<maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
<maven-surefire-plugin-version>3.0.0-M5</maven-surefire-plugin-version>
<maven-remote-resources-plugin-version>1.7.0</maven-remote-resources-plugin-version>