Skip to content

Commit f0b9c56

Browse files
committed
Merge branch 'master' into fix/bufferproxy_out_ignored
2 parents 236b7c9 + 0b741e8 commit f0b9c56

17 files changed

Lines changed: 377 additions & 154 deletions

.github/workflows/maven.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313

1414
steps:
1515
- name: Check out Git repository
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v5
1717

1818
- name: Set up Java and Maven
19-
uses: actions/setup-java@v3
19+
uses: actions/setup-java@v5
2020
with:
2121
distribution: zulu
22-
java-version: 21
22+
java-version: 25
2323
cache: maven
2424

2525
- name: Install Zig
26-
uses: goto-bus-stop/setup-zig@v2
26+
uses: mlugg/setup-zig@v2
2727

2828
- name: Cross compile using Zig
2929
run: ./cross-compile.sh
@@ -52,14 +52,14 @@ jobs:
5252
strategy:
5353
matrix:
5454
os: [ubuntu-latest, macos-latest, windows-latest]
55-
java: [8, 11, 17, 21]
55+
java: [8, 11, 17, 21, 25]
5656

5757
steps:
5858
- name: Check out Git repository
59-
uses: actions/checkout@v3
59+
uses: actions/checkout@v5
6060

6161
- name: Set up Java and Maven
62-
uses: actions/setup-java@v3
62+
uses: actions/setup-java@v5
6363
with:
6464
distribution: zulu
6565
java-version: ${{ matrix.java }}
@@ -82,44 +82,44 @@ jobs:
8282
path: target/surefire-reports
8383

8484
deploy:
85-
name: Deploy to OSSRH
85+
name: Deploy to Central Portal
8686
needs: [build, compatibility-checks]
8787
if: github.event_name == 'push'
8888
runs-on: ubuntu-latest
8989

9090
steps:
9191
- name: Check out Git repository
92-
uses: actions/checkout@v3
92+
uses: actions/checkout@v5
9393

9494
- name: Set up Java and Maven
95-
uses: actions/setup-java@v3
95+
uses: actions/setup-java@v5
9696
with:
9797
distribution: zulu
9898
# Java version 8 required due to https://github.com/lmdbjava/lmdbjava/issues/116
9999
java-version: 8
100100
cache: maven
101-
server-id: ossrh
102-
server-username: MAVEN_USERNAME
103-
server-password: MAVEN_CENTRAL_TOKEN
101+
server-id: central
102+
server-username: MAVEN_CENTRAL_USERNAME
103+
server-password: MAVEN_CENTRAL_PASSWORD
104104
gpg-private-key: ${{ secrets.gpg_private_key }}
105105
gpg-passphrase: MAVEN_GPG_PASSPHRASE
106106

107107
- name: Install Zig
108-
uses: goto-bus-stop/setup-zig@v2
108+
uses: mlugg/setup-zig@v2
109109

110110
- name: Cross compile using Zig
111111
run: ./cross-compile.sh
112112

113113
- name: Publish Maven package
114-
run: mvn -B -Possrh-deploy deploy -DskipTests
114+
run: mvn -B -Pcentral-deploy deploy -DskipTests
115115
env:
116116
MAVEN_GPG_PASSPHRASE: ${{ secrets.gpg_passphrase }}
117-
MAVEN_USERNAME: ${{ secrets.nexus_username }}
118-
MAVEN_CENTRAL_TOKEN: ${{ secrets.nexus_password }}
117+
MAVEN_CENTRAL_USERNAME: ${{ secrets.central_username }}
118+
MAVEN_CENTRAL_PASSWORD: ${{ secrets.central_password }}
119119

120120
- name: Debug settings.xml
121121
uses: actions/upload-artifact@v4
122122
if: failure()
123123
with:
124124
name: settings.xml
125-
path: $HOME/.m2/settings.xml
125+
path: ~/.m2/settings.xml

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ gpg-sign.json
1717
mvn-sync.json
1818
secrets.tar
1919
lmdb
20+
pom.xml.versionsBackup

CONTRIBUTING.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ We welcome patches and pull requests to improve LmdbJava.
66
This will run:
77

88
* Tests
9-
* Initial Test Coverage
109
* Source Code Formatting
1110
* License Header Management
1211

1312
`mvn clean verify` is also run by CI, but it's quicker and easier to run
1413
before submitting.
1514

15+
### Version Management
16+
17+
Update all dependency and plugin versions:
18+
```bash
19+
mvn versions:update-properties
20+
```
21+
1622
### Releasing
1723

1824
GitHub Actions will perform an official release whenever a developer executes

