Skip to content

Commit

Permalink
Merge pull request #74 from liquibase/cody_update_liquibase_compatibi…
Browse files Browse the repository at this point in the history 
…lity

Update POM for compatibility with liquibase 4.32.2 and 4.25.0
  • Loading branch information
@CodyAustinDavis
CodyAustinDavis authored Nov 29, 2023
2 parents fba2068 + 21cfced commit 91132c6
Show file tree
Hide file tree
Showing 3 changed files with 194 additions and 50 deletions.
Binary file removed lib/liquibase-extension-testing-4.25.0.jar
View file
Binary file not shown.
241 changes: 192 additions & 49 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-parent-pom</artifactId>
<version>0.3.3</version> <!-- Replace with the desired version -->
</parent>

<groupId>org.liquibase.ext</groupId>
<artifactId>liquibase-databricks</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>1.1.1</version>

<name>Liquibase Extension Databricks</name>
<name>Liquibase Extension: Databricks support</name>
<description>Liquibase Extension for Databricks.</description>
<url>https://github.com/liquibase/liquibase-databricks</url>

<organization>
<name>Liquibase</name>
<url>http://www.liquibase.com</url>
</organization>

<issueManagement>
<url>https://github.com/liquibase/liquibase-databricks/issues</url>
</issueManagement>

<licenses>
<license>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<name>Apache License, Version 2.0</name>
</license>
</licenses>

<developers>
<developer>
<name>Cody Davis</name>
Expand All @@ -25,21 +36,56 @@
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/liquibase/liquibase-databricks.git</connection>
<url>https://github.com/liquibase/liquibase-databricks</url>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<liquibase.version>4.25.0</liquibase.version>
<sonar.organization>liquibase</sonar.organization>
<sonar.projectKey>${sonar.organization}_${project.artifactId}</sonar.projectKey>
<sonar.projectName>${project.name}</sonar.projectName>
<sonar.projectDescription>${project.description}</sonar.projectDescription>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.scm.provider>git</sonar.scm.provider>
<sonar.qualitygate.wait>true</sonar.qualitygate.wait>
<sonar.sources>src/main/java</sonar.sources>
<sonar.tests>src/test/groovy</sonar.tests>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>

<scm>
<connection>scm:git:${project.scm.url}</connection>
<developerConnection>scm:git:${project.scm.url}</developerConnection>
<url>https://github.com/liquibase/liquibase-databricks.git</url>
<tag>HEAD</tag>
</scm>
<groovy.version>2.4.21</groovy.version>
<dependency.spock.version>1.3-groovy-2.4</dependency.spock.version>

<jacoco.fileset.directory>target</jacoco.fileset.directory>
</properties>

<dependencies>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>${liquibase.version}</version>
</dependency>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-commercial</artifactId>
<version>${liquibase.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-test-harness</artifactId>
<version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
Expand All @@ -52,35 +98,154 @@
<version>2.6.34</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>${liquibase.version}</version>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
<scope>test</scope>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-testng</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
<version>${dependency.spock.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId>
<version>${liquibase.version}</version>
<configuration>
<propertyFileWillOverride>true</propertyFileWillOverride>
<propertyFile>dev_db.properties</propertyFile>
<propertyFile>target/classes/liquibase.properties</propertyFile>
<logging>DEBUG</logging>
<changeLogFile>dev_setup.xml</changeLogFile>
<outputChangeLogFile>generatedChangelog.databricks.sql</outputChangeLogFile>
<changeLogFile>target/classes/changelog.sql</changeLogFile>
<outputChangeLogFile>target/classes/generatedChangelog.databricks.sql</outputChangeLogFile>
<diffTypes>tables,views</diffTypes>
<diffIncludeCatalog>true</diffIncludeCatalog>
<diffIncludeSchema>true</diffIncludeSchema>
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<reportFormat>plain</reportFormat>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<configuration>
<attach>true</attach>
<author>false</author>
<doctitle>Liquibase Databricks ${project.version} API</doctitle>
<quiet>true</quiet>
<doclint>none</doclint>
<encoding>UTF-8</encoding>

<includeDependencySources>false</includeDependencySources>
</configuration>
<executions>
<execution>
<id>javadoc-default</id>
<goals>
<goal>jar</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>2.1.0</version>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>compileTests</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.10</version>
<configuration>
<fileSets>
<fileSet>
<directory>${jacoco.fileset.directory}</directory>
<includes>
<include>**/jacoco.exec</include>
</includes>
</fileSet>
</fileSets>
</configuration>
</plugin>

<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>3.9.1.2184</version>
</plugin>

<plugin>
<groupId>org.liquibase.ext</groupId>
<artifactId>liquibase-sdk-maven-plugin</artifactId>
<version>0.10.20</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.5.0</version>
<version>1.4.1</version>
<configuration>
<embedBuildProfileDependencies>true</embedBuildProfileDependencies>
<updatePomFile>true</updatePomFile>
Expand All @@ -105,29 +270,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<source>1.8</source>
<author>false</author>
<doctitle>Liquibase ${project.name} ${project.version} API</doctitle>
<quiet>true</quiet>
<doclint>none</doclint>
<encoding>UTF-8</encoding>
<jarOutputDirectory>${project.build.directory}</jarOutputDirectory>
</configuration>
<executions>
<execution>
<id>jar-javadoc</id>
<goals>
<goal>jar</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
</project>
3 changes: 2 additions & 1 deletion src/main/java/liquibase/ext/databricks/snapshot/jvm/SequenceSnapshotGeneratorDatabricks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ protected DatabaseObject snapshotObject(DatabaseObject example, DatabaseSnapshot
return null;
}


@Override
protected SqlStatement getSelectSequenceStatement(Schema schema, Database database) {
if (database instanceof DatabricksDatabase) {
Expand All @@ -55,6 +56,6 @@ protected SqlStatement getSelectSequenceStatement(Schema schema, Database databa
return new RawSqlStatement(databricksSequenceSql);
}

return super.getSelectSequenceStatement(schema, database);
return getSelectSequenceStatement(schema, database);
}
}

0 comments on commit 91132c6

Please sign in to comment.