You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/12/24 09:50:51 UTC
[camel-karaf] branch main updated (491c8e1 -> c17069b)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git.
from 491c8e1 Upgrade Karaf to version 4.3.4
new 28a9188 CAMEL-17329: Drop Java 8 and set source/target to Java 11
new c17069b CAMEL-17329: Drop Java 8 and set source/target to Java 11
The 2 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:
pom.xml | 2 +-
.../camel-catalog-generator-karaf-maven-plugin/pom.xml | 16 ++++++++++++++++
tooling/camel-karaf-docs-maven-plugin/pom.xml | 18 +++++++++++++++++-
tooling/camel-karaf-maven-plugin/pom.xml | 1 +
4 files changed, 35 insertions(+), 2 deletions(-)
[camel-karaf] 01/02: CAMEL-17329: Drop Java 8 and set source/target to Java 11
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 28a91888a5250b7d5485481a332fd7eeac04c418
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 24 10:36:46 2021 +0100
CAMEL-17329: Drop Java 8 and set source/target to Java 11
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 24fa48c..ccf31ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<site-repo-url>scpexe://people.apache.org/www/camel.apache.org/maven/</site-repo-url>
- <jdk.version>1.8</jdk.version>
+ <jdk.version>11</jdk.version>
<compiler.fork>false</compiler.fork>
<!-- Camel target version -->
[camel-karaf] 02/02: CAMEL-17329: Drop Java 8 and set source/target to Java 11
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit c17069bad1a1ec021b94a6eeb4920c95105cfd31
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 24 10:43:17 2021 +0100
CAMEL-17329: Drop Java 8 and set source/target to Java 11
---
.../camel-catalog-generator-karaf-maven-plugin/pom.xml | 16 ++++++++++++++++
tooling/camel-karaf-docs-maven-plugin/pom.xml | 18 +++++++++++++++++-
tooling/camel-karaf-maven-plugin/pom.xml | 1 +
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml b/tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml
index 172d228..ecd960d 100644
--- a/tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml
+++ b/tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml
@@ -72,4 +72,20 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin-version}</version>
+ <configuration>
+ <mojoDependencies>
+ <dep>org.codehaus.mojo:exec-maven-plugin</dep>
+ <dep>org.apache.maven:maven-plugin-api</dep>
+ </mojoDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/tooling/camel-karaf-docs-maven-plugin/pom.xml b/tooling/camel-karaf-docs-maven-plugin/pom.xml
index e33c922..7e5c8a8 100644
--- a/tooling/camel-karaf-docs-maven-plugin/pom.xml
+++ b/tooling/camel-karaf-docs-maven-plugin/pom.xml
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.0</version>
+ <version>${maven-plugin-plugin-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -201,4 +201,20 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin-version}</version>
+ <configuration>
+ <mojoDependencies>
+ <dep>org.codehaus.mojo:exec-maven-plugin</dep>
+ <dep>org.apache.maven:maven-plugin-api</dep>
+ </mojoDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/tooling/camel-karaf-maven-plugin/pom.xml b/tooling/camel-karaf-maven-plugin/pom.xml
index 4eb4cbe..ab344b5 100644
--- a/tooling/camel-karaf-maven-plugin/pom.xml
+++ b/tooling/camel-karaf-maven-plugin/pom.xml
@@ -100,6 +100,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin-version}</version>
<configuration>
<mojoDependencies>
<dep>org.codehaus.mojo:exec-maven-plugin</dep>