This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new bb578ff8c26 CAMEL-19108: camel-jbang - Export to support local lib JAR
via systemPath in Maven pom.xml
bb578ff8c26 is described below
commit bb578ff8c260e22c8fcc87a6e933216cd10ce20f
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Apr 12 11:49:50 2023 +0200
CAMEL-19108: camel-jbang - Export to support local lib JAR via systemPath
in Maven pom.xml
---
.../dsl/jbang/core/commands/ExportQuarkus.java | 23 +++++++++++-----------
.../dsl/jbang/core/commands/ExportSpringBoot.java | 17 +++++++++-------
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index 4b6e1675613..c551af1a63e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -41,8 +41,6 @@ import org.apache.commons.io.FileUtils;
class ExportQuarkus extends Export {
- private String camelVersion;
-
public ExportQuarkus(CamelJBangMain main) {
super(main);
}
@@ -239,8 +237,6 @@ class ExportQuarkus extends Export {
if (camelVersion == null) {
camelVersion = catalog.getCatalogVersion();
}
- String camelVersion = catalog.getCatalogVersion();
- String camelQuarkusVersion =
catalog.otherModel("camel-core-engine").getVersion();
context = context.replaceFirst("\\{\\{ \\.GroupId }}", ids[0]);
context = context.replaceFirst("\\{\\{ \\.ArtifactId }}", ids[1]);
@@ -270,7 +266,7 @@ class ExportQuarkus extends Export {
List<MavenGav> gavs = new ArrayList<>();
for (String dep : deps) {
- MavenGav gav = MavenGav.parseGav(dep);
+ MavenGav gav = parseMavenGav(dep);
String gid = gav.getGroupId();
String aid = gav.getArtifactId();
// transform to camel-quarkus extension GAV
@@ -281,7 +277,7 @@ class ExportQuarkus extends Export {
// use quarkus extension
gav.setGroupId(am.getGroupId());
gav.setArtifactId(am.getArtifactId());
- gav.setVersion(camelQuarkusVersion);
+ gav.setVersion(null); // uses BOM so version should not be
included
} else {
// there is no quarkus extension so use plain camel
gav.setVersion(camelVersion);
@@ -295,8 +291,12 @@ class ExportQuarkus extends Export {
StringBuilder sb = new StringBuilder();
for (MavenGav gav : gavs) {
- // special for camel-kamelets-utils
- if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+ if ("lib".equals(gav.getPackaging())) {
+ // special for lib JARs
+ sb.append(" implementation
files('lib/").append(gav.getArtifactId())
+
.append("-").append(gav.getVersion()).append(".jar')\n");
+ } else if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+ // special for camel-kamelets-utils
sb.append(" implementation ('").append(gav).append("')
{\n");
sb.append(" exclude group: 'org.apache.camel', module:
'*'\n");
sb.append(" }\n");
@@ -403,14 +403,13 @@ class ExportQuarkus extends Export {
if (gav.getVersion() != null) {
sb.append("
<version>").append(gav.getVersion()).append("</version>\n");
}
- // special for lib JARs
if ("lib".equals(gav.getPackaging())) {
+ // special for lib JARs
sb.append(" <scope>system</scope>\n");
sb.append("
<systemPath>\\$\\{project.basedir}/lib/").append(gav.getArtifactId()).append("-")
.append(gav.getVersion()).append(".jar</systemPath>\n");
- }
- // special for camel-kamelets-utils
- if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+ } else if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+ // special for camel-kamelets-utils
sb.append(" <exclusions>\n");
sb.append(" <exclusion>\n");
sb.append("
<groupId>org.apache.camel</groupId>\n");
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index 2a9c3bf2d11..dcb50fd593d 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -241,14 +241,13 @@ class ExportSpringBoot extends Export {
if (gav.getVersion() != null) {
sb.append("
<version>").append(gav.getVersion()).append("</version>\n");
}
- // special for lib JARs
if ("lib".equals(gav.getPackaging())) {
+ // special for lib JARs
sb.append(" <scope>system</scope>\n");
sb.append("
<systemPath>\\$\\{project.basedir}/lib/").append(gav.getArtifactId()).append("-")
.append(gav.getVersion()).append(".jar</systemPath>\n");
- }
- // special for camel-kamelets-utils
- if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+ } else if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+ // special for camel-kamelets-utils
sb.append(" <exclusions>\n");
sb.append(" <exclusion>\n");
sb.append("
<groupId>org.apache.camel</groupId>\n");
@@ -308,7 +307,7 @@ class ExportSpringBoot extends Export {
List<MavenGav> gavs = new ArrayList<>();
for (String dep : deps) {
- MavenGav gav = MavenGav.parseGav(dep);
+ MavenGav gav = parseMavenGav(dep);
String gid = gav.getGroupId();
String aid = gav.getArtifactId();
String v = gav.getVersion();
@@ -334,8 +333,12 @@ class ExportSpringBoot extends Export {
StringBuilder sb = new StringBuilder();
for (MavenGav gav : gavs) {
- // special for camel-kamelets-utils
- if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+ if ("lib".equals(gav.getPackaging())) {
+ // special for lib JARs
+ sb.append(" implementation
files('lib/").append(gav.getArtifactId())
+
.append("-").append(gav.getVersion()).append(".jar')\n");
+ } else if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+ // special for camel-kamelets-utils
sb.append(" implementation ('").append(gav).append("')
{\n");
sb.append(" exclude group: 'org.apache.camel', module:
'*'\n");
sb.append(" }\n");
