Skip to content

Commit d865883

Browse files
committed
Update Jaybird version with Jaybird 6 release
1 parent 8ef4a54 commit d865883

File tree

3 files changed

+24
-33
lines changed

3 files changed

+24
-33
lines changed

Diff for: src/docs/asciidoc/appendices/jaybirdversions/jaybird6.adoc

+3-21
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
[[jb6]]
22
=== Jaybird 6
33

4-
Jaybird 6 is currently in development.
5-
The following information is tentative and may change before general availability.
6-
7-
Snapshot versions are intended for evaluation and testing purposes only.
8-
We do not recommend their use in production environments.
9-
104
[[jb6-java]]
115
==== Java support
126

137
Jaybird 6 supports Java 17 and higher (JDBC 4.3).
148

159
Given the limited support period for non-LTS Java versions, we limit support to Java 17 and the most recent LTS version after Java 17, and the latest Java release.
16-
Currently, that means we support Java 17, 21, and 23.
10+
Currently, that means we support Java 17, Java 21, and Java 23.
1711

1812
Jaybird 6 provides libraries compiled against Java 17, which also work on higher Java versions.
1913

@@ -31,7 +25,7 @@ native and embedded protocol implementation using JNA (artifact `org.firebirdsql
3125
[[jb6-firebird]]
3226
==== Firebird support
3327

34-
Jaybird 6 supports Firebird 3.0 and higher.
28+
Jaybird 6 supports Firebird 3.0, Firebird 4.0, and Firebird 5.0.
3529

3630
Jaybird 6 will -- by default -- not connect to Firebird 2.5 or older.
3731
To connect to earlier versions, unsupported protocols have to be enabled explicitly, see <<ref-enable-protocol>> for details.
@@ -91,8 +85,6 @@ For native or embedded connections, the `jaybird-native` artifact and `jna-jpms`
9185

9286
For ChaCha64 wire encryption, the `chacha64-plugin` artifact and `bcprov-jdk18on` {jaybird6-bc-version} (Bouncy Castle JCE provider) need to be on the classpath.
9387

94-
////
95-
// No downloads available at this time
9688
[[jb6-distribution-package]]
9789
===== Distribution package
9890

@@ -121,23 +113,13 @@ Requires `lib/jna-jpms-{jaybird6-jna-version}.jar`.
121113
|Optional dependency, required if you want to use Type 2 native, or embedded protocols (with `jaybird-native`)
122114

123115
|===
124-
////
125116

126117
[[jb6-distribution-maven]]
127118
===== Maven
128119

129120
Alternatively, you can use Maven to automatically download Jaybird and its dependencies.
130121

131-
//Jaybird 6 is available from Maven central:
132-
133-
Snapshot versions of Jaybird 6 are available for testing from https://oss.sonatype.org/content/repositories/snapshots/[^].
134-
You will need to add this as a snapshot repository to your Maven configuration.
135-
136-
[NOTE]
137-
====
138-
These snapshots are released irregularly by a manual deploy.
139-
Contact us on https://groups.google.com/g/firebird-java[firebird-java^] if you need a newer snapshot than available.
140-
====
122+
Jaybird 6 is available from Maven central:
141123

142124
[horizontal]
143125
groupId:: `org.firebirdsql.jdbc`

Diff for: src/docs/asciidoc/chapters/introduction/introduction.adoc

+15-6
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Jaybird {jaybird-version} is available from Maven central:
7070

7171
Groupid: `org.firebirdsql.jdbc`, +
7272
Artifactid: `jaybird`, +
73-
Version: `{jaybird-template-version}` (where `<java>` is `java11` or `java8`)
73+
Version: `{jaybird-template-version}`
7474

7575
For example:
7676

@@ -83,18 +83,27 @@ For example:
8383
</dependency>
8484
----
8585

86-
If you want to use Type 2 support (native or embedded), you need to explicitly include JNA {jna-version} as a dependency:
86+
If you want to use ChaCha64 wire encryption, you need to explicitly include `chacha64-plugin` as a dependency:
8787

8888
[source,xml,subs="verbatim,attributes"]
8989
----
9090
<dependency>
91-
<groupId>net.java.dev.jna</groupId>
92-
<artifactId>jna</artifactId>
93-
<version>{jna-version}</version>
91+
<groupId>org.firebirdsql.jdbc</groupId>
92+
<artifactId>chacha64-plugin</artifactId>
93+
<version>{jaybird-example-version}</version>
9494
</dependency>
9595
----
9696

97-
In Jaybird 6, native and embedded support will be in a separate library.
97+
If you want to use Type 2 support (native or embedded), you need to explicitly include `jaybird-native` as a dependency:
98+
99+
[source,xml,subs="verbatim,attributes"]
100+
----
101+
<dependency>
102+
<groupId>org.firebirdsql.jdbc</groupId>
103+
<artifactId>jaybird-native</artifactId>
104+
<version>{jaybird-example-version}</version>
105+
</dependency>
106+
----
98107

99108
The Firebird client library is available as a Maven dependencies, see <<driver-native-maven>>.
100109
In the future, a Maven dependency for Firebird embedded may become available as well.

Diff for: src/docs/asciidoc/jaybird_manual.adoc

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Roman Rokytskyy; Mark Rotteveel
1010
:outlinelevels: 6:1
1111
:imagesdir: images
1212
:icons: font
13-
:jaybird6-full-version: 6.0.0-SNAPSHOT
14-
:jaybird6-jna-version: 5.15.0
13+
:jaybird6-full-version: 6.0.0
14+
:jaybird6-jna-version: 5.16.0
1515
:jaybird6-bc-version: 1.79
1616
:jaybird5-full-version: 5.0.6
1717
:jaybird5-template-version: {jaybird5-full-version}.<java>
@@ -23,10 +23,10 @@ Roman Rokytskyy; Mark Rotteveel
2323
:jaybird3-full-version: 3.0.12
2424
:jaybird22-full-version: 2.2.15
2525
:jaybird-fbclient-version: 5.0.1.1
26-
:jaybird-version: 5
27-
:jaybird-full-version: {jaybird5-full-version}
28-
:jaybird-example-version: {jaybird5-example-version}
29-
:jaybird-template-version: {jaybird5-template-version}
26+
:jaybird-version: 6
27+
:jaybird-full-version: {jaybird6-full-version}
28+
:jaybird-example-version: {jaybird6-full-version}
29+
:jaybird-template-version: {jaybird6-full-version}
3030
:jna-version: {jaybird5-jna-version}
3131
:min-support-firebird: 2.5
3232
:fb-canonical-html: https://firebirdsql.github.io/jaybird-manual/jaybird_manual.html

0 commit comments

Comments
 (0)