Skip to content

Commit 5fcac30

Browse files
vladakvladak
committed
Revert "Upgrade Chronicle-Map"
This reverts commit 9a26a1b. fixes #4423
1 parent 5c9062d commit 5fcac30

File tree

5 files changed

+32
-30
lines changed

5 files changed

+32
-30
lines changed

‎distribution/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<plugin>
5252
<groupId>org.apache.maven.plugins</groupId>
5353
<artifactId>maven-dependency-plugin</artifactId>
54-
<version>3.6.0</version>
54+
<version>3.1.0</version>
5555
<executions>
5656
<execution>
5757
<id>copy-dependencies</id>
@@ -70,7 +70,7 @@
7070
</plugin>
7171
<plugin>
7272
<artifactId>maven-assembly-plugin</artifactId>
73-
<version>3.6.0</version>
73+
<version>3.1.0</version>
7474
<configuration>
7575
<finalName>opengrok-${project.version}</finalName>
7676
<appendAssemblyId>false</appendAssemblyId>

‎opengrok-web/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
6868
<dependency>
6969
<groupId>jakarta.servlet.jsp</groupId>
7070
<artifactId>jakarta.servlet.jsp-api</artifactId>
71-
<version>3.1.1</version>
71+
<version>3.1.0</version>
7272
<scope>provided</scope>
7373
</dependency>
7474
<dependency>
7575
<groupId>org.glassfish.web</groupId>
7676
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
77-
<version>3.0.1</version>
77+
<version>2.0.0</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>org.glassfish.jersey.containers</groupId>
@@ -103,12 +103,12 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
103103
<dependency>
104104
<groupId>org.webjars</groupId>
105105
<artifactId>jquery</artifactId>
106-
<version>3.6.4</version>
106+
<version>3.6.0</version>
107107
</dependency>
108108
<dependency>
109109
<groupId>org.webjars.npm</groupId>
110110
<artifactId>showdown</artifactId>
111-
<version>2.1.0</version>
111+
<version>1.9.1</version>
112112
<!-- dependencies not required -->
113113
<exclusions>
114114
<exclusion>
@@ -132,7 +132,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
132132
<dependency>
133133
<groupId>org.webjars.npm</groupId>
134134
<artifactId>xss</artifactId>
135-
<version>1.0.10</version>
135+
<version>1.0.8</version>
136136
<!-- dependencies not required -->
137137
<exclusions>
138138
<exclusion>
@@ -181,7 +181,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
181181
<dependency>
182182
<groupId>org.modelmapper</groupId>
183183
<artifactId>modelmapper</artifactId>
184-
<version>3.1.1</version>
184+
<version>2.4.4</version>
185185
</dependency>
186186
<dependency>
187187
<groupId>org.hamcrest</groupId>

