This is an automated email from the ASF dual-hosted git repository. doebele pushed a commit to branch spring-boot in repository https://gitbox.apache.org/repos/asf/empire-db.git
commit 95e64c05c7b426c9b9bc3f09995759a0d053be4f Author: Rainer Döbele <[email protected]> AuthorDate: Tue Aug 17 15:47:23 2021 +0200 spring-boot integration --- empire-db-codegen/pom.xml | 2 +- .../src/test/resources/testconfig.xml | 2 +- .../testconfig_default_template_folder_nested.xml | 2 +- .../testconfig_invalid_template_folder.xml | 2 +- .../resources/testconfig_using_template_folder.xml | 2 +- .../empire-db-example-advanced/config.xml | 2 +- .../empire-db-example-advanced/pom.xml | 2 +- .../empire-db-example-basic/config.xml | 2 +- empire-db-examples/empire-db-example-basic/pom.xml | 2 +- .../empire-db-example-codegen/generate-config.xml | 2 +- .../empire-db-example-codegen/pom.xml | 8 ++-- .../empire-db-example-cxf/config.xml | 2 +- empire-db-examples/empire-db-example-cxf/pom.xml | 2 +- empire-db-examples/empire-db-example-jsf2/pom.xml | 2 +- .../src/main/webapp/WEB-INF/config.xml | 2 +- .../empire-db-example-spring-boot/.gitignore | 1 + .../empire-db-example-spring-boot/pom.xml | 56 +++++++++++----------- .../empire/samples/springboot/SampleApp.java | 4 +- .../empire-db-example-spring/pom.xml | 2 +- .../empire-db-example-struts2/pom.xml | 2 +- .../src/main/webapp/WEB-INF/config.xml | 2 +- empire-db-examples/empire-db-example-vue/pom.xml | 2 +- empire-db/pom.xml | 2 +- pom.xml | 11 ++++- 24 files changed, 64 insertions(+), 54 deletions(-) diff --git a/empire-db-codegen/pom.xml b/empire-db-codegen/pom.xml index 9818638..0e218f9 100644 --- a/empire-db-codegen/pom.xml +++ b/empire-db-codegen/pom.xml @@ -48,7 +48,7 @@ <!-- Databases --> <!-- hsql --> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> diff --git a/empire-db-codegen/src/test/resources/testconfig.xml b/empire-db-codegen/src/test/resources/testconfig.xml index cbf4c33..1d45a32 100644 --- a/empire-db-codegen/src/test/resources/testconfig.xml +++ b/empire-db-codegen/src/test/resources/testconfig.xml @@ -21,7 +21,7 @@ <properties> <!-- provider name must match the property-section containing the connection data --> - <jdbcClass>org.hsqldb.jdbcDriver</jdbcClass> + <jdbcClass>org.hsqldb.jdbc.JDBCDriver</jdbcClass> <jdbcURL>jdbc:hsqldb:file:src/test/resources/hsqldb/sample;shutdown=true</jdbcURL> <jdbcUser>sa</jdbcUser> <jdbcPwd></jdbcPwd> diff --git a/empire-db-codegen/src/test/resources/testconfig_default_template_folder_nested.xml b/empire-db-codegen/src/test/resources/testconfig_default_template_folder_nested.xml index bb7d008..831451f 100644 --- a/empire-db-codegen/src/test/resources/testconfig_default_template_folder_nested.xml +++ b/empire-db-codegen/src/test/resources/testconfig_default_template_folder_nested.xml @@ -21,7 +21,7 @@ <properties> <!-- provider name must match the property-section containing the connection data --> - <jdbcClass>org.hsqldb.jdbcDriver</jdbcClass> + <jdbcClass>org.hsqldb.jdbc.JDBCDriver</jdbcClass> <jdbcURL>jdbc:hsqldb:file:src/test/resources/hsqldb/sample;shutdown=true</jdbcURL> <jdbcUser>sa</jdbcUser> <jdbcPwd></jdbcPwd> diff --git a/empire-db-codegen/src/test/resources/testconfig_invalid_template_folder.xml b/empire-db-codegen/src/test/resources/testconfig_invalid_template_folder.xml index 26dc209..10549b8 100644 --- a/empire-db-codegen/src/test/resources/testconfig_invalid_template_folder.xml +++ b/empire-db-codegen/src/test/resources/testconfig_invalid_template_folder.xml @@ -21,7 +21,7 @@ <properties> <!-- provider name must match the property-section containing the connection data --> - <jdbcClass>org.hsqldb.jdbcDriver</jdbcClass> + <jdbcClass>org.hsqldb.jdbc.JDBCDriver</jdbcClass> <jdbcURL>jdbc:hsqldb:file:src/test/resources/hsqldb/sample;shutdown=true</jdbcURL> <jdbcUser>sa</jdbcUser> <jdbcPwd></jdbcPwd> diff --git a/empire-db-codegen/src/test/resources/testconfig_using_template_folder.xml b/empire-db-codegen/src/test/resources/testconfig_using_template_folder.xml index d2c25c5..c5b670a 100644 --- a/empire-db-codegen/src/test/resources/testconfig_using_template_folder.xml +++ b/empire-db-codegen/src/test/resources/testconfig_using_template_folder.xml @@ -21,7 +21,7 @@ <properties> <!-- provider name must match the property-section containing the connection data --> - <jdbcClass>org.hsqldb.jdbcDriver</jdbcClass> + <jdbcClass>org.hsqldb.jdbc.JDBCDriver</jdbcClass> <jdbcURL>jdbc:hsqldb:file:src/test/resources/hsqldb/sample;shutdown=true</jdbcURL> <jdbcUser>sa</jdbcUser> <jdbcPwd></jdbcPwd> diff --git a/empire-db-examples/empire-db-example-advanced/config.xml b/empire-db-examples/empire-db-example-advanced/config.xml index 40c23c7..422f9dd 100644 --- a/empire-db-examples/empire-db-example-advanced/config.xml +++ b/empire-db-examples/empire-db-example-advanced/config.xml @@ -27,7 +27,7 @@ <properties-hsqldb> <!-- JDBC properties for a HSQLDB Database connection --> <!-- Required jar file: hsqldb.jar --> - <jdbcClass>org.hsqldb.jdbcDriver</jdbcClass> + <jdbcClass>org.hsqldb.jdbc.JDBCDriver</jdbcClass> <jdbcURL>jdbc:hsqldb:file:hsqldb/sample;shutdown=true</jdbcURL> <jdbcUser>sa</jdbcUser> <jdbcPwd></jdbcPwd> diff --git a/empire-db-examples/empire-db-example-advanced/pom.xml b/empire-db-examples/empire-db-example-advanced/pom.xml index a85ddc7..f91980f 100644 --- a/empire-db-examples/empire-db-example-advanced/pom.xml +++ b/empire-db-examples/empire-db-example-advanced/pom.xml @@ -36,7 +36,7 @@ </dependency> <!-- This dependency should be declared as runtime but the exec plugin is broken atm... --> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <!-- <scope>runtime</scope> --> </dependency> diff --git a/empire-db-examples/empire-db-example-basic/config.xml b/empire-db-examples/empire-db-example-basic/config.xml index b2f695a..c986493 100644 --- a/empire-db-examples/empire-db-example-basic/config.xml +++ b/empire-db-examples/empire-db-example-basic/config.xml @@ -27,7 +27,7 @@ <properties-hsqldb> <!-- JDBC properties for a HSQLDB Database connection --> <!-- Required jar file: hsqldb.jar --> - <jdbcClass>org.hsqldb.jdbcDriver</jdbcClass> + <jdbcClass>org.hsqldb.jdbc.JDBCDriver</jdbcClass> <jdbcURL>jdbc:hsqldb:file:hsqldb/sample;shutdown=true</jdbcURL> <jdbcUser>sa</jdbcUser> <jdbcPwd></jdbcPwd> diff --git a/empire-db-examples/empire-db-example-basic/pom.xml b/empire-db-examples/empire-db-example-basic/pom.xml index eb11208..379d14d 100644 --- a/empire-db-examples/empire-db-example-basic/pom.xml +++ b/empire-db-examples/empire-db-example-basic/pom.xml @@ -37,7 +37,7 @@ <!-- This dependency should be declared as runtime but the exec plugin is broken atm... --> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <!-- <scope>runtime</scope> --> </dependency> diff --git a/empire-db-examples/empire-db-example-codegen/generate-config.xml b/empire-db-examples/empire-db-example-codegen/generate-config.xml index e428c4b..8cc7287 100644 --- a/empire-db-examples/empire-db-example-codegen/generate-config.xml +++ b/empire-db-examples/empire-db-example-codegen/generate-config.xml @@ -21,7 +21,7 @@ <properties> <!-- provider name must match the property-section containing the connection data --> - <jdbcClass>org.hsqldb.jdbcDriver</jdbcClass> + <jdbcClass>org.hsqldb.jdbc.JDBCDriver</jdbcClass> <jdbcURL>jdbc:hsqldb:file:src/test/resources/hsqldb/sample;shutdown=true</jdbcURL> <jdbcUser>sa</jdbcUser> <jdbcPwd></jdbcPwd> diff --git a/empire-db-examples/empire-db-example-codegen/pom.xml b/empire-db-examples/empire-db-example-codegen/pom.xml index bc896f6..0f32bf7 100644 --- a/empire-db-examples/empire-db-example-codegen/pom.xml +++ b/empire-db-examples/empire-db-example-codegen/pom.xml @@ -32,7 +32,7 @@ </dependency> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> </dependency> @@ -65,7 +65,7 @@ <!-- either specify a config file --> <configFile>generate-config.xml</configFile> <!-- or provide the parameters directly - <jdbcClass>org.hsqldb.jdbcDriver</jdbcClass> + <jdbcClass>org.hsqldb.jdbc.JDBCDriver</jdbcClass> <jdbcURL>jdbc:hsqldb:file:${project.basedir}/src/test/resources/hsqldb/sample;shutdown=true</jdbcURL> <jdbcUser>sa</jdbcUser> <jdbcPwd></jdbcPwd> @@ -85,9 +85,9 @@ --> <dependencies> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>1.8.0.10</version> + <version>2.3.6</version> </dependency> </dependencies> </plugin> diff --git a/empire-db-examples/empire-db-example-cxf/config.xml b/empire-db-examples/empire-db-example-cxf/config.xml index 0222afe..c6f5b1c 100644 --- a/empire-db-examples/empire-db-example-cxf/config.xml +++ b/empire-db-examples/empire-db-example-cxf/config.xml @@ -27,7 +27,7 @@ <properties-hsqldb> <!-- JDBC properties for a HSQLDB Database connection --> <!-- Required jar file: hsqldb.jar --> - <jdbcClass>org.hsqldb.jdbcDriver</jdbcClass> + <jdbcClass>org.hsqldb.jdbc.JDBCDriver</jdbcClass> <jdbcURL>jdbc:hsqldb:file:hsqldb/sample;shutdown=true</jdbcURL> <jdbcUser>sa</jdbcUser> <jdbcPwd></jdbcPwd> diff --git a/empire-db-examples/empire-db-example-cxf/pom.xml b/empire-db-examples/empire-db-example-cxf/pom.xml index 225bf45..4c256ee 100644 --- a/empire-db-examples/empire-db-example-cxf/pom.xml +++ b/empire-db-examples/empire-db-example-cxf/pom.xml @@ -40,7 +40,7 @@ broken atm... --> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <!-- <scope>runtime</scope> --> </dependency> diff --git a/empire-db-examples/empire-db-example-jsf2/pom.xml b/empire-db-examples/empire-db-example-jsf2/pom.xml index f1de700..b798353 100644 --- a/empire-db-examples/empire-db-example-jsf2/pom.xml +++ b/empire-db-examples/empire-db-example-jsf2/pom.xml @@ -86,7 +86,7 @@ </dependency> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> </dependency> diff --git a/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/config.xml b/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/config.xml index 5652785..353495e 100644 --- a/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/config.xml +++ b/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/config.xml @@ -20,7 +20,7 @@ <properties-hsqldb> <!-- JDBC properties for a HSQLDB Database connection --> <!-- Required jar file: hsqldb.jar --> - <jdbcClass>org.hsqldb.jdbcDriver</jdbcClass> + <jdbcClass>org.hsqldb.jdbc.JDBCDriver</jdbcClass> <jdbcURL>jdbc:hsqldb:file:hsqldb/sample;shutdown=true</jdbcURL> <jdbcUser>sa</jdbcUser> <jdbcPwd></jdbcPwd> diff --git a/empire-db-examples/empire-db-example-spring-boot/.gitignore b/empire-db-examples/empire-db-example-spring-boot/.gitignore new file mode 100644 index 0000000..b0b760b --- /dev/null +++ b/empire-db-examples/empire-db-example-spring-boot/.gitignore @@ -0,0 +1 @@ +/hsqldb/ diff --git a/empire-db-examples/empire-db-example-spring-boot/pom.xml b/empire-db-examples/empire-db-example-spring-boot/pom.xml index 71376ea..d6c2e26 100644 --- a/empire-db-examples/empire-db-example-spring-boot/pom.xml +++ b/empire-db-examples/empire-db-example-spring-boot/pom.xml @@ -2,46 +2,46 @@ <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.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>2.5.3</version> - <relativePath/> <!-- lookup parent from repository --> - </parent> - + <parent> + <groupId>org.apache.empire-db</groupId> + <artifactId>empire-db-examples</artifactId> + <version>2.5.1-SNAPSHOT</version> + </parent> <name>Apache Empire-db Spring Boot Example</name> <artifactId>empire-db-example-spring-boot</artifactId> <packaging>jar</packaging> - <properties> - <!-- The spring-boot-starter-parent chooses fairly conservative Java compatibility. If you want to follow our recommendation and use a later Java version you can add a java.version property --> - <java.version>8</java.version> - <maven.compiler.source>8</maven.compiler.source> - <maven.compiler.target>8</maven.compiler.target> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <dependencies> + <!-- <dependency> <groupId>org.apache.empire-db</groupId> <artifactId>empire-db</artifactId> <version>2.5.1-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-jdbc</artifactId> - </dependency> + --> + <dependency> + <groupId>org.apache.empire-db</groupId> + <artifactId>empire-db</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter</artifactId> + <version>2.5.3</version> + </dependency> + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-jdbc</artifactId> + <version>2.5.3</version> + </dependency> <!-- This dependency should be declared as runtime but the exec plugin is broken atm... --> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>runtime</scope> + </dependency> <!-- <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> diff --git a/empire-db-examples/empire-db-example-spring-boot/src/main/java/org/apache/empire/samples/springboot/SampleApp.java b/empire-db-examples/empire-db-example-spring-boot/src/main/java/org/apache/empire/samples/springboot/SampleApp.java index ed6609a..c4063db 100644 --- a/empire-db-examples/empire-db-example-spring-boot/src/main/java/org/apache/empire/samples/springboot/SampleApp.java +++ b/empire-db-examples/empire-db-example-spring-boot/src/main/java/org/apache/empire/samples/springboot/SampleApp.java @@ -266,7 +266,9 @@ public class SampleApp implements ApplicationRunner { } else { LOGGER.error("Failed to set property '{}'. Value is \"{}\"", name, value); } - } catch (IllegalAccessException | InvocationTargetException ex) { + } catch (IllegalAccessException ex) { + LOGGER.error(null, ex); + } catch (InvocationTargetException ex) { LOGGER.error(null, ex); } catch (NoSuchMethodException ex) { LOGGER.error("Property '{}' not found in {}", name, bean.getClass().getName()); diff --git a/empire-db-examples/empire-db-example-spring/pom.xml b/empire-db-examples/empire-db-example-spring/pom.xml index 92def29..ef5bd3c 100644 --- a/empire-db-examples/empire-db-example-spring/pom.xml +++ b/empire-db-examples/empire-db-example-spring/pom.xml @@ -71,7 +71,7 @@ <!-- This dependency should be declared as runtime but the exec plugin is broken atm... --> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <!-- <scope>runtime</scope> --> </dependency> diff --git a/empire-db-examples/empire-db-example-struts2/pom.xml b/empire-db-examples/empire-db-example-struts2/pom.xml index 076d272..8d85eab 100644 --- a/empire-db-examples/empire-db-example-struts2/pom.xml +++ b/empire-db-examples/empire-db-example-struts2/pom.xml @@ -45,7 +45,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> </dependency> <dependency> diff --git a/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/config.xml b/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/config.xml index 5a34c90..f1272a7 100644 --- a/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/config.xml +++ b/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/config.xml @@ -27,7 +27,7 @@ <properties-hsqldb> <!-- JDBC properties for a HSQLDB Database connection --> <!-- Required jar file: hsqldb.jar --> - <jdbcClass>org.hsqldb.jdbcDriver</jdbcClass> + <jdbcClass>org.hsqldb.jdbc.JDBCDriver</jdbcClass> <jdbcURL>jdbc:hsqldb:file:hsqldb/sample;shutdown=true</jdbcURL> <jdbcUser>sa</jdbcUser> <jdbcPwd></jdbcPwd> diff --git a/empire-db-examples/empire-db-example-vue/pom.xml b/empire-db-examples/empire-db-example-vue/pom.xml index 4f37ce0..c71d11a 100644 --- a/empire-db-examples/empire-db-example-vue/pom.xml +++ b/empire-db-examples/empire-db-example-vue/pom.xml @@ -40,7 +40,7 @@ <!-- hsql --> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> </dependency> diff --git a/empire-db/pom.xml b/empire-db/pom.xml index d62e88a..1197f8e 100644 --- a/empire-db/pom.xml +++ b/empire-db/pom.xml @@ -53,7 +53,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> diff --git a/pom.xml b/pom.xml index 038423a..4115162 100644 --- a/pom.xml +++ b/pom.xml @@ -293,12 +293,19 @@ <artifactId>commons-beanutils</artifactId> <version>1.9.3</version> </dependency> - <!-- databases --> + <!-- databases --> + <!-- <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>1.8.0.10</version> - </dependency> + </dependency> + --> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>2.3.6</version> + </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId>
