Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-07-04 17:52:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 5.0.x

Browse Source
This commit is contained in:
Peter-Josef Meisch 2022-03-19 19:56:05 +01:00
commit f91a4c18c4
No known key found for this signature in database
GPG Key ID: DE108246970C7708
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/springframework/data/elasticsearch/utils/geohash/BitUtil.java
View File

@ -30,7 +30,7 @@ public class BitUtil { // magic numbers for bit interleaving
/** /**
* Interleaves the first 32 bits of each long value Adapted from: * Interleaves the first 32 bits of each long value Adapted from:
* http://graphics.stanford.edu/~seander/bithacks.html#InterleaveBMN * https://graphics.stanford.edu/~seander/bithacks.html#InterleaveBMN
*/ */
public static long interleave(int even, int odd) { public static long interleave(int even, int odd) {
long v1 = 0x00000000FFFFFFFFL & even; long v1 = 0x00000000FFFFFFFFL & even;

6
src/test/resources/log4j2.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<Configuration strict="true" <Configuration strict="true"
xmlns="http://logging.apache.org/log4j/2.0/config" xmlns="https://logging.apache.org/log4j/2.0/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://logging.apache.org/log4j/2.0/config xsi:schemaLocation="https://logging.apache.org/log4j/2.0/config
https://raw.githubusercontent.com/apache/logging-log4j2/log4j-2.11.1/log4j-core/src/main/resources/Log4j-config.xsd"> https://raw.githubusercontent.com/apache/logging-log4j2/log4j-2.11.1/log4j-core/src/main/resources/Log4j-config.xsd">
<Appenders> <Appenders>
<Console name="console" target="SYSTEM_OUT"> <Console name="console" target="SYSTEM_OUT">