‎pom.xml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
7171
<jackson.version>2.15.2</jackson.version>
7272
<junit.version>5.10.0</junit.version>
7373
<hamcrest.version>2.2</hamcrest.version>
74-
<maven-surefire.version>3.1.2</maven-surefire.version>
74+
<maven-surefire.version>3.0.0-M5</maven-surefire.version>
7575
<apache-commons-lang3.version>3.13.0</apache-commons-lang3.version>
7676
<micrometer.version>1.11.4</micrometer.version>
7777
<mockito.version>3.12.4</mockito.version>
@@ -155,7 +155,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
155155
<dependency>
156156
<groupId>org.apache.ant</groupId>
157157
<artifactId>ant</artifactId>
158-
<version>1.10.14</version>
158+
<version>1.10.11</version>
159159
</dependency>
160160
<dependency>
161161
<groupId>org.glassfish.jaxb</groupId>
@@ -171,7 +171,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
171171
<dependency>
172172
<groupId>org.awaitility</groupId>
173173
<artifactId>awaitility</artifactId>
174-
<version>4.2.0</version>
174+
<version>4.1.0</version>
175175
<scope>test</scope>
176176
<exclusions>
177177
<exclusion>
@@ -183,7 +183,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
183183
<dependency>
184184
<groupId>org.jetbrains</groupId>
185185
<artifactId>annotations</artifactId>
186-
<version>24.0.1</version>
186+
<version>22.0.0</version>
187187
<scope>provided</scope>
188188
</dependency>
189189
</dependencies>
@@ -215,7 +215,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
215215
<plugin>
216216
<groupId>org.apache.maven.plugins</groupId>
217217
<artifactId>maven-enforcer-plugin</artifactId>
218-
<version>3.4.1</version>
218+
<version>3.0.0-M3</version>
219219
<executions>
220220
<execution>
221221
<id>enforce-maven</id>
@@ -238,7 +238,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
238238
</plugin>
239239
<plugin>
240240
<artifactId>maven-assembly-plugin</artifactId>
241-
<version>3.6.0</version>
241+
<version>3.1.0</version>
242242
<configuration>
243243
<descriptors>
244244
<descriptor>assembly.xml</descriptor>
@@ -259,7 +259,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
259259
<arg>-Xlint:-fallthrough</arg>
260260
</compilerArgs>
261261
</configuration>
262-
<version>3.11.0</version>
262+
<version>3.8.1</version>
263263
</plugin>
264264
<plugin>
265265
<!-- UNIT TEST RUNNER -->
@@ -283,7 +283,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
283283
<plugin>
284284
<groupId>org.jacoco</groupId>
285285
<artifactId>jacoco-maven-plugin</artifactId>
286-
<version>0.8.10</version>
286+
<version>0.8.7</version>
287287
<executions>
288288
<!-- Prepare execution with Surefire -->
289289
<execution>
@@ -353,25 +353,25 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
353353
</plugin>
354354
<plugin>
355355
<artifactId>maven-project-info-reports-plugin</artifactId>
356-
<version>3.4.5</version>
356+
<version>3.1.2</version>
357357
</plugin>
358358
<plugin>
359359
<groupId>org.apache.maven.plugins</groupId>
360360
<artifactId>maven-site-plugin</artifactId>
361-
<version>3.12.1</version>
361+
<version>3.9.1</version>
362362
</plugin>
363363
</plugins>
364364
<pluginManagement>
365365
<plugins>
366366
<plugin>
367367
<groupId>org.apache.maven.plugins</groupId>
368368
<artifactId>maven-checkstyle-plugin</artifactId>
369-
<version>3.3.0</version>
369+
<version>3.1.2</version>
370370
<dependencies>
371371
<dependency>
372372
<groupId>com.puppycrawl.tools</groupId>
373373
<artifactId>checkstyle</artifactId>
374-
<version>10.12.4</version>
374+
<version>9.1</version>
375375
</dependency>
376376
</dependencies>
377377
<executions>
@@ -380,6 +380,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
380380
<phase>validate</phase>
381381
<configuration>
382382
<configLocation>/dev/checkstyle/style.xml</configLocation>
383+
<encoding>UTF-8</encoding>
383384
<consoleOutput>true</consoleOutput>
384385
<failsOnError>true</failsOnError>
385386
<suppressionsLocation>/dev/checkstyle/suppressions.xml</suppressionsLocation>
@@ -397,7 +398,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
397398
<plugin>
398399
<groupId>org.apache.maven.plugins</groupId>
399400
<artifactId>maven-resources-plugin</artifactId>
400-
<version>3.3.1</version>
401+
<version>3.2.0</version>
401402
<configuration>
402403
<addDefaultExcludes>false</addDefaultExcludes>
403404
</configuration>
@@ -414,7 +415,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
414415
<plugin>
415416
<groupId>org.owasp</groupId>
416417
<artifactId>dependency-check-maven</artifactId>
417-
<version>8.4.0</version>
418+
<version>8.1.2</version>
418419
<configuration>
419420
<skipSystemScope>true</skipSystemScope>
420421
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
@@ -445,7 +446,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
445446
<plugin>
446447
<groupId>org.sonarsource.scanner.maven</groupId>
447448
<artifactId>sonar-maven-plugin</artifactId>
448-
<version>3.10.0.2594</version>
449+
<version>3.9.1.2184</version>
449450
</plugin>
450451
</plugins>
451452
</build>
@@ -457,7 +458,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
457458
<plugin>
458459
<groupId>com.github.spotbugs</groupId>
459460
<artifactId>spotbugs-maven-plugin</artifactId>
460-
<version>4.7.3.6</version>
461+
<version>4.2.3</version>
461462
<configuration>
462463
<xmlOutput>true</xmlOutput>
463464
<includeFilterFile>dev/findbugs_filter.xml</includeFilterFile>
@@ -520,7 +521,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
520521
<plugin>
521522
<groupId>org.apache.maven.plugins</groupId>
522523
<artifactId>maven-jxr-plugin</artifactId>
523-
<version>3.3.0</version>
524+
<version>3.1.1</version>
524525
</plugin>
525526
</plugins>
526527
</reporting>

‎suggester/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
101101
<dependency>
102102
<groupId>net.openhft</groupId>
103103
<artifactId>chronicle-map</artifactId>
104-
<version>3.22.9</version>
104+
<version>3.21.85</version>
105105
<exclusions>
106106
<exclusion>
107107
<groupId>com.sun.java</groupId>

‎suggester/src/main/java/org/opengrok/suggest/popular/impl/chronicle/BytesRefDataAccess.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.opengrok.suggest.popular.impl.chronicle;
2424

25-
import net.openhft.chronicle.bytes.BytesStore;
25+
import net.openhft.chronicle.bytes.HeapBytesStore;
2626
import net.openhft.chronicle.bytes.RandomDataInput;
2727
import net.openhft.chronicle.hash.AbstractData;
2828
import net.openhft.chronicle.hash.Data;
@@ -35,12 +35,13 @@
3535

3636
/**
3737
* {@link BytesRef} data serializer for {@link net.openhft.chronicle.map.ChronicleMap}.
38-
* Modified from <a href="https://github.com/OpenHFT/Chronicle-Map/blob/master/docs/CM_Tutorial_DataAccess.adoc">...</a>
38+
* Modified from https://github.com/OpenHFT/Chronicle-Map/blob/master/docs/CM_Tutorial_DataAccess.adoc
3939
*/
40+
@SuppressWarnings("deprecation")
4041
public class BytesRefDataAccess extends AbstractData<BytesRef> implements DataAccess<BytesRef> {
4142

4243
/** Cache field. */
43-
private transient BytesStore<?, ?> bs;
44+
private transient HeapBytesStore<byte[]> bs;
4445

4546
/** State field. */
4647
private transient byte[] array;
@@ -94,7 +95,7 @@ public Data<BytesRef> getData(@NotNull BytesRef instance) {
9495
array = new byte[instance.length];
9596
System.arraycopy(instance.bytes, instance.offset, array, 0, instance.length);
9697
}
97-
bs = BytesStore.wrap(array);
98+
bs = HeapBytesStore.wrap(array);
9899
return this;
99100
}
100101

0 commit comments

Comments
 (0)