This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new 13b67e3 EMPIREDB-362 Maven optimization
13b67e3 is described below
commit 13b67e3f05e7665b7f994fef9defcbf7f32d0d65
Author: Rainer Döbele <[email protected]>
AuthorDate: Fri Feb 25 10:06:30 2022 +0100
EMPIREDB-362 Maven optimization
---
empire-db-codegen/pom.xml | 4 ---
.../empire-db-example-advanced/pom.xml | 4 ---
empire-db-examples/empire-db-example-basic/pom.xml | 4 ---
.../empire-db-example-codegen/generate-example.xml | 6 ++--
.../empire-db-example-codegen/pom.xml | 42 +++++++++++++---------
empire-db-examples/empire-db-example-jsf2/pom.xml | 4 ---
empire-db-examples/empire-db-example-vue/pom.xml | 4 ---
empire-db-examples/pom.xml | 21 +++++++----
empire-db/pom.xml | 5 ---
pom.xml | 12 +------
10 files changed, 44 insertions(+), 62 deletions(-)
diff --git a/empire-db-codegen/pom.xml b/empire-db-codegen/pom.xml
index 88c03b8..6854d00 100644
--- a/empire-db-codegen/pom.xml
+++ b/empire-db-codegen/pom.xml
@@ -44,10 +44,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </dependency>
<!-- This dependency should be declared as runtime but the exec
plugin is broken atm... -->
<!-- hsqldb -->
diff --git a/empire-db-examples/empire-db-example-advanced/pom.xml
b/empire-db-examples/empire-db-example-advanced/pom.xml
index 9080534..5734cda 100644
--- a/empire-db-examples/empire-db-example-advanced/pom.xml
+++ b/empire-db-examples/empire-db-example-advanced/pom.xml
@@ -35,10 +35,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </dependency>
<!-- databases -->
<!-- hsqldb -->
diff --git a/empire-db-examples/empire-db-example-basic/pom.xml
b/empire-db-examples/empire-db-example-basic/pom.xml
index 2f01af9..0addee2 100644
--- a/empire-db-examples/empire-db-example-basic/pom.xml
+++ b/empire-db-examples/empire-db-example-basic/pom.xml
@@ -35,10 +35,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </dependency>
<!-- databases -->
<!-- hsqldb -->
diff --git a/empire-db-examples/empire-db-example-codegen/generate-example.xml
b/empire-db-examples/empire-db-example-codegen/generate-example.xml
index 229913c..52e5e4e 100644
--- a/empire-db-examples/empire-db-example-codegen/generate-example.xml
+++ b/empire-db-examples/empire-db-example-codegen/generate-example.xml
@@ -49,9 +49,9 @@
<tablePackageName></tablePackageName>
<viewPackageName></viewPackageName>
<recordPackageName></recordPackageName>
- <tableBaseName>CSTable</tableBaseName>
- <viewBaseName>CSView</viewBaseName>
- <recordBaseName>CSRecord</recordBaseName>
+ <tableBaseName>CarSalesTable</tableBaseName>
+ <viewBaseName>CarSalesView</viewBaseName>
+ <recordBaseName>CarSalesRecord</recordBaseName>
<tableNamePrefix></tableNamePrefix>
<tableClassPrefix></tableClassPrefix>
<tableClassSuffix></tableClassSuffix>
diff --git a/empire-db-examples/empire-db-example-codegen/pom.xml
b/empire-db-examples/empire-db-example-codegen/pom.xml
index c965dab..9d45686 100644
--- a/empire-db-examples/empire-db-example-codegen/pom.xml
+++ b/empire-db-examples/empire-db-example-codegen/pom.xml
@@ -21,9 +21,11 @@
<artifactId>empire-db-examples</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
+
<artifactId>empire-db-example-codegen</artifactId>
<name>Apache Empire-db Maven Codegen Example</name>
<description>Example showing the use of the empire-db codegen maven
plugin</description>
+ <packaging>pom</packaging>
<dependencies>
@@ -62,21 +64,6 @@
<debug>true</debug>
</configuration>
</plugin>
- <!-- skip some -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<!-- empire-db-maven-plugin -->
<plugin>
<groupId>org.apache.empire-db</groupId>
@@ -95,7 +82,9 @@
<dbClassName>MyDatabase</dbClassName>
-->
</configuration>
- <!-- Don't define executions. Instead run with:
mvn empire-db:codegen
+ <!-- Don't define executions. Instead run with:
-->
+ <!-- mvn empire-db:codegen -->
+ <!--
<executions>
<execution>
<goals>
@@ -113,6 +102,27 @@
</dependencies>
</plugin>
</plugins>
+
+ <pluginManagement>
+ <plugins>
+ <!-- skip some -->
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
</build>
</project>
\ No newline at end of file
diff --git a/empire-db-examples/empire-db-example-jsf2/pom.xml
b/empire-db-examples/empire-db-example-jsf2/pom.xml
index 4c7aaaf..166cde6 100644
--- a/empire-db-examples/empire-db-example-jsf2/pom.xml
+++ b/empire-db-examples/empire-db-example-jsf2/pom.xml
@@ -82,10 +82,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </dependency>
<!-- All Databases (scope: runtime) -->
<!-- hsqldb -->
diff --git a/empire-db-examples/empire-db-example-vue/pom.xml
b/empire-db-examples/empire-db-example-vue/pom.xml
index fc60020..f5095a0 100644
--- a/empire-db-examples/empire-db-example-vue/pom.xml
+++ b/empire-db-examples/empire-db-example-vue/pom.xml
@@ -87,10 +87,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </dependency>
<!-- All Databases (scope: runtime) -->
<!-- hsqldb -->
diff --git a/empire-db-examples/pom.xml b/empire-db-examples/pom.xml
index 331aa50..54fd620 100644
--- a/empire-db-examples/pom.xml
+++ b/empire-db-examples/pom.xml
@@ -42,14 +42,21 @@
<build>
<pluginManagement>
<plugins>
+ <!-- skip install for all examples -->
<plugin>
- <!-- skip deployment for all examples
-->
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
+
<artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <!-- skip deployment for all examples -->
+ <plugin>
+
<artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
</build>
</project>
\ No newline at end of file
diff --git a/empire-db/pom.xml b/empire-db/pom.xml
index 7a6e0d9..511218e 100644
--- a/empire-db/pom.xml
+++ b/empire-db/pom.xml
@@ -41,11 +41,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<scope>test</scope>
diff --git a/pom.xml b/pom.xml
index 0fc0306..78e7ea1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,22 +277,12 @@
<artifactId>slf4j-reload4j</artifactId>
<version>1.7.36</version>
</dependency>
+ <!-- indirectly through slf4j-reload4j
<dependency>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.36</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
-->
<!-- commons -->
<dependency>
