Skip to content

Commit a04ff33

Browse files
committed
Merge branch 'develop' into release
2 parents 4d18e3a + af1b6f8 commit a04ff33

File tree

146 files changed

+1383
-441
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+1383
-441
lines changed

.github/dependabot.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,33 @@ updates:
33
- package-ecosystem: maven
44
directory: "/"
55
schedule:
6-
interval: daily
6+
interval: weekly
77
target-branch: main
8+
ignore:
9+
# Ignore minor version updates for dependencies with group ID "com.google.errorprone"
10+
- dependency-name: "com.google.errorprone:*"
11+
update-types: [ "version-update:semver-minor" ]
12+
groups:
13+
security:
14+
# Group security updates into a single pull request
15+
applies-to: security-updates
16+
patterns:
17+
- "*"
18+
production-dependencies:
19+
# Group version updates for "production" dependencies into a single pull request
20+
applies-to: version-updates
21+
dependency-type: production
22+
patterns:
23+
- "*"
24+
development-dependencies:
25+
# Group version updates for "development" dependencies into a single pull request
26+
applies-to: version-updates
27+
dependency-type: development
28+
patterns:
29+
- "*"
830

931
- package-ecosystem: "github-actions"
1032
directory: "/"
1133
schedule:
12-
interval: "daily"
34+
interval: "weekly"
1335
target-branch: main

.github/workflows/build.yml

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
strategy:
2424
matrix:
25-
java: ['11', '17']
25+
java: [ '11', '17' ]
2626
env:
2727
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2828

@@ -39,11 +39,11 @@ jobs:
3939
cache: 'maven'
4040

4141
- name: Build with Maven
42-
run: mvn -B -ff -ntp clean install -Dgpg.skip=true
42+
run: mvn -B -ff -ntp clean install
4343

4444
- name: Publish Code Coverage
4545
if: github.ref == 'refs/heads/main' && matrix.java == '11'
46-
uses: codecov/codecov-action@v4
46+
uses: codecov/codecov-action@v5
4747
with:
4848
token: ${{ secrets.CODECOV_TOKEN }}
4949
flags: unittests
@@ -70,7 +70,7 @@ jobs:
7070
cache: 'maven'
7171

7272
- name: Build with Maven
73-
run: mvn -B -ff -ntp clean install -Dgpg.skip=true
73+
run: mvn -B -ff -ntp clean install
7474

7575
build_windows:
7676
runs-on: windows-latest
@@ -93,4 +93,26 @@ jobs:
9393
cache: 'maven'
9494

9595
- name: Build with Maven
96-
run: mvn -B -ff -ntp clean install --% -Dgpg.skip=true
96+
run: mvn -B -ff -ntp clean install
97+
98+
verify-native:
99+
name: Verify GraalVM ${{ matrix.java }} compatibility on ${{ matrix.os }}
100+
strategy:
101+
matrix:
102+
os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest' ]
103+
java: [ '17', '21' ]
104+
runs-on: ${{ matrix.os }}
105+
steps:
106+
- uses: actions/checkout@v4
107+
108+
- uses: graalvm/[email protected]
109+
with:
110+
java-version: ${{ matrix.java }}
111+
distribution: 'graalvm-community'
112+
113+
- name: Install nitrite
114+
run: mvn -B -ff -ntp clean install -DskipTests
115+
116+
- name: Run native tests
117+
working-directory: ./nitrite-native-tests
118+
run: mvn -B -ff -ntp -PnativeTest verify

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
5252

5353
- name: Deploy Release
54-
run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
54+
run: mvn -P deploy -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
5555
shell: bash
5656
env:
5757
MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}

.github/workflows/snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
5252

5353
- name: Deploy Snapshot
54-
run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
54+
run: mvn -P deploy -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
5555
shell: bash
5656
env:
5757
MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}

CHANGELOG.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
1-
## Release 4.3.0
1+
## Release 4.3.1
2+
3+
### New Changes
4+
5+
- GraalVM support for nitrite-mvstore-adapter #995
6+
- Event subscription api changes
7+
8+
### Issue Fixes
9+
10+
- Fix for `Document.getFields()` not returning iterable fields
11+
- Fix for failing tests on systems with non-ENGLISH locale #994
12+
- Fix for NPE in `DefaultTransactionalRepository` #1032
13+
- Fix for JPMS issue #1035
14+
- Fix for RocksDB adapter issue #1093
15+
16+
## Release 4.3.0 - Jul 1, 2024
217

318
### New Changes
419

nitrite-bom/pom.xml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.dizitart</groupId>
66
<artifactId>nitrite-java</artifactId>
7-
<version>4.3.0</version>
7+
<version>4.3.1</version>
88
</parent>
99

