HHH-15203 - Remove support for Derby versions older than 10.15
Signed-off-by: Jan Schatteman <jschatte@redhat.com>
This commit is contained in:
parent
2220cf7fe5
commit
7dc458f663
|
@ -130,10 +130,6 @@ stage('Build') {
|
||||||
state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
|
state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
|
||||||
" -Pgradle.libs.versions.hsqldb=2.6.1"
|
" -Pgradle.libs.versions.hsqldb=2.6.1"
|
||||||
break;
|
break;
|
||||||
case "derby_10_14":
|
|
||||||
state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
|
|
||||||
" -Pgradle.libs.versions.derby=10.14.2.0"
|
|
||||||
break;
|
|
||||||
case "mysql":
|
case "mysql":
|
||||||
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
|
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
|
||||||
docker.image('mysql:8.0.31').pull()
|
docker.image('mysql:8.0.31').pull()
|
||||||
|
|
|
@ -8,8 +8,6 @@ elif [ "$RDBMS" == "hsqldb" ] || [ "$RDBMS" == "hsqldb_2_6" ]; then
|
||||||
goal="-Pdb=hsqldb"
|
goal="-Pdb=hsqldb"
|
||||||
elif [ "$RDBMS" == "derby" ]; then
|
elif [ "$RDBMS" == "derby" ]; then
|
||||||
goal="-Pdb=derby"
|
goal="-Pdb=derby"
|
||||||
elif [ "$RDBMS" == "derby_10_14" ]; then
|
|
||||||
goal="-Pdb=derby_old"
|
|
||||||
elif [ "$RDBMS" == "mysql" ] || [ "$RDBMS" == "mysql_5_7" ]; then
|
elif [ "$RDBMS" == "mysql" ] || [ "$RDBMS" == "mysql_5_7" ]; then
|
||||||
goal="-Pdb=mysql_ci"
|
goal="-Pdb=mysql_ci"
|
||||||
elif [ "$RDBMS" == "mariadb" ] || [ "$RDBMS" == "mariadb_10_3" ]; then
|
elif [ "$RDBMS" == "mariadb" ] || [ "$RDBMS" == "mariadb_10_3" ]; then
|
||||||
|
|
|
@ -94,7 +94,7 @@ import static org.hibernate.type.SqlTypes.VARBINARY;
|
||||||
import static org.hibernate.type.SqlTypes.VARCHAR;
|
import static org.hibernate.type.SqlTypes.VARCHAR;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A {@linkplain Dialect SQL dialect} for Apache Derby 10.14.2 and above.
|
* A {@linkplain Dialect SQL dialect} for Apache Derby 10.15.2 and above.
|
||||||
*
|
*
|
||||||
* @author Simon Johnston
|
* @author Simon Johnston
|
||||||
* @author Gavin King
|
* @author Gavin King
|
||||||
|
@ -113,7 +113,7 @@ public class DerbyDialect extends Dialect {
|
||||||
// * can't select a parameter unless wrapped
|
// * can't select a parameter unless wrapped
|
||||||
// in a cast or function call
|
// in a cast or function call
|
||||||
|
|
||||||
private final static DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 10, 14, 2 );
|
private final static DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 10, 15, 2 );
|
||||||
|
|
||||||
private final LimitHandler limitHandler = new DerbyLimitHandler( true );
|
private final LimitHandler limitHandler = new DerbyLimitHandler( true );
|
||||||
private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate(this);
|
private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate(this);
|
||||||
|
|
|
@ -28,7 +28,6 @@ stage('Configure') {
|
||||||
this.environments = [
|
this.environments = [
|
||||||
// Minimum supported versions
|
// Minimum supported versions
|
||||||
new BuildEnvironment( dbName: 'hsqldb_2_6' ),
|
new BuildEnvironment( dbName: 'hsqldb_2_6' ),
|
||||||
new BuildEnvironment( dbName: 'derby_10_14' ),
|
|
||||||
new BuildEnvironment( dbName: 'mysql_5_7' ),
|
new BuildEnvironment( dbName: 'mysql_5_7' ),
|
||||||
new BuildEnvironment( dbName: 'mariadb_10_3' ),
|
new BuildEnvironment( dbName: 'mariadb_10_3' ),
|
||||||
new BuildEnvironment( dbName: 'postgresql_11' ),
|
new BuildEnvironment( dbName: 'postgresql_11' ),
|
||||||
|
@ -113,10 +112,6 @@ stage('Build') {
|
||||||
state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
|
state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
|
||||||
" -Pgradle.libs.versions.hsqldb=2.6.1"
|
" -Pgradle.libs.versions.hsqldb=2.6.1"
|
||||||
break;
|
break;
|
||||||
case "derby_10_14":
|
|
||||||
state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
|
|
||||||
" -Pgradle.libs.versions.derby=10.14.2.0"
|
|
||||||
break;
|
|
||||||
case "mysql":
|
case "mysql":
|
||||||
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
|
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
|
||||||
docker.image('mysql:8.0.31').pull()
|
docker.image('mysql:8.0.31').pull()
|
||||||
|
|
|
@ -207,7 +207,7 @@ dependencyResolutionManagement {
|
||||||
|
|
||||||
def db2Version = version "db2", "11.5.8.0"
|
def db2Version = version "db2", "11.5.8.0"
|
||||||
// Latest Derby version 10.16.1.1 only supports JDK 17+, but 10.15.2 should be compatible
|
// Latest Derby version 10.16.1.1 only supports JDK 17+, but 10.15.2 should be compatible
|
||||||
def derbyVersion = version "dervy", overrideableVersion( "gradle.libs.versions.derby", "10.15.2.0" )
|
def derbyVersion = version "derby", overrideableVersion( "gradle.libs.versions.derby", "10.15.2.0" )
|
||||||
def firebirdVersion = version "firebird", "4.0.8.java11"
|
def firebirdVersion = version "firebird", "4.0.8.java11"
|
||||||
def hanaVersion = version "hana", "2.16.14"
|
def hanaVersion = version "hana", "2.16.14"
|
||||||
def h2gisVersion = version "h2gis", overrideableVersion( "gradle.libs.versions.h2gis", "2.2.0" )
|
def h2gisVersion = version "h2gis", overrideableVersion( "gradle.libs.versions.h2gis", "2.2.0" )
|
||||||
|
|
Loading…
Reference in New Issue