Skip to content

Commit c3bbfcf

Browse files
author
Maksim Zinal
committed
release 1.2
1 parent ceb12e8 commit c3bbfcf

File tree

2 files changed

+58
-25
lines changed

2 files changed

+58
-25
lines changed

‎pom.xml‎

Lines changed: 57 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>tech.ydb.spark</groupId>
55
<artifactId>ydb-spark-connector</artifactId>
6-
<version>1.2-SNAPSHOT</version>
6+
<version>1.2</version>
77
<!-- <version>X.Y[-SNAPSHOT]</version> -->
88
<packaging>jar</packaging>
99
<developers>
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>tech.ydb</groupId>
2929
<artifactId>ydb-sdk-bom</artifactId>
30-
<version>2.2.2</version>
30+
<version>2.2.6</version>
3131
<type>pom</type>
3232
<scope>import</scope>
3333
</dependency>
@@ -74,7 +74,6 @@
7474
<groupId>org.slf4j</groupId>
7575
<artifactId>slf4j-api</artifactId>
7676
<version>1.7.25</version>
77-
<scope>provided</scope>
7877
</dependency>
7978
<dependency>
8079
<groupId>org.apache.logging.log4j</groupId>
@@ -102,13 +101,13 @@
102101
<dependency>
103102
<groupId>org.apache.spark</groupId>
104103
<artifactId>spark-catalyst_2.12</artifactId>
105-
<version>3.3.2</version>
104+
<version>3.3.4</version>
106105
<scope>provided</scope>
107106
</dependency>
108107
<dependency>
109108
<groupId>org.apache.spark</groupId>
110109
<artifactId>spark-sql_2.12</artifactId>
111-
<version>3.3.2</version>
110+
<version>3.3.4</version>
112111
<scope>provided</scope>
113112
</dependency>
114113
<dependency>
@@ -129,12 +128,12 @@
129128
<plugin>
130129
<groupId>org.apache.maven.plugins</groupId>
131130
<artifactId>maven-dependency-plugin</artifactId>
132-
<version>3.6.1</version>
131+
<version>3.7.1</version>
133132
</plugin>
134133
<plugin>
135134
<groupId>org.apache.maven.plugins</groupId>
136135
<artifactId>maven-compiler-plugin</artifactId>
137-
<version>3.12.1</version>
136+
<version>3.13.0</version>
138137
<configuration>
139138
<target>1.8</target>
140139
<source>1.8</source>
@@ -149,7 +148,7 @@
149148
<plugin>
150149
<groupId>org.apache.maven.plugins</groupId>
151150
<artifactId>maven-source-plugin</artifactId>
152-
<version>3.3.0</version>
151+
<version>3.3.1</version>
153152
<executions>
154153
<execution>
155154
<id>attach-sources</id>
@@ -162,7 +161,7 @@
162161
<plugin>
163162
<groupId>org.apache.maven.plugins</groupId>
164163
<artifactId>maven-checkstyle-plugin</artifactId>
165-
<version>3.2.2</version>
164+
<version>3.4.0</version>
166165
<configuration>
167166
<configLocation>config/ydb.checkstyle.xml</configLocation>
168167
<suppressionsFileExpression>config/ydb.suppressions.xml</suppressionsFileExpression>
@@ -180,17 +179,17 @@
180179
<plugin>
181180
<groupId>org.apache.maven.plugins</groupId>
182181
<artifactId>maven-javadoc-plugin</artifactId>
183-
<version>3.6.3</version>
182+
<version>3.7.0</version>
184183
</plugin>
185184
<plugin>
186185
<groupId>org.apache.maven.plugins</groupId>
187186
<artifactId>maven-deploy-plugin</artifactId>
188-
<version>3.1.1</version>
187+
<version>3.1.2</version>
189188
</plugin>
190189
<plugin>
191190
<groupId>org.apache.maven.plugins</groupId>
192191
<artifactId>maven-shade-plugin</artifactId>
193-
<version>3.5.1</version>
192+
<version>3.6.0</version>
194193
<executions>
195194
<execution>
196195
<phase>package</phase>
@@ -199,42 +198,48 @@
199198
</goals>
200199
<configuration>
201200
<minimizeJar>true</minimizeJar>
201+
<createSourcesJar>false</createSourcesJar>
202+
202203
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
203204
<createDependencyReducedPom>true</createDependencyReducedPom>
204205
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
206+
205207
<transformers>
206208
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
207209
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
208210
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
209211
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
210212
<manifestEntries>
211-
<Automatic-Module-Name>tech.ydb.spark.connector</Automatic-Module-Name>
213+
<Automatic-Module-Name>tech.ydb.spark</Automatic-Module-Name>
212214
<Specification-Title>${spec.title}</Specification-Title>
213215
<Specification-Version>${spec.version}</Specification-Version>
214216
</manifestEntries>
215217
</transformer>
216218
</transformers>
219+
217220
<filters>
218221
<filter>
219-
<artifact>io.jsonwebtoken:jjwt-impl</artifact>
222+
<artifact>tech.ydb.spark:ydb-spark-connector</artifact>
220223
<includes>
221224
<include>**</include>
222225
</includes>
223226
</filter>
227+
<!-- jjwt-impl and jjwt-jackson have to be explicitly enabled,
228+
because there is no compiler-visible dependency -->
224229
<filter>
225-
<artifact>io.jsonwebtoken:jjwt-jackson</artifact>
230+
<artifact>io.jsonwebtoken:jjwt-impl</artifact>
226231
<includes>
227232
<include>**</include>
228233
</includes>
229234
</filter>
230235
<filter>
231-
<artifact>com.fasterxml.jackson.core:jackson-databind</artifact>
236+
<artifact>io.jsonwebtoken:jjwt-jackson</artifact>
232237
<includes>
233238
<include>**</include>
234239
</includes>
235240
</filter>
236241
<filter>
237-
<artifact>org.bouncycastle:bcprov-jdk15on</artifact>
242+
<artifact>com.fasterxml.jackson.core:jackson-databind</artifact>
238243
<includes>
239244
<include>**</include>
240245
</includes>
@@ -262,22 +267,50 @@
262267
<exclude>META-INF/*.SF</exclude>
263268
<exclude>META-INF/*.DSA</exclude>
264269
<exclude>META-INF/*.RSA</exclude>
265-
<exclude>META-INF/license/*.txt</exclude>
266270
</excludes>
267271
</filter>
268272
</filters>
273+
269274
<relocations>
270275
<relocation>
271-
<pattern>com.google</pattern>
272-
<shadedPattern>yandex.shaded.google</shadedPattern>
276+
<pattern>android.annotation</pattern>
277+
<shadedPattern>tech.ydb.shaded.android.annotation</shadedPattern>
273278
</relocation>
274279
<relocation>
275-
<pattern>io.grpc</pattern>
276-
<shadedPattern>yandex.shaded.grpc</shadedPattern>
280+
<pattern>org.bouncycastle</pattern>
281+
<shadedPattern>tech.ydb.shaded.bouncycastle</shadedPattern>
282+
</relocation>
283+
<relocation>
284+
<pattern>org.checkerframework</pattern>
285+
<shadedPattern>tech.ydb.shaded.checkerframework</shadedPattern>
286+
</relocation>
287+
<relocation>
288+
<pattern>org.slf4j</pattern>
289+
<shadedPattern>tech.ydb.shaded.slf4j</shadedPattern>
290+
</relocation>
291+
<relocation>
292+
<pattern>javax.annotation</pattern>
293+
<shadedPattern>tech.ydb.shaded.javax.annotation</shadedPattern>
294+
</relocation>
295+
<relocation>
296+
<pattern>io.jsonwebtoken</pattern>
297+
<shadedPattern>tech.ydb.shaded.io.jsonwebtoken</shadedPattern>
298+
</relocation>
299+
<relocation>
300+
<pattern>io.perfmark</pattern>
301+
<shadedPattern>tech.ydb.shaded.io.perfmark</shadedPattern>
302+
</relocation>
303+
<relocation>
304+
<pattern>com.google</pattern>
305+
<shadedPattern>tech.ydb.shaded.google</shadedPattern>
277306
</relocation>
278307
<relocation>
279308
<pattern>com.fasterxml.jackson</pattern>
280-
<shadedPattern>yandex.shaded.jackson</shadedPattern>
309+
<shadedPattern>tech.ydb.shaded.jackson</shadedPattern>
310+
</relocation>
311+
<relocation>
312+
<pattern>io.grpc</pattern>
313+
<shadedPattern>tech.ydb.shaded.grpc</shadedPattern>
281314
</relocation>
282315
</relocations>
283316
</configuration>
@@ -287,7 +320,7 @@
287320
<plugin>
288321
<groupId>org.apache.maven.plugins</groupId>
289322
<artifactId>maven-jar-plugin</artifactId>
290-
<version>3.3.0</version>
323+
<version>3.4.2</version>
291324
<configuration>
292325
<archive>
293326
<compress>true</compress>

‎src/main/java/tech/ydb/spark/connector/YdbCatalog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class YdbCatalog extends YdbOptions
5353
= org.slf4j.LoggerFactory.getLogger(YdbCatalog.class);
5454

5555
// X.Y[-SNAPSHOT]
56-
public static final String VERSION = "1.1-SNAPSHOT";
56+
public static final String VERSION = "1.2";
5757

5858
public static final String ENTRY_TYPE = "ydb_entry_type";
5959
public static final String ENTRY_OWNER = "ydb_entry_owner";

0 commit comments

Comments
 (0)