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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 63d1ebb9829 Fix failures caused by jakarta updates (#707)
63d1ebb9829 is described below
commit 63d1ebb982925d300ed07a92719eb25091a3dd47
Author: Federico Mariani <[email protected]>
AuthorDate: Wed Jan 18 12:04:12 2023 +0100
Fix failures caused by jakarta updates (#707)
* Fix infinispan test
* Fix Jasypt test
---
components-starter/camel-infinispan-starter/pom.xml | 3 +--
.../camel/component/infinispan/remote/InfinispanRemoteProducerIT.java | 3 +--
.../org.springframework.boot.autoconfigure.AutoConfiguration.imports} | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/components-starter/camel-infinispan-starter/pom.xml
b/components-starter/camel-infinispan-starter/pom.xml
index ad88f6e418f..cb05cdea244 100644
--- a/components-starter/camel-infinispan-starter/pom.xml
+++ b/components-starter/camel-infinispan-starter/pom.xml
@@ -64,9 +64,8 @@
<!-- testing - infinispan -->
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
+ <artifactId>infinispan-core-jakarta</artifactId>
<version>${infinispan-version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java
index c9ce486bec6..f83f7473c45 100644
---
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java
+++
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.infinispan.remote;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.infinispan.InfinispanConstants;
import org.apache.camel.component.infinispan.InfinispanOperation;
@@ -80,7 +79,7 @@ public class InfinispanRemoteProducerIT extends
InfinispanRemoteTestSupport impl
.to("direct:start")
.withHeader(InfinispanConstants.OPERATION, InfinispanOperation.STATS)
.request(ServerStatistics.class)
-
.getIntStatistic(ServerStatistics.CURRENT_NR_OF_ENTRIES));
+
.getIntStatistic(ServerStatistics.APPROXIMATE_ENTRIES));
}
// *****************************
diff --git
a/components-starter/camel-jasypt-starter/src/main/resources/META-INF/spring.factories
b/components-starter/camel-jasypt-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 92%
rename from
components-starter/camel-jasypt-starter/src/main/resources/META-INF/spring.factories
rename to
components-starter/camel-jasypt-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 91c6204e729..f11bbc753a3 100644
---
a/components-starter/camel-jasypt-starter/src/main/resources/META-INF/spring.factories
+++
b/components-starter/camel-jasypt-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -14,5 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.jasypt.springboot.JasyptEncryptedPropertiesAutoconfiguration
+
+org.apache.camel.component.jasypt.springboot.JasyptEncryptedPropertiesAutoconfiguration
\ No newline at end of file
