Skip to content

Commit d587d8d

Browse files
authored
Remove JDBC OSGi support (#18719)
1 parent f24b24d commit d587d8d

13 files changed

Lines changed: 0 additions & 342 deletions

File tree

‎LICENSE-binary‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,6 @@ io.netty:netty-transport:4.1.137.Final
259259
io.netty:netty-transport-native-epoll:4.1.137.Final:linux-aarch_64
260260
io.netty:netty-transport-native-epoll:4.1.137.Final:linux-x86_64
261261
io.netty:netty-transport-native-unix-common:4.1.137.Final
262-
org.osgi:org.osgi.core:7.0.0
263-
org.osgi:osgi.cmpn:7.0.0
264-
org.ops4j.pax.jdbc:pax-jdbc-common:1.5.6
265262
org.jspecify:jspecify:1.0.0
266263
org.jctools:jctools-core:4.0.5
267264
org.xerial.snappy:snappy-java:1.1.10.5

‎dependencies.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@
142142
"org.jspecify:jspecify",
143143
"org.jvnet.mimepull:mimepull",
144144
"org.latencyutils:LatencyUtils",
145-
"org.ops4j.pax.jdbc:pax-jdbc-common",
146-
"org.osgi:osgi.cmpn",
147-
"org.osgi:osgi.core",
148145
"org.ow2.asm:asm",
149146
"org.reactivestreams:reactive-streams",
150147
"org.slf4j:slf4j-api",

‎iotdb-client/jdbc/README.md‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -247,26 +247,3 @@ Here is a list of Status Code and related message:
247247
|601|NOT_LOGIN_ERROR|Has not logged in|
248248
|602|NO_PERMISSION_ERROR|No permissions for this operation, please add privilege|
249249
|603|UNINITIALIZED_AUTH_ERROR|Uninitialized authorizer|
250-
251-
##How to try IoTDB JDBC using Karaf
252-
Suppose you have started Karaf 4.2.8.
253-
254-
Put the iotdb-jdbc jars into your maven repository:
255-
`mvn install -DskipTests -pl iotdb-jdbc -am`
256-
257-
In your Karaf client shell:
258-
feature:repo-add mvn:org.apache.iotdb/iotdb-jdbc/1.0.0/xml/features
259-
260-
NOTE: that you must install JDBC first and then iotdb-feature
261-
262-
```ini
263-
feature:install jdbc
264-
feature:install iotdb-feature
265-
```
266-
Start a data source instance (supposed you have started IoTDB):
267-
268-
```
269-
jdbc:ds-create -dc org.apache.iotdb.jdbc.IoTDBDriver -u root -p root -url "jdbc:iotdb://127.0.0.1:6667/" IoTDB
270-
```
271-
Try query:
272-
`jdbc:query IoTDB "select * from root"`

‎iotdb-client/jdbc/osgi.bnd‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎iotdb-client/jdbc/pom.xml‎

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,6 @@
6464
<groupId>org.apache.thrift</groupId>
6565
<artifactId>libthrift</artifactId>
6666
</dependency>
67-
<dependency>
68-
<groupId>org.osgi</groupId>
69-
<artifactId>osgi.cmpn</artifactId>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.ops4j.pax.jdbc</groupId>
73-
<artifactId>pax-jdbc-common</artifactId>
74-
</dependency>
75-
<dependency>
76-
<groupId>org.osgi</groupId>
77-
<artifactId>osgi.core</artifactId>
78-
</dependency>
7967
<dependency>
8068
<groupId>org.slf4j</groupId>
8169
<artifactId>slf4j-api</artifactId>
@@ -92,85 +80,16 @@
9280
</dependency>
9381
</dependencies>
9482
<build>
95-
<resources>
96-
<resource>
97-
<targetPath>feature</targetPath>
98-
<filtering>true</filtering>
99-
<directory>src/main/feature</directory>
100-
</resource>
101-
</resources>
10283
<plugins>
103-
<plugin>
104-
<groupId>org.apache.maven.plugins</groupId>
105-
<artifactId>maven-resources-plugin</artifactId>
106-
<executions>
107-
<execution>
108-
<goals>
109-
<goal>resources</goal>
110-
</goals>
111-
</execution>
112-
</executions>
113-
</plugin>
114-
<!--
115-
The feature plugin doesn't correctly attach the generated feature file so it
116-
wouldn't be signed and hashed during a release build. By manually-attaching it
117-
we make sure it's processed correctly.
118-
-->
11984
<plugin>
12085
<groupId>org.codehaus.mojo</groupId>
12186
<artifactId>build-helper-maven-plugin</artifactId>
122-
<executions>
123-
<execution>
124-
<id>attach-features</id>
125-
<goals>
126-
<goal>attach-artifact</goal>
127-
</goals>
128-
<phase>package</phase>
129-
<configuration>
130-
<artifacts>
131-
<artifact>
132-
<file>src/main/feature/feature.xml</file>
133-
<classifier>features</classifier>
134-
<type>xml</type>
135-
</artifact>
136-
</artifacts>
137-
</configuration>
138-
</execution>
139-
</executions>
140-
</plugin>
141-
<!--
142-
Generate an OSGI compatible MANIFEST file.
143-
-->
144-
<plugin>
145-
<groupId>org.apache.felix</groupId>
146-
<artifactId>maven-bundle-plugin</artifactId>
147-
<configuration>
148-
<exportScr>true</exportScr>
149-
<instructions>
150-
<_include>osgi.bnd</_include>
151-
<_removeheaders>Bnd-LastModified,Built-By</_removeheaders>
152-
<Embed-Dependency>dependencies</Embed-Dependency>
153-
</instructions>
154-
</configuration>
155-
<executions>
156-
<execution>
157-
<id>bundle-manifest</id>
158-
<goals>
159-
<goal>manifest</goal>
160-
</goals>
161-
<phase>process-classes</phase>
162-
</execution>
163-
</executions>
16487
</plugin>
165-
<!--
166-
Use the MANIFEST file generated by the maven-bundle-plugin.
167-
-->
16888
<plugin>
16989
<groupId>org.apache.maven.plugins</groupId>
17090
<artifactId>maven-jar-plugin</artifactId>
17191
<configuration>
17292
<archive>
173-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
17493
<manifestEntries>
17594
<Implementation-Version>${project.version}</Implementation-Version>
17695
</manifestEntries>

‎iotdb-client/jdbc/src/main/feature/feature.xml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎iotdb-client/jdbc/src/main/i18n/en/org/apache/iotdb/jdbc/i18n/JdbcMessages.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,6 @@ public final class JdbcMessages {
135135
// IoTDBDataSource
136136
public static final String GET_CONNECTION_ERROR = "get connection error:";
137137

138-
// IoTDBDataSourceFactory
139-
public static final String REMAINING_PROPERTIES = "Remaining properties {}";
140-
141138
// IoTDBJDBCResultSet
142139
public static final String CLOSE_SERVER_SIDE_ERROR =
143140
"Error occurs for close operation in server side because ";

‎iotdb-client/jdbc/src/main/i18n/zh/org/apache/iotdb/jdbc/i18n/JdbcMessages.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,6 @@ public final class JdbcMessages {
134134
// IoTDBDataSource
135135
public static final String GET_CONNECTION_ERROR = "获取连接错误:";
136136

137-
// IoTDBDataSourceFactory
138-
public static final String REMAINING_PROPERTIES = "剩余属性 {}";
139-
140137
// IoTDBJDBCResultSet
141138
public static final String CLOSE_SERVER_SIDE_ERROR =
142139
"服务端关闭操作时发生错误 ";

‎iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/Activator.java‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDataSourceFactory.java‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)