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 b82ae83 prepare-release
b82ae83 is described below
commit b82ae83d5e492b5764210af0f0a497fec99ff85e
Author: Rainer Döbele <[email protected]>
AuthorDate: Tue Jan 18 14:07:34 2022 +0100
prepare-release
---
.../main/java/org/apache/empire/commons/ErrorType.java | 1 -
.../java/org/apache/empire/commons/ObjectUtils.java | 4 ++--
.../java/org/apache/empire/commons/OptionEntry.java | 1 -
.../src/main/java/org/apache/empire/data/Column.java | 1 -
.../main/java/org/apache/empire/data/ColumnExpr.java | 1 -
.../src/main/java/org/apache/empire/data/Record.java | 1 -
.../src/main/java/org/apache/empire/db/DBView.java | 1 -
.../org/apache/empire/db/expr/column/DBAliasExpr.java | 1 -
.../org/apache/empire/db/expr/column/DBCalcExpr.java | 1 -
.../org/apache/empire/db/expr/column/DBConcatExpr.java | 1 -
pom.xml | 18 ++++++++++++++----
11 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java
b/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java
index 672a587..74bad20 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java
@@ -32,7 +32,6 @@ import java.io.Serializable;
* <P>
* The MessagePattern is a template containing the error message and
placeholders for additional parameters.
* The MessagePattern must be formated according to the {@link
java.text.MessageFormat} rules.
- * <P>
*/
public class ErrorType implements Serializable
{
diff --git a/empire-db/src/main/java/org/apache/empire/commons/ObjectUtils.java
b/empire-db/src/main/java/org/apache/empire/commons/ObjectUtils.java
index d85afa5..b077ec2 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/ObjectUtils.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/ObjectUtils.java
@@ -584,7 +584,7 @@ public final class ObjectUtils
}
/**
- * Convert Enum<?> to Object
+ * Convert Enum to Object
*/
public static Object getEnumValue(Enum<?> enumValue, boolean isNumeric)
{
@@ -596,7 +596,7 @@ public final class ObjectUtils
}
/**
- * Convert Enum<?> to String
+ * Convert Enum to String
*/
public static String getString(Enum<?> enumValue)
{
diff --git a/empire-db/src/main/java/org/apache/empire/commons/OptionEntry.java
b/empire-db/src/main/java/org/apache/empire/commons/OptionEntry.java
index d4e8f3a..655b2e5 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/OptionEntry.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/OptionEntry.java
@@ -25,7 +25,6 @@ import java.io.Serializable;
* This class is used by the Options class to implement a set of options
* where the option value us used as the key for the set.<BR>
* The text should only be used for display purposes e.g. to display a
drop-down in a user interface.<BR>
- * <P>
*/
public class OptionEntry implements Serializable
{
diff --git a/empire-db/src/main/java/org/apache/empire/data/Column.java
b/empire-db/src/main/java/org/apache/empire/data/Column.java
index fa92525..938ca1b 100644
--- a/empire-db/src/main/java/org/apache/empire/data/Column.java
+++ b/empire-db/src/main/java/org/apache/empire/data/Column.java
@@ -22,7 +22,6 @@ package org.apache.empire.data;
* The column interface provides methods for accessing metadata that is only
relevant for updating records.
* <P>
* This interface inherits from ColumnExpr which provides further metadata.
- * <P>
*/
public interface Column extends ColumnExpr
{
diff --git a/empire-db/src/main/java/org/apache/empire/data/ColumnExpr.java
b/empire-db/src/main/java/org/apache/empire/data/ColumnExpr.java
index 515879f..a045c87 100644
--- a/empire-db/src/main/java/org/apache/empire/data/ColumnExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/data/ColumnExpr.java
@@ -23,7 +23,6 @@ import org.apache.empire.commons.Options;
/**
* The column interface provides methods for accessing metadata that is
relevant for managing
* and displaying data available through the RecordData interface.
- * <P>
*/
public interface ColumnExpr
{
diff --git a/empire-db/src/main/java/org/apache/empire/data/Record.java
b/empire-db/src/main/java/org/apache/empire/data/Record.java
index 470d0df..c64a8fa 100644
--- a/empire-db/src/main/java/org/apache/empire/data/Record.java
+++ b/empire-db/src/main/java/org/apache/empire/data/Record.java
@@ -31,7 +31,6 @@ import org.apache.empire.commons.Options;
* This interface inherits from RecordData which provides further data access
methods.
* <P>
* The Record interface is implemented by the class {@link
org.apache.empire.db.DBRecord}
- * <P>
*/
public interface Record extends RecordData
{
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBView.java
b/empire-db/src/main/java/org/apache/empire/db/DBView.java
index 44397de..535a9fc 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBView.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBView.java
@@ -35,7 +35,6 @@ import org.w3c.dom.Element;
/**
* This class represents a database view.
* It contains methods to get and update records from the database
- * <P>
*/
public abstract class DBView extends DBRowSet
{
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java
index dddbee4..3ab8d35 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java
@@ -37,7 +37,6 @@ import java.util.Set;
* <P>
* There is no need to explicitly create instances of this class.<BR>
* Instead use {@link DBColumnExpr#as(String) }
- * <P>
*/
public class DBAliasExpr extends DBColumnExpr
{
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java
index 2dbcd6a..f68239a 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java
@@ -37,7 +37,6 @@ import org.w3c.dom.Element;
* There is no need to explicitly create instances of this class.<BR>
* Instead use {@link DBColumnExpr#plus(Object) }, {@link
DBColumnExpr#minus(Object) },
* {@link DBColumnExpr#multiplyWith(Object) }, {@link
DBColumnExpr#divideBy(Object) }
- * <P>
*/
public class DBCalcExpr extends DBColumnExpr
{
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java
index e674ae9..2ce7bf6 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java
@@ -37,7 +37,6 @@ import java.util.Set;
* <P>
* There is no need to explicitly create instances of this class.<BR>
* Instead use {@link DBColumnExpr#append(Object) }
- * <P>
*/
public class DBConcatExpr extends DBColumnExpr
{
diff --git a/pom.xml b/pom.xml
index 46cb2af..d4abdfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,10 +118,13 @@
</execution>
</executions>
</plugin>
- <!-- temporarily disable due to build
problem
+ <!-- temporarily disable due to build
problem -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+
<additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -131,7 +134,6 @@
</execution>
</executions>
</plugin>
- -->
</plugins>
</build>
</profile>
@@ -179,6 +181,14 @@
</execution>
</executions>
</plugin>
+ <!-- temporarily disable due to build
problem -->
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+
<additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
@@ -803,11 +813,11 @@
<artifactId>maven-jxr-plugin</artifactId>
<version>2.4</version>
</plugin>
- <!-- maven-javadoc-plugin
- temporarily disable due to build problem
+ <!-- maven-javadoc-plugin
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
</plugin>
-->
<!-- maven-changelog-plugin -->
