This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 815d0f7a8ce2d2c9f7a81f5a4195ae526d7b3537
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Apr 23 11:18:24 2024 +0200
[CAMEL-20546] Move schemas in META-INF/camel
---
docs/gulpfile.js | 10 +++++-----
.../apache/camel/maven/packaging/PackageDataFormatMojo.java | 2 +-
.../org/apache/camel/maven/packaging/PackageLanguageMojo.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index 7858f78442b..c7c18df9a45 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -127,8 +127,8 @@ const sources = {
},
json: {
source: [
-
'../components/{*,*/*,*/*/*}/src/generated/resources/org/apache/camel/**/*.json',
-
'../core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/*.json',
+
'../components/{*,*/*,*/*/*}/src/generated/resources/META-INF/org/apache/camel/**/*.json',
+
'../core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/*.json',
],
destination: 'components/modules/dataformats/examples/json',
filter: (content) => JSON.parse(content).dataformat, // check if there
is a "dataformat" key at the root
@@ -147,9 +147,9 @@ const sources = {
},
json: {
source: [
-
'../components/{*,*/*,*/*/*}/src/generated/resources/org/apache/camel/*/**/*.json',
-
'../core/camel-core-languages/src/generated/resources/org/apache/camel/language/**/*.json',
-
'../core/camel-core-model/src/generated/resources/org/apache/camel/model/language/*.json',
+
'../components/{*,*/*,*/*/*}/src/generated/resources/META-INF/org/apache/camel/*/**/*.json',
+
'../core/camel-core-languages/src/generated/resources/META-INF/org/apache/camel/language/**/*.json',
+
'../core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/language/*.json',
],
destination: 'components/modules/languages/examples/json',
filter: (content) => JSON.parse(content).language, // check if there is
a "language" key at the root
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index a6a26d85d01..807f2824443 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -493,7 +493,7 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
private static String schemaSubDirectory(String javaType) {
int idx = javaType.lastIndexOf('.');
String pckName = javaType.substring(0, idx);
- return pckName.replace('.', '/');
+ return "META-INF/" + pckName.replace('.', '/');
}
private List<DataFormatOptionModel> parseConfigurationSource(MavenProject
project, String className)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index c097ab7d7fb..3a7d4eb9d37 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -323,7 +323,7 @@ public class PackageLanguageMojo extends
AbstractGeneratorMojo {
private static String schemaSubDirectory(String javaType) {
int idx = javaType.lastIndexOf('.');
String pckName = javaType.substring(0, idx);
- return pckName.replace('.', '/');
+ return "META-INF/" + pckName.replace('.', '/');
}
}
