Merge branch 'master' into rearrange-liquibase-changelogs

This commit is contained in:
Michał Michaluk
2018-06-22 21:07:53 +02:00
52 changed files with 3043 additions and 86 deletions

View File

@@ -0,0 +1,7 @@
dependencies {
compile("org.springframework.boot:spring-boot-starter-data-jpa")
compile("org.springframework.boot:spring-boot-starter-data-rest")
compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.5")
compile("org.liquibase:liquibase-core:3.5.5")
testCompile("org.springframework.boot:spring-boot-starter-test")
}

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.0.2.RELEASE</version>
</parent>
<dependencies>
@@ -41,9 +41,28 @@
</dependencies>
<properties>
<java.version>1.8</java.version>
<!-- [PIPELINE] -->
<distribution.management.release.id>artifactory-local</distribution.management.release.id>
<distribution.management.release.url>http://localhost:8081/artifactory/libs-release-local</distribution.management.release.url>
<distribution.management.snapshot.url>http://localhost:8081/artifactory/libs-snapshot-local</distribution.management.snapshot.url>
<repo.with.binaries>http://localhost:8081/artifactory/libs-release-local</repo.with.binaries>
<maven-surefire.version>2.21.0</maven-surefire.version>
</properties>
<!-- [PIPELINE] -->
<distributionManagement>
<repository>
<id>${distribution.management.release.id}</id>
<name>Release Repository</name>
<url>${distribution.management.release.url}</url>
</repository>
<snapshotRepository>
<id>${distribution.management.release.id}</id>
<name>Snapshot Repository</name>
<url>${distribution.management.snapshot.url}</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<plugin>
@@ -61,4 +80,127 @@
</plugins>
</build>
<profiles>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire.version}</version>
<configuration>
<includes>
<include>**/*Test*.*</include>>
<include>**/*Spec*.*</include>
</includes>
<excludes>
<exclude>**/smoke/**</exclude>
<exclude>**/e2e/**</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<!-- [PIPELINE] -->
<profile>
<id>apicompatibility</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire.version}</version>
<configuration>
<includes>
<include>contracttests/**/*Test*.*</include>
<include>contracttests/**/*Spec*.*</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<!-- [PIPELINE] -->
<profile>
<id>smoke</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire.version}</version>
<configuration>
<includes>
<include>smoke/**/*Tests.java</include>
<include>smoke/**/*Test.java</include>
<include>smoke/**/*Spec.*</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<!-- [PIPELINE] -->
<profile>
<id>e2e</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire.version}</version>
<configuration>
<includes>
<include>e2e/**/*Tests.java</include>
<include>e2e/**/*Test.java</include>
<include>e2e/**/*Spec.*</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<repositories>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/libs-snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/libs-snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</pluginRepository>
</pluginRepositories>
</project>

View File

@@ -5,7 +5,7 @@
<changeSet author="jakubpilimon" id="1.init">
<createSequence sequenceName="hibernate_sequence" startValue="1" incrementBy="1" cacheSize="1"/>
</changeSet>
<changeSet author="jakubpilimon" id="2.postgres.json" dbms="postgresql">
<sql>CREATE CAST (character varying AS jsonb) WITH INOUT AS ASSIGNMENT</sql>
<changeSet author="jakubpilimon" id="2.postgres.json" dbms="postgresql" failOnError="false">
<sql>CREATE CAST (VARCHAR AS jsonb) WITH INOUT AS ASSIGNMENT</sql>
</changeSet>
</databaseChangeLog>