Repository: cayenne Updated Branches: refs/heads/master 514ae7ff5 -> 805c00404
Fix build on Java 11 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/805c0040 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/805c0040 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/805c0040 Branch: refs/heads/master Commit: 805c004049567770bb621b369d4095e743eed2b5 Parents: 514ae7f Author: Nikita Timofeev <[email protected]> Authored: Fri Jul 13 11:46:49 2018 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Fri Jul 13 11:46:49 2018 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/tools/DbImportIT.java | 2 ++ .../org/apache/cayenne/tools/empty_db.sql | 22 ++++++++++++++++++++ 2 files changed, 24 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/805c0040/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java index 3933750..734e581 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java @@ -56,6 +56,7 @@ public class DbImportIT extends BaseTaskIT { @Test public void emptyDbTaskSuccess() throws Exception { + prepareDerbyDatabase("empty_db"); // create empty db to avoid problems on Java 11 GradleRunner runner = createRunner("dbimport_empty_db", "cdbimport", "--info"); BuildResult result = runner.build(); @@ -70,6 +71,7 @@ public class DbImportIT extends BaseTaskIT { @Test public void emptyDbTaskWithDependency() throws Exception { + prepareDerbyDatabase("empty_db"); // create empty db to avoid problems on Java 11 GradleRunner runner = createRunner("dbimport-with-project-dependency", "cdbimport", "--info"); BuildResult result = runner.build(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/805c0040/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/empty_db.sql ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/empty_db.sql b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/empty_db.sql new file mode 100644 index 0000000..99c45e9 --- /dev/null +++ b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/empty_db.sql @@ -0,0 +1,22 @@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. + +-- Test Schema for dbimport task test + + +CREATE SCHEMA schema_01; +SET SCHEMA schema_01; \ No newline at end of file
