Skip to content

Commit bf5cf6b

Browse files
pruivokaresti
authored andcommitted
Upgrade Infinispan to 14.0.9.Final
* Remove duplicated properties * Ensure all modules use the same Infinispan version
1 parent 67266fa commit bf5cf6b

File tree

7 files changed

+36
-20
lines changed

7 files changed

+36
-20
lines changed

integrations/hibernate/local/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
<name>Infinispan Simple Tutorials: Hibernate Cache Local</name>
1313

1414
<properties>
15-
<version.hibernate-core>6.2.0.Final</version.hibernate-core>
1615
<version.h2>1.3.176</version.h2>
17-
<version.log4j>2.14.0</version.log4j>
1816
</properties>
1917

2018
<build>
@@ -46,11 +44,12 @@
4644
<dependency>
4745
<groupId>org.hibernate</groupId>
4846
<artifactId>hibernate-core</artifactId>
49-
<version>${version.hibernate-core}</version>
47+
<version>${version.hibernate.core}</version>
5048
</dependency>
5149
<dependency>
5250
<groupId>org.infinispan</groupId>
5351
<artifactId>infinispan-hibernate-cache-v62</artifactId>
52+
<!-- Not present in BOM. See https://issues.redhat.com/browse/ISPN-14841 -->
5453
<version>${version.infinispan}</version>
5554
</dependency>
5655
<dependency>

integrations/hibernate/spring-local/pom.xml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,30 @@
1010
<version>1.0.0-SNAPSHOT</version>
1111

1212
<parent>
13-
<groupId>org.springframework.boot</groupId>
14-
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>3.0.5</version>
13+
<relativePath>../../../pom.xml</relativePath>
14+
<version>1.0.0-SNAPSHOT</version>
15+
<groupId>org.infinispan.tutorial.simple</groupId>
16+
<artifactId>infinispan-simple-tutorials</artifactId>
1617
</parent>
1718

18-
<properties>
19-
<java.version>1.8</java.version>
20-
</properties>
19+
<dependencyManagement>
20+
<dependencies>
21+
<dependency>
22+
<groupId>org.infinispan</groupId>
23+
<artifactId>infinispan-bom</artifactId>
24+
<version>${version.infinispan}</version>
25+
<scope>import</scope>
26+
<type>pom</type>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-starter-parent</artifactId>
31+
<version>${version.spring.boot3}</version>
32+
<type>pom</type>
33+
<scope>import</scope>
34+
</dependency>
35+
</dependencies>
36+
</dependencyManagement>
2137

2238
<dependencies>
2339
<dependency>
@@ -31,7 +47,8 @@
3147
<dependency>
3248
<groupId>org.infinispan</groupId>
3349
<artifactId>infinispan-hibernate-cache-v62</artifactId>
34-
<version>14.0.8.Final</version>
50+
<!-- Not present in BOM. See https://issues.redhat.com/browse/ISPN-14841 -->
51+
<version>${version.infinispan}</version>
3552
</dependency>
3653
</dependencies>
3754

@@ -40,6 +57,7 @@
4057
<plugin>
4158
<groupId>org.springframework.boot</groupId>
4259
<artifactId>spring-boot-maven-plugin</artifactId>
60+
<version>${version.spring.boot3}</version>
4361
</plugin>
4462
<plugin>
4563
<groupId>org.codehaus.mojo</groupId>

integrations/spring-boot/cache-embedded/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<plugin>
6666
<groupId>org.springframework.boot</groupId>
6767
<artifactId>spring-boot-maven-plugin</artifactId>
68+
<version>${version.spring.boot3}</version>
6869
</plugin>
6970
</plugins>
7071
</build>

integrations/spring-boot/cache-remote/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<plugin>
6666
<groupId>org.springframework.boot</groupId>
6767
<artifactId>spring-boot-maven-plugin</artifactId>
68+
<version>${version.spring.boot3}</version>
6869
</plugin>
6970
</plugins>
7071
</build>

integrations/spring-boot/session-embedded/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<plugin>
5656
<groupId>org.springframework.boot</groupId>
5757
<artifactId>spring-boot-maven-plugin</artifactId>
58+
<version>${version.spring.boot3}</version>
5859
</plugin>
5960
</plugins>
6061
</build>

integrations/spring-boot/session-remote/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<plugin>
6060
<groupId>org.springframework.boot</groupId>
6161
<artifactId>spring-boot-maven-plugin</artifactId>
62+
<version>${version.spring.boot3}</version>
6263
</plugin>
6364
</plugins>
6465
</build>

pom.xml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>org.infinispan</groupId>
44
<artifactId>infinispan-build-configuration-parent</artifactId>
5-
<version>14.0.8.Final</version>
5+
<version>14.0.9.Final</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<groupId>org.infinispan.tutorial.simple</groupId>
@@ -12,12 +12,6 @@
1212

1313
<name>Infinispan Tutorial: Simple tutorials</name>
1414

15-
<properties>
16-
<version.infinispan>14.0.8.Final</version.infinispan>
17-
<version.protostream>4.6.2.Final</version.protostream>
18-
<java.version>17</java.version>
19-
</properties>
20-
2115
<dependencyManagement>
2216
<dependencies>
2317
<dependency>
@@ -41,10 +35,11 @@
4135
<plugin>
4236
<groupId>org.apache.maven.plugins</groupId>
4337
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>3.8.1</version>
38+
<version>${version.maven-compiler-plugin}</version>
4539
<configuration>
46-
<source>11</source>
47-
<target>11</target>
40+
<source>${maven.compiler.source}</source>
41+
<target>${maven.compiler.target}</target>
42+
<encoding>UTF-8</encoding>
4843
</configuration>
4944
</plugin>
5045
<plugin>

0 commit comments

Comments
 (0)