NOTICE.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Copyright © 2016-2025 The LmdbJava Open Source Project
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
14+
15+
---
16+
17+
The LmdbJava project distribution JAR file includes a distribution of [LMDB](https://www.symas.com/mdb), which is licensed under the [OpenLDAP Public License](https://www.openldap.org/software/release/license.html).
18+
19+
---
20+
21+
# Dependencies
22+
23+
LmdbJava uses the following libraries.
24+
All license files can also be found in the `licenses` directory in the root of this repository.
25+
26+
| Dependency | License |
27+
|-------------|----------|
28+
| `com.github.jnr:jnr-constants` | [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0) |
29+
| `com.github.jnr:jnr-ffi` | [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0) |
30+
| `com.google.guava:guava` | [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0) |
31+
| `com.jakewharton.byteunits:byteunits` | [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0) |
32+
| `io.netty:netty-buffer` | [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0) |
33+
| `junit:junit` | [Eclipse Public License 1.0](https://www.eclipse.org/org/documents/epl-v10.html) |
34+
| `org.agrona:agrona` | [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0) |
35+
| `org.hamcrest:hamcrest` | [BSD 3-Clause License](https://opensource.org/license/bsd-3-clause) |
36+
| `org.mockito:mockito-inline` | [MIT License](https://opensource.org/license/mit) |

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
* Low latency design (allocation-free; buffer pools; optional checks can be easily disabled in production etc)
3232
* Mature code (commenced in 2016) and used for heavy production workloads (eg > 500 TB of HFT data)
3333
* Actively maintained and with a "Zero Bug Policy" before every release (see [issues](https://github.com/lmdbjava/lmdbjava/issues))
34-
* Available from [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.lmdbjava%22%20AND%20a%3A%22lmdbjava%22) and [OSS Sonatype Snapshots](https://oss.sonatype.org/content/repositories/snapshots/org/lmdbjava/lmdbjava)
35-
* [Continuous integration](https://github.com/lmdbjava/lmdbjava/actions) testing on Linux, Windows and macOS with Java 8, 11, 17 and 21
34+
* Available from [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.lmdbjava%22%20AND%20a%3A%22lmdbjava%22) and [Central Portal Snapshots](https://central.sonatype.com/repository/maven-snapshots/org/lmdbjava/lmdbjava)
35+
* [Continuous integration](https://github.com/lmdbjava/lmdbjava/actions) testing on Linux, Windows and macOS with Java 8, 11, 17, 21 and 25
3636

3737
### Performance
3838

@@ -67,7 +67,7 @@ updated (eg following a new official release of the upstream LMDB library).
6767
If you do not wish to install Zig and/or use an operating system which cannot
6868
easily execute the `cross-compile.sh` script, you can download the compiled
6969
LMDB native library for your platform from a location of your choice and set the
70-
`lmdbjava.native.lib` system property to the resulting file system system
70+
`lmdbjava.native.lib` system property to the resulting file system
7171
location. Possible sources of a compiled LMDB native library include operating
7272
system package managers, running `cross-compile.sh` on a supported system, or
7373
copying it from the `org/lmdbjava` directory of any recent, officially released

licenses/Apache-2.0

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
10+
11+
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
12+
13+
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
14+
15+
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
16+
17+
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
18+
19+
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
20+
21+
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
22+
23+
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
24+
25+
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
26+
27+
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
28+
29+
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
30+
31+
3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
32+
33+
4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
34+
35+
You must give any other recipients of the Work or Derivative Works a copy of this License; and
36+
You must cause any modified files to carry prominent notices stating that You changed the files; and
37+
You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
38+
If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
39+
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
40+
41+
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
42+
43+
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
44+
45+
7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
46+
47+
8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
48+
49+
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
50+
51+
END OF TERMS AND CONDITIONS

licenses/OpenLDAP-2.8.txt

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
The OpenLDAP Public License
2+
Version 2.8, 17 August 2003
3+
4+
Redistribution and use of this software and associated documentation
5+
("Software"), with or without modification, are permitted provided
6+
that the following conditions are met:
7+
8+
1. Redistributions in source form must retain copyright statements
9+
and notices,
10+
11+
2. Redistributions in binary form must reproduce applicable copyright
12+
statements and notices, this list of conditions, and the following
13+
disclaimer in the documentation and/or other materials provided
14+
with the distribution, and
15+
16+
3. Redistributions must contain a verbatim copy of this document.
17+
18+
The OpenLDAP Foundation may revise this license from time to time.
19+
Each revision is distinguished by a version number. You may use
20+
this Software under terms of this license revision or under the
21+
terms of any subsequent revision of the license.
22+
23+
THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
24+
CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
25+
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
26+
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
27+
SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
28+
OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
29+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
30+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
31+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
32+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
34+
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35+
POSSIBILITY OF SUCH DAMAGE.
36+
37+
The names of the authors and copyright holders must not be used in
38+
advertising or otherwise to promote the sale, use or other dealing
39+
in this Software without specific, written prior permission. Title
40+
to copyright in this Software shall at all times remain with copyright
41+
holders.
42+
43+
OpenLDAP is a registered trademark of the OpenLDAP Foundation.
44+
45+
Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
46+
California, USA. All Rights Reserved. Permission to copy and
47+
distribute verbatim copies of this document is granted.

0 commit comments

Comments
 (0)