Skip to content

Commit 0fbf150

Browse files
TomaszGawedaTomaszGaweda
authored
Fix Lombok configuration (#734)
1 parent 633ed4d commit 0fbf150

File tree

11 files changed

+94
-52
lines changed

11 files changed

+94
-52
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ springHibernateDB
1919
osgi/felix-cache/
2020
.java-version
2121
*.code-workspace
22+
dependency-reduced-pom.xml
2223
/enterprise/tls-rbac-demo/keymaterial/

‎hazelcast-integration/openshift/client-apps/ocp-demo-frontend/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@
5656
<version>${spring.version}</version>
5757
</dependency>
5858

59-
<dependency>
60-
<groupId>org.projectlombok</groupId>
61-
<artifactId>lombok</artifactId>
62-
<optional>true</optional>
63-
</dependency>
64-
6559
<dependency>
6660
<groupId>org.springframework.boot</groupId>
6761
<artifactId>spring-boot-starter-test</artifactId>

‎jcache-1.1/times-table/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@
4646
<version>${javax-cache.version}</version>
4747
</dependency>
4848

49-
<dependency>
50-
<groupId>org.projectlombok</groupId>
51-
<artifactId>lombok</artifactId>
52-
</dependency>
53-
5449
<dependency>
5550
<groupId>org.slf4j</groupId>
5651
<artifactId>slf4j-api</artifactId>

‎jet/operator-jet-job-snapshot/jet-pipelines/pom.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,6 @@
1414

1515
<name>jet-pipelines</name>
1616

17-
<dependencies>
18-
<dependency>
19-
<groupId>com.hazelcast</groupId>
20-
<artifactId>hazelcast</artifactId>
21-
<version>${hazelcast.version}</version>
22-
</dependency>
23-
<dependency>
24-
<groupId>org.junit.jupiter</groupId>
25-
<artifactId>junit-jupiter-api</artifactId>
26-
<scope>test</scope>
27-
</dependency>
28-
</dependencies>
29-
3017
<build>
3118
<plugins>
3219
<plugin>

‎json/jsongrid/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
<artifactId>hsqldb</artifactId>
3434
</dependency>
3535

36-
<dependency>
37-
<groupId>org.projectlombok</groupId>
38-
<artifactId>lombok</artifactId>
39-
</dependency>
40-
4136
<dependency>
4237
<groupId>org.springframework.boot</groupId>
4338
<artifactId>spring-boot-starter</artifactId>

‎near-cache/fraud-detection/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@
2929
</modules>
3030

3131
<dependencies>
32-
<dependency>
33-
<groupId>org.projectlombok</groupId>
34-
<artifactId>lombok</artifactId>
35-
</dependency>
36-
3732
<dependency>
3833
<groupId>org.springframework.boot</groupId>
3934
<artifactId>spring-boot-starter</artifactId>

‎platform-operator/hazelcast-platform-operator-map-store/mapstore/dependency-reduced-pom.xml‎

Lines changed: 79 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<parent>
4+
<artifactId>operator-samples</artifactId>
5+
<groupId>com.hazelcast.samples</groupId>
6+
<version>0.1-SNAPSHOT</version>
7+
<relativePath>../../pom.xml</relativePath>
8+
</parent>
39
<modelVersion>4.0.0</modelVersion>
410
<groupId>com.hazelcast.operator.mongodb</groupId>
511
<artifactId>mapstore-mongodb</artifactId>
@@ -65,8 +71,79 @@
6571
</build>
6672
</profile>
6773
</profiles>
74+
<dependencies>
75+
<dependency>
76+
<groupId>org.junit.jupiter</groupId>
77+
<artifactId>junit-jupiter-api</artifactId>
78+
<version>5.11.4</version>
79+
<scope>test</scope>
80+
<exclusions>
81+
<exclusion>
82+
<artifactId>opentest4j</artifactId>
83+
<groupId>org.opentest4j</groupId>
84+
</exclusion>
85+
<exclusion>
86+
<artifactId>apiguardian-api</artifactId>
87+
<groupId>org.apiguardian</groupId>
88+
</exclusion>
89+
</exclusions>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.junit.vintage</groupId>
93+
<artifactId>junit-vintage-engine</artifactId>
94+
<version>5.11.4</version>
95+
<scope>test</scope>
96+
<exclusions>
97+
<exclusion>
98+
<artifactId>junit-platform-engine</artifactId>
99+
<groupId>org.junit.platform</groupId>
100+
</exclusion>
101+
<exclusion>
102+
<artifactId>junit</artifactId>
103+
<groupId>junit</groupId>
104+
</exclusion>
105+
<exclusion>
106+
<artifactId>apiguardian-api</artifactId>
107+
<groupId>org.apiguardian</groupId>
108+
</exclusion>
109+
</exclusions>
110+
</dependency>
111+
<dependency>
112+
<groupId>org.junit.jupiter</groupId>
113+
<artifactId>junit-jupiter-engine</artifactId>
114+
<version>5.11.4</version>
115+
<scope>test</scope>
116+
<exclusions>
117+
<exclusion>
118+
<artifactId>junit-platform-engine</artifactId>
119+
<groupId>org.junit.platform</groupId>
120+
</exclusion>
121+
<exclusion>
122+
<artifactId>apiguardian-api</artifactId>
123+
<groupId>org.apiguardian</groupId>
124+
</exclusion>
125+
</exclusions>
126+
</dependency>
127+
<dependency>
128+
<groupId>org.junit.platform</groupId>
129+
<artifactId>junit-platform-commons</artifactId>
130+
<version>1.11.4</version>
131+
<scope>test</scope>
132+
<exclusions>
133+
<exclusion>
134+
<artifactId>apiguardian-api</artifactId>
135+
<groupId>org.apiguardian</groupId>
136+
</exclusion>
137+
</exclusions>
138+
</dependency>
139+
<dependency>
140+
<groupId>org.assertj</groupId>
141+
<artifactId>assertj-core</artifactId>
142+
<version>3.24.2</version>
143+
<scope>test</scope>
144+
</dependency>
145+
</dependencies>
68146
<properties>
69-
<maven.compiler.target>11</maven.compiler.target>
70-
<maven.compiler.source>11</maven.compiler.source>
147+
<main.basedir>${project.parent.parent.basedir}</main.basedir>
71148
</properties>
72149
</project>

‎pom.xml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<maven.checkstyle.plugin.version>3.3.1</maven.checkstyle.plugin.version>
4545
<maven.assembly.plugin.version>3.0.0</maven.assembly.plugin.version>
4646

47-
<lombok.version>1.18.30</lombok.version>
47+
<lombok.version>1.18.40</lombok.version>
4848
<spring.boot.version>3.5.4</spring.boot.version>
4949
</properties>
5050

@@ -99,6 +99,13 @@
9999
<configuration>
100100
<release>${java.version}</release>
101101
<encoding>${project.build.sourceEncoding}</encoding>
102+
<annotationProcessorPaths>
103+
<path>
104+
<groupId>org.projectlombok</groupId>
105+
<artifactId>lombok</artifactId>
106+
<version>${lombok.version}</version>
107+
</path>
108+
</annotationProcessorPaths>
102109
</configuration>
103110
</plugin>
104111
<plugin>
@@ -227,6 +234,11 @@
227234
</dependencyManagement>
228235

229236
<dependencies>
237+
<dependency>
238+
<groupId>org.projectlombok</groupId>
239+
<artifactId>lombok</artifactId>
240+
<version>${lombok.version}</version>
241+
</dependency>
230242
<dependency>
231243
<groupId>org.junit.jupiter</groupId>
232244
<artifactId>junit-jupiter-api</artifactId>

‎spring/spring-data-hazelcast-chemistry-sample/pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,6 @@
5656
<artifactId>spring-data-hazelcast</artifactId>
5757
<version>${spring-data-hazelcast.version}</version>
5858
</dependency>
59-
<dependency>
60-
<groupId>com.hazelcast</groupId>
61-
<artifactId>hazelcast</artifactId>
62-
<version>${hazelcast.version}</version>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.projectlombok</groupId>
66-
<artifactId>lombok</artifactId>
67-
</dependency>
6859
<dependency>
6960
<groupId>org.jboss.spec.javax.annotation</groupId>
7061
<artifactId>jboss-annotations-api_1.2_spec</artifactId>

‎spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public abstract class AbstractNounRepositoryTest {
2525

2626
protected static Noun cat;
2727

28-
private Logger log;
28+
protected Logger log;
2929
private CrudRepository<Noun, Integer> nounRepository;
3030

3131
@BeforeClass

0 commit comments

Comments
 (0)