Skip to content

Commit cadcd21

Browse files
karestikaresti
committed
Updates for 16.0
1 parent bc5f22a commit cadcd21

File tree

11 files changed

+45
-88
lines changed

11 files changed

+45
-88
lines changed

‎infinispan-remote/connect-to-infinispan-server/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>org.testcontainers</groupId>
2626
<artifactId>testcontainers</artifactId>
27-
<version>1.20.4</version>
27+
<version>${testcontainers.version}</version>
2828
</dependency>
2929
</dependencies>
3030
</project>

‎infinispan-remote/connect-to-infinispan-server/src/main/java/org/infinispan/tutorial/simple/connect/TutorialsConnectorHelper.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.infinispan.client.hotrod.RemoteCacheManager;
55
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
66
import org.infinispan.client.hotrod.impl.ConfigurationProperties;
7+
import org.infinispan.commons.util.Version;
78
import org.infinispan.server.test.core.InfinispanContainer;
89

910
/**
@@ -23,7 +24,6 @@ public class TutorialsConnectorHelper {
2324
"<distributed-cache name=\"CACHE_NAME\" statistics=\"true\">\n"
2425
+ " <encoding media-type=\"application/x-protostream\"/>\n"
2526
+ "</distributed-cache>";
26-
2727
/**
2828
* Returns the configuration builder with the connection information
2929
*
@@ -104,13 +104,19 @@ public static InfinispanContainer startInfinispanContainer() {
104104

105105
public static InfinispanContainer startInfinispanContainer(long millis) {
106106
try {
107-
INFINISPAN_CONTAINER = new InfinispanContainer();
107+
if (Version.getUnbrandedVersion().contains("SNAPSHOT")) {
108+
// we are using an Infinispan Dev version, use the latest build of the image
109+
INFINISPAN_CONTAINER = new InfinispanContainer("quay.io/infinispan-test/server:main");
110+
} else {
111+
INFINISPAN_CONTAINER = new InfinispanContainer();
112+
}
108113
INFINISPAN_CONTAINER.withUser(USER);
109114
INFINISPAN_CONTAINER.withPassword(PASSWORD);
110115
INFINISPAN_CONTAINER.start();
111116
Thread.sleep(millis);
112117
} catch (Exception ex) {
113118
System.out.println("Unable to start Infinispan container");
119+
stopInfinispanContainer();
114120
return null;
115121
}
116122
return INFINISPAN_CONTAINER;

‎infinispan-remote/continuous-query/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,6 @@
4343
<artifactId>connect-to-infinispan-server</artifactId>
4444
<version>${project.version}</version>
4545
</dependency>
46-
<dependency>
47-
<groupId>org.infinispan</groupId>
48-
<artifactId>infinispan-client-hotrod</artifactId>
49-
</dependency>
50-
<dependency>
51-
<groupId>org.infinispan</groupId>
52-
<artifactId>infinispan-remote-query-client</artifactId>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.infinispan</groupId>
56-
<artifactId>infinispan-query-dsl</artifactId>
57-
</dependency>
5846
<dependency>
5947
<groupId>org.infinispan.protostream</groupId>
6048
<artifactId>protostream-processor</artifactId>

‎infinispan-remote/junit5/pom.xml

-9
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,4 @@
2222
<scope>test</scope>
2323
</dependency>
2424
</dependencies>
25-
<build>
26-
<plugins>
27-
<!-- JUnit 5 requires Surefire version 2.22.1 or higher -->
28-
<plugin>
29-
<artifactId>maven-surefire-plugin</artifactId>
30-
<version>3.5.2</version>
31-
</plugin>
32-
</plugins>
33-
</build>
3425
</project>

‎infinispan-remote/junit5/src/test/java/org/infinispan/tutorial/simple/remote/junit5/CachingServiceTest.java

+18-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import org.infinispan.client.hotrod.RemoteCache;
44
import org.infinispan.client.hotrod.RemoteCacheManager;
5+
import org.infinispan.commons.util.Version;
6+
import org.infinispan.server.test.core.ServerRunMode;
7+
import org.infinispan.server.test.core.TestSystemPropertyNames;
58
import org.infinispan.server.test.junit5.InfinispanServerExtension;
69
import org.infinispan.server.test.junit5.InfinispanServerExtensionBuilder;
710
import org.junit.jupiter.api.Test;
@@ -16,7 +19,21 @@
1619
public class CachingServiceTest {
1720

1821
@RegisterExtension
19-
static InfinispanServerExtension infinispanServerExtension = InfinispanServerExtensionBuilder.server();
22+
static InfinispanServerExtension infinispanServerExtension = buildExtension();
23+
24+
static InfinispanServerExtension buildExtension() {
25+
if (Version.getUnbrandedVersion().contains("SNAPSHOT")) {
26+
// In our dev branch, we need to build with the latest main branch image.
27+
return InfinispanServerExtensionBuilder
28+
.config()
29+
.numServers(1)
30+
.runMode(ServerRunMode.CONTAINER)
31+
.property(TestSystemPropertyNames.INFINISPAN_TEST_SERVER_BASE_IMAGE_NAME, "quay.io/infinispan-test/server:main")
32+
.build();
33+
}
34+
35+
return InfinispanServerExtensionBuilder.server();
36+
}
2037

2138
@Test
2239
public void testUsingRemoteCacheManager(){

‎infinispan-remote/per-cache-configuration/src/main/java/org/infinispan/tutorial/simple/remote/percache/InfinispanRemotePerCache.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.infinispan.tutorial.simple.remote.percache;
22

3-
import org.infinispan.client.hotrod.DefaultTemplate;
43
import org.infinispan.client.hotrod.RemoteCache;
54
import org.infinispan.client.hotrod.RemoteCacheManager;
65
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
6+
import org.infinispan.commons.configuration.StringConfiguration;
77
import org.infinispan.tutorial.simple.connect.TutorialsConnectorHelper;
88

99
/**
@@ -24,6 +24,7 @@ public class InfinispanRemotePerCache {
2424
public static final String MY_CACHE = "my-cache";
2525
public static final String ANOTHER_CACHE = "another-cache";
2626
public static final String URI_CACHE = "uri-cache";
27+
public static final String MY_CUSTOM_TEMPLATE = "my-custom-template";
2728
static RemoteCacheManager cacheManager;
2829
static RemoteCache<String, String> cache;
2930
static RemoteCache<String, String> anotherCache;
@@ -64,7 +65,9 @@ public static void connectToInfinispan() throws Exception {
6465

6566
//Add per-cache configuration that uses an org.infinispan cache template.
6667
builder.remoteCache(MY_CACHE)
67-
.templateName(DefaultTemplate.DIST_SYNC);
68+
// we can declare a template, even if the template does not exist yet.
69+
// however, the template has to be present on first access to create the cache.
70+
.templateName(MY_CUSTOM_TEMPLATE);
6871
//Add per-cache configuration with a cache definition in XML format.
6972
builder.remoteCache(ANOTHER_CACHE)
7073
.configuration("<distributed-cache name=\"another-cache\"><encoding media-type=\"application/x-protostream\"/></distributed-cache>");
@@ -73,6 +76,9 @@ public static void connectToInfinispan() throws Exception {
7376
InfinispanRemotePerCache.class.getClassLoader().getResource("cacheConfig.xml").toURI());
7477

7578
cacheManager = TutorialsConnectorHelper.connect(builder);
79+
// create the template that is used to create MY-CACHE on first access
80+
cacheManager.administration().removeTemplate(MY_CUSTOM_TEMPLATE);
81+
cacheManager.administration().createTemplate(MY_CUSTOM_TEMPLATE, new StringConfiguration("<distributed-cache><encoding media-type=\"application/x-protostream\"/></distributed-cache>"));
7682
}
7783

7884
public static void disconnect(boolean removeCaches) {

‎infinispan-remote/persistence/sql-store/pom.xml

-16
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,6 @@
2626
<artifactId>connect-to-infinispan-server</artifactId>
2727
<version>${project.version}</version>
2828
</dependency>
29-
<dependency>
30-
<groupId>org.infinispan</groupId>
31-
<artifactId>infinispan-client-hotrod</artifactId>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.infinispan</groupId>
35-
<artifactId>infinispan-remote-query-client</artifactId>
36-
</dependency>
3729
<dependency>
3830
<groupId>org.infinispan.protostream</groupId>
3931
<artifactId>protostream-processor</artifactId>
@@ -58,14 +50,6 @@
5850

5951
<build>
6052
<plugins>
61-
<plugin>
62-
<artifactId>maven-compiler-plugin</artifactId>
63-
<version>3.8.1</version>
64-
</plugin>
65-
<plugin>
66-
<artifactId>maven-surefire-plugin</artifactId>
67-
<version>3.5.2</version>
68-
</plugin>
6953
<plugin>
7054
<groupId>org.codehaus.mojo</groupId>
7155
<artifactId>exec-maven-plugin</artifactId>

‎infinispan-remote/programmatic-protostream-marshalling/pom.xml

-23
Original file line numberDiff line numberDiff line change
@@ -42,29 +42,6 @@
4242
<artifactId>connect-to-infinispan-server</artifactId>
4343
<version>${project.version}</version>
4444
</dependency>
45-
46-
<dependency>
47-
<groupId>org.infinispan</groupId>
48-
<artifactId>infinispan-api</artifactId>
49-
</dependency>
50-
<dependency>
51-
<groupId>org.infinispan</groupId>
52-
<artifactId>infinispan-client-hotrod</artifactId>
53-
</dependency>
54-
55-
<dependency>
56-
<groupId>org.infinispan</groupId>
57-
<artifactId>infinispan-remote-query-client</artifactId>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.infinispan</groupId>
61-
<artifactId>infinispan-query-dsl</artifactId>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.infinispan.protostream</groupId>
65-
<artifactId>protostream-processor</artifactId>
66-
<version>${version.protostream}</version>
67-
</dependency>
6845
<dependency>
6946
<groupId>org.junit.jupiter</groupId>
7047
<artifactId>junit-jupiter</artifactId>

‎infinispan-remote/query/pom.xml

-18
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,6 @@
4242
<artifactId>connect-to-infinispan-server</artifactId>
4343
<version>${project.version}</version>
4444
</dependency>
45-
46-
<dependency>
47-
<groupId>org.infinispan</groupId>
48-
<artifactId>infinispan-api</artifactId>
49-
</dependency>
50-
<dependency>
51-
<groupId>org.infinispan</groupId>
52-
<artifactId>infinispan-client-hotrod</artifactId>
53-
</dependency>
54-
55-
<dependency>
56-
<groupId>org.infinispan</groupId>
57-
<artifactId>infinispan-remote-query-client</artifactId>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.infinispan</groupId>
61-
<artifactId>infinispan-query-dsl</artifactId>
62-
</dependency>
6345
<dependency>
6446
<groupId>org.infinispan.protostream</groupId>
6547
<artifactId>protostream-processor</artifactId>

‎infinispan-remote/spatial-queries/pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
<artifactId>connect-to-infinispan-server</artifactId>
1818
<version>${project.version}</version>
1919
</dependency>
20+
<dependency>
21+
<groupId>org.infinispan.protostream</groupId>
22+
<artifactId>protostream-processor</artifactId>
23+
<version>${version.protostream}</version>
24+
</dependency>
2025
<dependency>
2126
<groupId>org.junit.jupiter</groupId>
2227
<artifactId>junit-jupiter</artifactId>
@@ -25,7 +30,7 @@
2530
<dependency>
2631
<groupId>org.assertj</groupId>
2732
<artifactId>assertj-core</artifactId>
28-
<version>3.27.3</version>
33+
<version>${assertj.version}</version>
2934
<scope>test</scope>
3035
</dependency>
3136
</dependencies>

‎pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212

1313
<name>Infinispan Tutorial: Simple tutorials</name>
1414
<properties>
15-
<testcontainers.version>1.19.1</testcontainers.version>
15+
<testcontainers.version>1.20.6</testcontainers.version>
16+
<assertj.version>3.27.3</assertj.version>
1617
</properties>
1718
<repositories>
1819
<repository>
@@ -56,7 +57,7 @@
5657
<plugin>
5758
<groupId>org.apache.maven.plugins</groupId>
5859
<artifactId>maven-compiler-plugin</artifactId>
59-
<version>${version.maven-compiler-plugin}</version>
60+
<version>${version.maven.compiler}</version>
6061
<configuration>
6162
<source>${maven.compiler.source}</source>
6263
<target>${maven.compiler.target}</target>
@@ -74,7 +75,7 @@
7475
<plugin>
7576
<groupId>org.apache.maven.plugins</groupId>
7677
<artifactId>maven-enforcer-plugin</artifactId>
77-
<version>${version.enforcer.plugin}</version>
78+
<version>${version.maven.enforcer}</version>
7879
<executions>
7980
<execution>
8081
<id>enforce-java</id>

0 commit comments

Comments
 (0)