Skip to content

Commit 3a3047f

Browse files
committed
Add OSGi metadata to manifest file (1.3)
This is a backport of the PR duckdb#290 to `v1.3-ossivalis` stable branch. This change adds the static manifest file to be included into the JAR during the build. Fixes: duckdb#285
1 parent 37b5fb3 commit 3a3047f

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set(JAVA_JVM_LIBRARY NotNeeded)
77

88
find_package(JNI)
99

10-
cmake_minimum_required(VERSION 3.11.0)
10+
cmake_minimum_required(VERSION 3.5...3.29)
1111
set(CMAKE_CXX_STANDARD "11" CACHE STRING "C++ standard to enforce")
1212
set(CMAKE_VERBOSE_MAKEFILE OFF)
1313
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -552,6 +552,7 @@ file(GLOB_RECURSE JAVA_TEST_FILES src/test/java/org/duckdb/*.java)
552552
set(CMAKE_JAVA_COMPILE_FLAGS -encoding utf-8 -g)
553553

554554
add_jar(duckdb_jdbc ${JAVA_SRC_FILES} META-INF/services/java.sql.Driver
555+
MANIFEST META-INF/MANIFEST.MF
555556
GENERATE_NATIVE_HEADERS duckdb-native)
556557
add_jar(duckdb_jdbc_tests ${JAVA_TEST_FILES} INCLUDE_JARS duckdb_jdbc)
557558

CMakeLists.txt.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set(JAVA_JVM_LIBRARY NotNeeded)
77

88
find_package(JNI)
99

10-
cmake_minimum_required(VERSION 3.11.0)
10+
cmake_minimum_required(VERSION 3.5...3.29)
1111
set(CMAKE_CXX_STANDARD "11" CACHE STRING "C++ standard to enforce")
1212
set(CMAKE_VERBOSE_MAKEFILE OFF)
1313
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -86,6 +86,7 @@ file(GLOB_RECURSE JAVA_TEST_FILES src/test/java/org/duckdb/*.java)
8686
set(CMAKE_JAVA_COMPILE_FLAGS -encoding utf-8 -g)
8787

8888
add_jar(duckdb_jdbc ${JAVA_SRC_FILES} META-INF/services/java.sql.Driver
89+
MANIFEST META-INF/MANIFEST.MF
8990
GENERATE_NATIVE_HEADERS duckdb-native)
9091
add_jar(duckdb_jdbc_tests ${JAVA_TEST_FILES} INCLUDE_JARS duckdb_jdbc)
9192

META-INF/MANIFEST.MF

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: DuckDB JDBC Driver
4+
Bundle-SymbolicName: org.duckdb.duckdb_jdbc
5+
Bundle-Version: 1.4.0.0
6+
Bundle-Vendor: DuckDB Labs
7+
Bundle-Description: A JDBC-compliant driver for the DuckDB data management system
8+
Bundle-License: https://raw.githubusercontent.com/duckdb/duckdb/main/LICENSE
9+
Bundle-DocURL: https://www.duckdb.org
10+
Bundle-ContactAddress: [email protected]
11+
Bundle-Copyright: Copyright (c) DuckDB Labs
12+
Export-Package: org.duckdb, org.duckdb.io, org.duckdb.user
13+
Import-Package: javax.sql, org.osgi.framework;resolution:=optional

0 commit comments

Comments
 (0)