Merge PR #281
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/813f206f Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/813f206f Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/813f206f Branch: refs/heads/master Commit: 813f206ff71fe64363dd1d573838903ee4a972ef Parents: e1b6b63 c161a43 Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Apr 11 15:11:42 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Apr 11 15:11:42 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + cayenne-gradle-plugin/build.gradle | 6 ++ .../apache/cayenne/tools/BaseCayenneTask.java | 2 + .../org/apache/cayenne/tools/DbImportTask.java | 36 ++++---- .../tools/GradlePluginClassLoaderManager.java | 90 ++++++++++++++++++++ .../org/apache/cayenne/tools/DbImportIT.java | 15 +++- .../org/apache/cayenne/tools/my-test.gradle | 44 ++++++++++ maven-plugins/cayenne-maven-plugin/pom.xml | 4 +- .../apache/cayenne/tools/DbGeneratorMojo.java | 17 +++- .../apache/cayenne/tools/DbImporterMojo.java | 37 ++++---- .../tools/MavenPluginClassLoaderManager.java | 83 ++++++++++++++++++ .../org/apache/cayenne/stubs/ArtifactStub.java | 34 ++++++++ .../cayenne/stubs/CayenneProjectStub.java | 21 +++++ .../cayenne/tools/DbImporterMojoTest.java | 16 ++++ .../testAddedFlattenedRelationship-pom.xml | 5 ++ .../dbimport/testComplexChangeOrder-pom.xml | 6 ++ .../testCustomObjectLayerSettings-pom.xml | 6 ++ .../dbimport/testDbAttributeChange-pom.xml | 7 ++ .../tools/dbimport/testDefaultPackage-pom.xml | 6 ++ .../dbimport/testExcludeRelationship-pom.xml | 6 ++ .../testExcludeRelationshipFirst-pom.xml | 6 ++ .../dbimport/testFilteringWithSchema-pom.xml | 6 ++ .../dbimport/testFkAttributeRename-pom.xml | 6 ++ ...tFlattensManyToManyWithRecursiveLink-pom.xml | 8 +- .../dbimport/testForceDataMapSchema-pom.xml | 7 ++ .../testImportAddTableAndColumn-pom.xml | 8 +- .../tools/dbimport/testImportNewDataMap-pom.xml | 8 +- .../dbimport/testImportNewRelationship-pom.xml | 6 ++ .../dbimport/testImportWithoutChanges-pom.xml | 6 ++ .../tools/dbimport/testInheritance-pom.xml | 6 ++ .../tools/dbimport/testJava7Types-pom.xml | 9 +- .../tools/dbimport/testJava8Types-pom.xml | 6 ++ .../cayenne/tools/dbimport/testOneToOne-pom.xml | 8 +- .../testPreserveCustomObjMappings-pom.xml | 7 ++ .../dbimport/testPreserveRelationships-pom.xml | 8 +- .../dbimport/testSchemasAndTableExclude-pom.xml | 6 ++ .../dbimport/testSkipPrimaryKeyLoading-pom.xml | 8 +- .../testSkipRelationshipsLoading-pom.xml | 8 +- ...SupportsCatalogsOnReverseEngineering-pom.xml | 6 ++ .../tools/dbimport/testTableTypes-pom.xml | 8 +- .../dbimport/testUnFlattensManyToMany-pom.xml | 8 +- .../tools/dbimport/testViewsExclude-pom.xml | 6 ++ 42 files changed, 545 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/813f206f/RELEASE-NOTES.txt ----------------------------------------------------------------------
