Skip to content

Commit

Permalink
release 1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Maksim Zinal committed Jul 16, 2024
1 parent ceb12e8 commit c3bbfcf
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 25 deletions.
81 changes: 57 additions & 24 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>tech.ydb.spark</groupId>
<artifactId>ydb-spark-connector</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<!-- <version>X.Y[-SNAPSHOT]</version> -->
<packaging>jar</packaging>
<developers>
Expand All @@ -27,7 +27,7 @@
<dependency>
<groupId>tech.ydb</groupId>
<artifactId>ydb-sdk-bom</artifactId>
<version>2.2.2</version>
<version>2.2.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -74,7 +74,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down Expand Up @@ -102,13 +101,13 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-catalyst_2.12</artifactId>
<version>3.3.2</version>
<version>3.3.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_2.12</artifactId>
<version>3.3.2</version>
<version>3.3.4</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -129,12 +128,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
<configuration>
<target>1.8</target>
<source>1.8</source>
Expand All @@ -149,7 +148,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -162,7 +161,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.2</version>
<version>3.4.0</version>
<configuration>
<configLocation>config/ydb.checkstyle.xml</configLocation>
<suppressionsFileExpression>config/ydb.suppressions.xml</suppressionsFileExpression>
Expand All @@ -180,17 +179,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<version>3.7.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -199,42 +198,48 @@
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<createSourcesJar>false</createSourcesJar>

<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<createDependencyReducedPom>true</createDependencyReducedPom>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>

<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Automatic-Module-Name>tech.ydb.spark.connector</Automatic-Module-Name>
<Automatic-Module-Name>tech.ydb.spark</Automatic-Module-Name>
<Specification-Title>${spec.title}</Specification-Title>
<Specification-Version>${spec.version}</Specification-Version>
</manifestEntries>
</transformer>
</transformers>

<filters>
<filter>
<artifact>io.jsonwebtoken:jjwt-impl</artifact>
<artifact>tech.ydb.spark:ydb-spark-connector</artifact>
<includes>
<include>**</include>
</includes>
</filter>
<!-- jjwt-impl and jjwt-jackson have to be explicitly enabled,
because there is no compiler-visible dependency -->
<filter>
<artifact>io.jsonwebtoken:jjwt-jackson</artifact>
<artifact>io.jsonwebtoken:jjwt-impl</artifact>
<includes>
<include>**</include>
</includes>
</filter>
<filter>
<artifact>com.fasterxml.jackson.core:jackson-databind</artifact>
<artifact>io.jsonwebtoken:jjwt-jackson</artifact>
<includes>
<include>**</include>
</includes>
</filter>
<filter>
<artifact>org.bouncycastle:bcprov-jdk15on</artifact>
<artifact>com.fasterxml.jackson.core:jackson-databind</artifact>
<includes>
<include>**</include>
</includes>
Expand Down Expand Up @@ -262,22 +267,50 @@
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/license/*.txt</exclude>
</excludes>
</filter>
</filters>

<relocations>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>yandex.shaded.google</shadedPattern>
<pattern>android.annotation</pattern>
<shadedPattern>tech.ydb.shaded.android.annotation</shadedPattern>
</relocation>
<relocation>
<pattern>io.grpc</pattern>
<shadedPattern>yandex.shaded.grpc</shadedPattern>
<pattern>org.bouncycastle</pattern>
<shadedPattern>tech.ydb.shaded.bouncycastle</shadedPattern>
</relocation>
<relocation>
<pattern>org.checkerframework</pattern>
<shadedPattern>tech.ydb.shaded.checkerframework</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
<shadedPattern>tech.ydb.shaded.slf4j</shadedPattern>
</relocation>
<relocation>
<pattern>javax.annotation</pattern>
<shadedPattern>tech.ydb.shaded.javax.annotation</shadedPattern>
</relocation>
<relocation>
<pattern>io.jsonwebtoken</pattern>
<shadedPattern>tech.ydb.shaded.io.jsonwebtoken</shadedPattern>
</relocation>
<relocation>
<pattern>io.perfmark</pattern>
<shadedPattern>tech.ydb.shaded.io.perfmark</shadedPattern>
</relocation>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>tech.ydb.shaded.google</shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
<shadedPattern>yandex.shaded.jackson</shadedPattern>
<shadedPattern>tech.ydb.shaded.jackson</shadedPattern>
</relocation>
<relocation>
<pattern>io.grpc</pattern>
<shadedPattern>tech.ydb.shaded.grpc</shadedPattern>
</relocation>
</relocations>
</configuration>
Expand All @@ -287,7 +320,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.2</version>
<configuration>
<archive>
<compress>true</compress>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tech/ydb/spark/connector/YdbCatalog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class YdbCatalog extends YdbOptions
= org.slf4j.LoggerFactory.getLogger(YdbCatalog.class);

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

public static final String ENTRY_TYPE = "ydb_entry_type";
public static final String ENTRY_OWNER = "ydb_entry_owner";
Expand Down

0 comments on commit c3bbfcf

Please sign in to comment.