This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 5483fc84a47 CAMEL-18465: remove unnecessary 'jigsaw' profile
5483fc84a47 is described below
commit 5483fc84a476bec500aa14ff9b145b61799799b7
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Mon Sep 5 13:28:02 2022 +0200
CAMEL-18465: remove unnecessary 'jigsaw' profile
Since 3.15 Camel supports Java 11 and newer, so it would always be active
by default.
---
.../camel-yaml-dsl-maven-plugin/pom.xml | 21 +++++----------------
tooling/maven/camel-package-maven-plugin/pom.xml | 18 +++++-------------
2 files changed, 10 insertions(+), 29 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
index 72ca48038db..5fa014b3092 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
@@ -127,6 +127,11 @@
<artifactId>javapoet</artifactId>
<version>${javapoet-version}</version>
</dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -168,20 +173,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>jigsaw</id>
- <activation>
- <jdk>[1.9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml
b/tooling/maven/camel-package-maven-plugin/pom.xml
index 2eeafde7c77..b7a3a6d96de 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -175,6 +175,11 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -192,19 +197,6 @@
</build>
<profiles>
- <profile>
- <id>jigsaw</id>
- <activation>
- <jdk>[1.9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>plugin-itest</id>
<build>
