You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2022/01/23 18:38:09 UTC
[empire-db] branch version3 updated: EMPIREDB-362 pom changes
This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch version3
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/version3 by this push:
new a13bb61 EMPIREDB-362 pom changes
a13bb61 is described below
commit a13bb6172e0105900daa4ec865bd14eab75115b5
Author: Rainer Döbele <do...@apache.org>
AuthorDate: Sun Jan 23 19:38:08 2022 +0100
EMPIREDB-362 pom changes
---
empire-db-codegen/pom.xml | 13 +++++----
.../empire-db-example-codegen/pom.xml | 4 +--
.../vue/sample/db/records/DepartmentRecord.java | 2 +-
.../vue/sample/db/records/EmployeeRecord.java | 2 +-
.../empire/vue/sample/db/records/SampleRecord.java | 6 ++--
empire-db/pom.xml | 32 ----------------------
.../org/apache/empire/db/DBDatabaseDriver.java | 3 +-
pom.xml | 15 ++++++++++
8 files changed, 31 insertions(+), 46 deletions(-)
diff --git a/empire-db-codegen/pom.xml b/empire-db-codegen/pom.xml
index f616b5e..9365880 100644
--- a/empire-db-codegen/pom.xml
+++ b/empire-db-codegen/pom.xml
@@ -81,13 +81,14 @@
-->
</dependencies>
-
+
<build>
- <resources>
- <resource>
- <directory>src/main/resources/templates</directory>
- <filtering>true</filtering>
- </resource>
+ <resources>
+ <resource>
+ <directory>src/main/resources/templates</directory>
+ <filtering>true</filtering>
+ </resource>
</resources>
</build>
+
</project>
\ No newline at end of file
diff --git a/empire-db-examples/empire-db-example-codegen/pom.xml b/empire-db-examples/empire-db-example-codegen/pom.xml
index 2d4217a..515db60 100644
--- a/empire-db-examples/empire-db-example-codegen/pom.xml
+++ b/empire-db-examples/empire-db-example-codegen/pom.xml
@@ -50,8 +50,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<optimize>true</optimize>
<debug>true</debug>
</configuration>
diff --git a/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/DepartmentRecord.java b/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/DepartmentRecord.java
index 898a0d5..c0320ff 100644
--- a/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/DepartmentRecord.java
+++ b/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/DepartmentRecord.java
@@ -23,7 +23,7 @@ import org.apache.empire.vue.sample.db.SampleDB.TDepartments;
public class DepartmentRecord extends SampleRecord<TDepartments>
{
- // *Deprecated* private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public DepartmentRecord(RecordContext recordContext)
{
diff --git a/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/EmployeeRecord.java b/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/EmployeeRecord.java
index de5490b..25c3fc1 100644
--- a/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/EmployeeRecord.java
+++ b/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/EmployeeRecord.java
@@ -28,7 +28,7 @@ import org.apache.empire.vue.sample.db.SampleDB.TEmployees;
public class EmployeeRecord extends SampleRecord<TEmployees>
{
- // *Deprecated* private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public EmployeeRecord(RecordContext recordContext)
{
diff --git a/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/SampleRecord.java b/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/SampleRecord.java
index d30c939..323398e 100644
--- a/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/SampleRecord.java
+++ b/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/vue/sample/db/records/SampleRecord.java
@@ -35,9 +35,9 @@ import org.apache.empire.vue.sample.db.RecordContext;
import org.apache.empire.vue.sample.db.SampleTable;
-public abstract class SampleRecord<T extends SampleTable> extends DBRecord {
-
- // *Deprecated* private static final long serialVersionUID = 1L;
+public abstract class SampleRecord<T extends SampleTable> extends DBRecord
+{
+ private static final long serialVersionUID = 1L;
protected final T T; // The table
protected final RecordContext recordContext;
diff --git a/empire-db/pom.xml b/empire-db/pom.xml
index de73e11..a1e9ab3 100644
--- a/empire-db/pom.xml
+++ b/empire-db/pom.xml
@@ -94,36 +94,4 @@
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!-- Eclipse: void message "maven-remote-resources-plugin (goal "process") is ignored by m2e." -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
</project>
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java b/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
index 5ee61f3..23cef15 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
@@ -125,12 +125,13 @@ public interface DBDatabaseDriver
/**
* Executes an select SQL-command that returns only one scalar value
+ * if no row are returned by the query then ObjectUtils.NO_VALUE is returned
*
* @param sqlCmd the SQL-Command
* @param sqlParams array of sql command parameters used for prepared statements (Optional).
* @param dataType the requested return type
* @param conn a valid connection to the database.
- * @return the scalar result value
+ * @return the scalar result value or ObjectUtils.NO_VALUE if no row are returned by the query
*/
public Object querySingleValue(String sqlCmd, Object[] sqlParams, DataType dataType, Connection conn);
diff --git a/pom.xml b/pom.xml
index d1f7ca3..e24b553 100644
--- a/pom.xml
+++ b/pom.xml
@@ -682,6 +682,21 @@
<ignore />
</action>
</pluginExecution>
+ <!-- maven-remote-resources-plugin -->
+ <!-- Eclipse: avoid message "maven-remote-resources-plugin (goal "process") is ignored by m2e." -->
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>