1010
<artifactId>nitrite-bom</artifactId>
@@ -67,17 +67,4 @@
6767
<snapshots><enabled>true</enabled></snapshots>
6868
</repository>
6969
</repositories>
70-
71-
<build>
72-
<plugins>
73-
<plugin>
74-
<groupId>org.apache.maven.plugins</groupId>
75-
<artifactId>maven-gpg-plugin</artifactId>
76-
</plugin>
77-
<plugin>
78-
<groupId>org.sonatype.plugins</groupId>
79-
<artifactId>nexus-staging-maven-plugin</artifactId>
80-
</plugin>
81-
</plugins>
82-
</build>
8370
</project>

nitrite-jackson-mapper/pom.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.dizitart</groupId>
66
<artifactId>nitrite-java</artifactId>
7-
<version>4.3.0</version>
7+
<version>4.3.1</version>
88
</parent>
99

1010
<artifactId>nitrite-jackson-mapper</artifactId>
@@ -132,18 +132,10 @@
132132
<groupId>org.apache.maven.plugins</groupId>
133133
<artifactId>maven-source-plugin</artifactId>
134134
</plugin>
135-
<plugin>
136-
<groupId>org.apache.maven.plugins</groupId>
137-
<artifactId>maven-gpg-plugin</artifactId>
138-
</plugin>
139135
<plugin>
140136
<groupId>org.codehaus.mojo</groupId>
141137
<artifactId>animal-sniffer-maven-plugin</artifactId>
142138
</plugin>
143-
<plugin>
144-
<groupId>org.sonatype.plugins</groupId>
145-
<artifactId>nexus-staging-maven-plugin</artifactId>
146-
</plugin>
147139
<plugin>
148140
<groupId>org.apache.maven.plugins</groupId>
149141
<artifactId>maven-jar-plugin</artifactId>

nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/JacksonMapper.java renamed to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/JacksonMapper.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.dizitart.no2.common.mapper;
17+
package org.dizitart.no2.mapper.jackson;
1818

1919
import com.fasterxml.jackson.annotation.JsonAutoDetect;
2020
import com.fasterxml.jackson.core.JsonParser;
2121
import com.fasterxml.jackson.databind.Module;
2222
import com.fasterxml.jackson.databind.*;
2323
import org.dizitart.no2.NitriteConfig;
2424
import org.dizitart.no2.collection.Document;
25-
import org.dizitart.no2.common.mapper.modules.NitriteIdModule;
25+
import org.dizitart.no2.common.mapper.NitriteMapper;
26+
import org.dizitart.no2.mapper.jackson.modules.NitriteIdModule;
2627
import org.dizitart.no2.exceptions.ObjectMappingException;
2728
import org.dizitart.no2.exceptions.ValidationException;
2829

@@ -32,11 +33,11 @@
3233
import static org.dizitart.no2.common.util.ValidationUtils.notNull;
3334

3435
/**
35-
* A {@link NitriteMapper} implementation that uses Jackson ObjectMapper to
36+
* A {@link org.dizitart.no2.common.mapper.NitriteMapper} implementation that uses Jackson ObjectMapper to
3637
* convert objects to and from Nitrite document.
3738
*
3839
* @since 4.0
39-
* @see NitriteMapper
40+
* @see org.dizitart.no2.common.mapper.NitriteMapper
4041
* @author Anindya Chatterjee
4142
*/
4243
public class JacksonMapper implements NitriteMapper {

nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/JacksonMapperModule.java renamed to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/JacksonMapperModule.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.dizitart.no2.common.mapper;
17+
package org.dizitart.no2.mapper.jackson;
1818

1919
import com.fasterxml.jackson.databind.Module;
2020
import org.dizitart.no2.common.module.NitriteModule;
@@ -25,11 +25,11 @@
2525
import static org.dizitart.no2.common.util.Iterables.setOf;
2626

2727
/**
28-
* A Nitrite module that provides a jackson based {@link NitriteMapper}
28+
* A Nitrite module that provides a jackson based {@link org.dizitart.no2.common.mapper.NitriteMapper}
2929
* implementation for object to document conversion.
3030
*
3131
* @since 4.0
32-
* @see NitriteMapper
32+
* @see org.dizitart.no2.common.mapper.NitriteMapper
3333
* @see JacksonMapper
3434
* @author Anindya Chatterjee
3535
*/

nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdDeserializer.java renamed to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.dizitart.no2.common.mapper.modules;
17+
package org.dizitart.no2.mapper.jackson.modules;
1818

1919
import com.fasterxml.jackson.core.JsonParser;
2020
import com.fasterxml.jackson.databind.DeserializationContext;

0 commit comments

Comments
 (0)