This is an automated email from the ASF dual-hosted git repository.
oalsafi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 40f8d9d CAMEL-16503: Fix unresolved camel version in the generated
spring schemas (#5363)
40f8d9d is described below
commit 40f8d9d502f9b9c05dc01bdfcb788d4630f0b6e9
Author: Omar Al-Safi <omars...@gmail.com>
AuthorDate: Wed Apr 14 17:37:54 2021 +0200
CAMEL-16503: Fix unresolved camel version in the generated spring schemas
(#5363)
* CAMEL-16503: Fix unresolved camel version in the generated spring schemas
* CAMEL-16503: Add version 3.9
* CAMEL-16503: Fix unresolved camel version in spring schemas in camel-cxf
* CAMEL-16503: Fix unresolved camel version in spring security and
integration
---
components/camel-cxf/pom.xml | 3 +-
.../src/main/resources/META-INF/spring.schemas | 6 ++--
.../src/main/resources/META-INF/spring.schemas | 1 +
components/camel-spring-security/pom.xml | 39 ++++++++++++++++++++++
.../src/main/resources/META-INF/spring.schemas | 1 +
components/camel-spring-xml/pom.xml | 5 +--
.../src/main/resources/META-INF/spring.schemas | 3 +-
7 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index c02dcfb..e29f755 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -438,8 +438,7 @@
<include name="**/spring.*" />
</fileset>
</copy>
- <replace
file="${project.build.directory}/spring-meta/META-INF/spring.handlers"
token="\\${project.version}" value="${project.version}"
preservelastmodified="true" />
- <replace
file="${project.build.directory}/spring-meta/META-INF/spring.schemas"
token="\\${project.version}" value="${project.version}"
preservelastmodified="true" />
+ <replace
file="${project.build.directory}/spring-meta/META-INF/spring.schemas"
token="$${camel.version}" value="${project.version}"
preservelastmodified="true" />
<copy
todir="${project.build.directory}/classes" preservelastmodified="true">
<fileset
dir="${project.build.directory}/spring-meta" />
</copy>
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index 064f753..3637be0 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -166,7 +166,8 @@
http\://camel.apache.org/schema/cxf/camel-cxf-3.7.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-3.7.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-3.7.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-3.8.0.xsd=schema/cxfEndpoint.xsd
-http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-3.9.0.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-${camel.version}.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-spring.xsd=schema/cxfEndpoint.xsd
@@ -318,4 +319,5 @@
http\://camel.apache.org/schema/cxf/camel-cxf-3.7.1-spring.xsd=schema/cxfEndpoin
http\://camel.apache.org/schema/cxf/camel-cxf-3.7.2-spring.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-3.7.3-spring.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-3.8.0-spring.xsd=schema/cxfEndpoint.xsd
-http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}-spring.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-3.9.0-spring.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-${camel.version}-spring.xsd=schema/cxfEndpoint.xsd
diff --git
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index 6eab775..2a0787c 100644
---
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -165,4 +165,5 @@
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-3.7.
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-3.7.2.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-3.7.3.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-3.8.0.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-3.9.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd
diff --git a/components/camel-spring-security/pom.xml
b/components/camel-spring-security/pom.xml
index 86bdb84..d618321 100644
--- a/components/camel-spring-security/pom.xml
+++ b/components/camel-spring-security/pom.xml
@@ -109,8 +109,47 @@
<build>
<defaultGoal>install</defaultGoal>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-resources</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-resources-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
diff --git
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
index 9fd56d5..4e91c57 100644
---
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
@@ -159,4 +159,5 @@
http\://camel.apache.org/schema/spring-security/camel-spring-security-3.7.1.xsd=
http\://camel.apache.org/schema/spring-security/camel-spring-security-3.7.2.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-3.7.3.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-3.8.0.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-3.9.0.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-${project.version}.xsd=schema/camel-spring-security.xsd
diff --git a/components/camel-spring-xml/pom.xml
b/components/camel-spring-xml/pom.xml
index c243454..a7e4074 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -518,8 +518,9 @@
<copy
todir="${project.build.directory}/spring-meta" preservelastmodified="true">
<fileset
dir="${project.basedir}/src/main/resources" />
</copy>
- <replace
file="${project.build.directory}/spring-meta/META-INF/spring.handlers"
token="\\${camel.schema.version}" value="${camel.schema.version}"
preservelastmodified="true" />
- <replace
file="${project.build.directory}/spring-meta/META-INF/spring.schemas"
token="\\${camel.schema.version}" value="${camel.schema.version}"
preservelastmodified="true" />
+ <replace
file="${project.build.directory}/spring-meta/META-INF/spring.handlers"
token="$${camel.schema.version}" value="${camel.schema.version}"
preservelastmodified="true" />
+ <replace
file="${project.build.directory}/spring-meta/META-INF/spring.schemas"
token="$${camel.schema.version}" value="${camel.schema.version}"
preservelastmodified="true" />
+ <replace
file="${project.build.directory}/spring-meta/META-INF/spring.schemas"
token="$${camel.version}" value="${project.version}"
preservelastmodified="true" />
<copy
todir="${project.build.directory}/classes" preservelastmodified="true">
<fileset
dir="${project.build.directory}/spring-meta" />
</copy>
diff --git
a/components/camel-spring-xml/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-xml/src/main/resources/META-INF/spring.schemas
index edb47f7..72f8924 100644
--- a/components/camel-spring-xml/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-spring-xml/src/main/resources/META-INF/spring.schemas
@@ -167,4 +167,5 @@
http\://camel.apache.org/schema/spring/camel-spring-3.7.1.xsd=camel-spring.xsd
http\://camel.apache.org/schema/spring/camel-spring-3.7.2.xsd=camel-spring.xsd
http\://camel.apache.org/schema/spring/camel-spring-3.7.3.xsd=camel-spring.xsd
http\://camel.apache.org/schema/spring/camel-spring-3.8.0.xsd=camel-spring.xsd
-http\://camel.apache.org/schema/spring/camel-spring-${project.version}.xsd=camel-spring.xsd
+http\://camel.apache.org/schema/spring/camel-spring-3.9.0.xsd=camel-spring.xsd
+http\://camel.apache.org/schema/spring/camel-spring-${camel.version}.xsd=camel-spring.xsd
