Skip to content

Commit

Permalink
update maven plugin #1010
Browse files Browse the repository at this point in the history
  • Loading branch information
btootomoyuk committed Nov 9, 2020
1 parent 4aae4e0 commit bda5c69
Show file tree
Hide file tree
Showing 76 changed files with 199 additions and 248 deletions.
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
</scm>
<properties>
<!-- == Maven Plugin Versions == -->
<jacoco-maven-plugin.version>0.7.5.201505241946</jacoco-maven-plugin.version>
<formatter-maven-plugin.version>2.0.1</formatter-maven-plugin.version>
<xml-maven-plugin.version>1.0.1</xml-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
<formatter-maven-plugin.version>2.13.0</formatter-maven-plugin.version>
<xml-maven-plugin.version>1.0.2</xml-maven-plugin.version>
<com.google.code.maven-license-plugin.version>1.4.0</com.google.code.maven-license-plugin.version>
<coveralls-maven-plugin.version>4.1.0</coveralls-maven-plugin.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<!-- == Project Properties == -->
Expand Down
12 changes: 6 additions & 6 deletions terasoluna-gfw-common-libraries/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,13 @@
</build>
<properties>
<!-- == Maven Plugin Versions == -->
<maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
<jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
<com.google.code.maven-license-plugin.version>1.4.0</com.google.code.maven-license-plugin.version>
<formatter-maven-plugin.version>2.0.1</formatter-maven-plugin.version>
<xml-maven-plugin.version>1.0.1</xml-maven-plugin.version>
<coveralls-maven-plugin.version>4.1.0</coveralls-maven-plugin.version>
<formatter-maven-plugin.version>2.13.0</formatter-maven-plugin.version>
<xml-maven-plugin.version>1.0.2</xml-maven-plugin.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<!-- == Project Properties == -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<archetype.test.skip>true</archetype.test.skip>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@
* }
* }</code>
* </pre>
*
* @since 5.1.0
*/
public class CodePoints implements Serializable {
Expand Down Expand Up @@ -259,8 +260,8 @@ public CodePoints(CodePoints codePoints) {
/**
* returns whether all code points in the given string are included in the target code points.
* @param s target string
* @return {@code true} if all code points in the given string are included in the target code points。Otherwise
* {@code false} is returned.
* @return {@code true} if all code points in the given string are included in the target code points。Otherwise {@code false} is
* returned.
*/
public boolean containsAll(String s) {
return this.firstExcludedCodePoint(s) == NOT_FOUND;
Expand All @@ -269,8 +270,8 @@ public boolean containsAll(String s) {
/**
* returns the first code point in the given string which is not included in the target code points.
* @param s target string
* @return first code point in the given string which is not included in the target code points. {@link #NOT_FOUND} is
* returned if all code points in the given string are included in the target code points.
* @return first code point in the given string which is not included in the target code points. {@link #NOT_FOUND} is returned
* if all code points in the given string are included in the target code points.
*/
public int firstExcludedCodePoint(String s) {
if (s == null || s.isEmpty()) {
Expand All @@ -291,8 +292,8 @@ public int firstExcludedCodePoint(String s) {
/**
* returns set of code points in the given string which are not not included in the target.
* @param s target string
* @return set of code points in the given string which are not not included in the target. an empty set is returned if all
* code points in the given string are included in the target code points.
* @return set of code points in the given string which are not not included in the target. an empty set is returned if all code
* points in the given string are included in the target code points.
*/
public Set<Integer> allExcludedCodePoints(String s) {
if (s == null || s.isEmpty()) {
Expand Down Expand Up @@ -345,8 +346,8 @@ public CodePoints intersect(CodePoints codePoints) {
}

/**
* Produces cached {@link CodePoints}. At first time, a new {@link CodePoints} is created. After second time, same instance
* is returned.
* Produces cached {@link CodePoints}. At first time, a new {@link CodePoints} is created. After second time, same instance is
* returned.
* @param clazz {@link CodePoints} class to create
* @param <T> {@link CodePoints} class
* @return cached instance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ protected Map<String, String> retrieveMap() {

/**
* Sets DataSource. <br>
* <strong>Note that 'fetch size' is set by default (depends on JDBC implementation). Default 'fetch size' cause slow
* response possibly when the size of codelist is large. If you want to set fetch size, use
* {@link #setJdbcTemplate(JdbcTemplate)} instead. </strong>
* <strong>Note that 'fetch size' is set by default (depends on JDBC implementation). Default 'fetch size' cause slow response
* possibly when the size of codelist is large. If you want to set fetch size, use {@link #setJdbcTemplate(JdbcTemplate)}
* instead. </strong>
* @param dataSource DataSource instance for fetching code list records
*/
public void setDataSource(DataSource dataSource) {
Expand All @@ -94,8 +94,8 @@ public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
}

/**
* This method is called after the codelist is initialized Checks whether the values of querySql, valueColumn, labelColumn
* and jdbcTemplate properties are set
* This method is called after the codelist is initialized Checks whether the values of querySql, valueColumn, labelColumn and
* jdbcTemplate properties are set
* @see org.terasoluna.gfw.common.codelist.AbstractReloadableCodeList#afterPropertiesSet()
*/
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public void setValueFormat(String valueFormat) {
}

/**
* Gets the display format of the value part of the codelist
* Gets the display format of the value part of the codelist
* @return valueFormat format string for code value
*/
public String getValueFormat() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

/**
* Adds Reloadable support to {@link I18nCodeList}
*
* @since 5.4.2
*/
public interface ReloadableI18nCodeList extends I18nCodeList,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
* <p>
* To build a table of codelist, set a map of the {@link Locale} and the corresponding {@link ReloadableCodeList}.<br>
* </p>
*
*
* <h3>set by rows with {@link ReloadableCodeList}</h3>
*
* <pre>
Expand Down Expand Up @@ -75,7 +73,6 @@
* &lt;property name=&quot;valueColumn&quot; value=&quot;code&quot; /&gt;
* &lt;property name=&quot;labelColumn&quot; value=&quot;label&quot; /&gt;
* &lt;/bean&gt;
*
* </pre>
*
* @since 5.4.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
*/
/**
* Classes related to internationalization support of {@code CodeList} functionality
*
*/
package org.terasoluna.gfw.common.codelist.i18n;
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@
* <pre>
* Package for CodeList functionality
* </pre>
*
*/
package org.terasoluna.gfw.common.codelist;
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,10 @@
* create current system date as
* </p>
* <ul>
* <li>
* {@link java.util.Date}</li>
* <li>
* {@link java.sql.Date}</li>
* <li>
* {@link java.sql.Timestamp}</li>
* <li>
* {@link java.sql.Time}</li>
* <li>{@link java.util.Date}</li>
* <li>{@link java.sql.Date}</li>
* <li>{@link java.sql.Timestamp}</li>
* <li>{@link java.sql.Time}</li>
* </ul>
* @since 5.0.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@
*/
/**
* date package.
*
*
*/
package org.terasoluna.gfw.common.date;
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,7 @@ public boolean isEnabled() {
* <p>
* Logs messages of Info level in Monitoring log and Application log if Info logging in these loggers are enabled.
* </p>
* @see org.terasoluna.gfw.common.exception.ExceptionLogger.LogLevelWrappingLogger#log(java.lang.String,
* java.lang.Exception)
* @see org.terasoluna.gfw.common.exception.ExceptionLogger.LogLevelWrappingLogger#log(java.lang.String, java.lang.Exception)
*/
@Override
public void log(String logMessage, Exception ex) {
Expand Down Expand Up @@ -511,8 +510,7 @@ public boolean isEnabled() {
* <p>
* Logs messages of Warn level in Monitoring log and Application log if Warn logging in these loggers are enabled.
* </p>
* @see org.terasoluna.gfw.common.exception.ExceptionLogger.LogLevelWrappingLogger#log(java.lang.String,
* java.lang.Exception)
* @see org.terasoluna.gfw.common.exception.ExceptionLogger.LogLevelWrappingLogger#log(java.lang.String, java.lang.Exception)
*/
@Override
public void log(String logMessage, Exception ex) {
Expand Down Expand Up @@ -545,8 +543,7 @@ public boolean isEnabled() {
* <p>
* Logs messages of Error level in Monitoring log and Application log if error logging in these loggers are enabled.
* </p>
* @see org.terasoluna.gfw.common.exception.ExceptionLogger.LogLevelWrappingLogger#log(java.lang.String,
* java.lang.Exception)
* @see org.terasoluna.gfw.common.exception.ExceptionLogger.LogLevelWrappingLogger#log(java.lang.String, java.lang.Exception)
*/
@Override
public void log(String logMessage, Exception ex) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
* governing permissions and limitations under the License.
*/
/**
* Package containing functionality for handling exceptions that occur
* in logic under Spring MVC
*
* Package containing functionality for handling exceptions that occur in logic under Spring MVC
*/
package org.terasoluna.gfw.common.exception;
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ public enum StandardResultMessageType implements ResultMessageType {
* message type is <code>warn</code>.
* @deprecated Instead of this value, please use {@link #WARNING}. This value will be removed in the future.
*/
@Deprecated WARN("warn"),
@Deprecated
WARN("warn"),
/**
* message type is <code>warning</code>.
* @since 5.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
* governing permissions and limitations under the License.
*/
/**
* Package for class that provide Message management functionality for
* messages displayed on screen or in reports.
*
* Package for class that provide Message management functionality for messages displayed on screen or in reports.
*/
package org.terasoluna.gfw.common.message;
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ public static String toContainingCondition(String condition) {
* withFullWidth().toLikeCondition(null) -&gt; null
* </code>
* </pre>
*
* @return LikeConditionEscape that escape full-width wildcards.
* @since 1.0.2
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@
/**
* Package that contains classes to process the database query string <br>
* For Ex. Escaping the query string.
*
*/
package org.terasoluna.gfw.common.query;
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ public void setSequenceClass(Class<T> sequenceClass) {
}

/**
* Sets the DataSource information used for accessing the database for fetching the next value of the sequence. must not be
* null
* Sets the DataSource information used for accessing the database for fetching the next value of the sequence. must not be null
* @param dataSource DataSource instance for fetching a sequence value
*/
public void setDataSource(DataSource dataSource) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
* governing permissions and limitations under the License.
*/
/**
* Package that contains classes that provide functionality to generate sequences.
* For Ex: primary key of database table.
*
* Package that contains classes that provide functionality to generate sequences. For Ex: primary key of database table.
*/
package org.terasoluna.gfw.common.sequencer;
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public void testRetrieveMap02() {
}

/**
* check retrieveMap method. Setting jdbcTemplate instead of dataSource.
* check retrieveMap method. Setting jdbcTemplate instead of dataSource.
*/
@Test
public void testRetrieveMap03() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
public class NumberRangeCodeListTest {

/**
* Tests the following : 1) the codelist is initialized with the range of numbers (contents & size) 2) the order of the
* numbers in the codelist in ascending
* Tests the following : 1) the codelist is initialized with the range of numbers (contents & size) 2) the order of the numbers
* in the codelist in ascending
* @throws Exception
*/
@Test
Expand Down Expand Up @@ -84,8 +84,8 @@ public void TestAfterPropertiesSet02() throws Exception {
}

/**
* Tests the following : 1) the codelist is initialized with the range of numbers (contents & size) 2) the order of the
* numbers in the codelist in descending
* Tests the following : 1) the codelist is initialized with the range of numbers (contents & size) 2) the order of the numbers
* in the codelist in descending
* @throws Exception
*/
@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ public void tearDown() throws Exception {
}

/**
* check whether the Map returned by asMap is same as the one set through setMap also check whether getCodeListID returns
* the same value as the one set through setBeanName
* check whether the Map returned by asMap is same as the one set through setMap also check whether getCodeListID returns the
* same value as the one set through setBeanName
*/
@Test
public void testAsMap01() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,17 +236,23 @@ public TestData(String input, String expectedToLikeCondition,
? new StringBuilder()
: new StringBuilder(expectedToLikeConditionWithFullWidth);
this.expectedStartingWithCondition = (expectedToLikeCondition == null)
? null : expectedToLikeCondition + "%";
? null
: expectedToLikeCondition + "%";
this.expectedStartingWithConditionWithFullWidth = (expectedToLikeConditionWithFullWidth == null)
? null : expectedToLikeConditionWithFullWidth + "%";
? null
: expectedToLikeConditionWithFullWidth + "%";
this.expectedEndingWithCondition = (expectedToLikeCondition == null)
? null : "%" + expectedToLikeCondition;
? null
: "%" + expectedToLikeCondition;
this.expectedEndingWithConditionWithFullWidth = (expectedToLikeConditionWithFullWidth == null)
? null : "%" + expectedToLikeConditionWithFullWidth;
? null
: "%" + expectedToLikeConditionWithFullWidth;
this.expectedContainingCondition = (expectedToLikeCondition == null)
? null : "%" + expectedToLikeCondition + "%";
? null
: "%" + expectedToLikeCondition + "%";
this.expectedContainingConditionWithFullWidth = (expectedToLikeConditionWithFullWidth == null)
? null : "%" + expectedToLikeConditionWithFullWidth + "%";
? null
: "%" + expectedToLikeConditionWithFullWidth + "%";
this.expectedToLikeConditionIsNull = (expectedToLikeCondition == null)
? new StringBuilder()
: new StringBuilder(expectedToLikeCondition);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,11 @@
* create current system date as
* </p>
* <ul>
* <li>
* {@link org.joda.time.DateTime}</li>
* <li>
* {@link java.util.Date}</li>
* <li>
* {@link java.sql.Date}</li>
* <li>
* {@link java.sql.Timestamp}</li>
* <li>
* {@link java.sql.Time}</li>
* <li>{@link org.joda.time.DateTime}</li>
* <li>{@link java.util.Date}</li>
* <li>{@link java.sql.Date}</li>
* <li>{@link java.sql.Timestamp}</li>
* <li>{@link java.sql.Time}</li>
* </ul>
* @see org.terasoluna.gfw.common.date.jodatime.JodaTimeDateFactory
* @deprecated please use instead of this class. {@link org.terasoluna.gfw.common.date.jodatime.JodaTimeDateFactory}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public class JdbcFixedJodaTimeDateFactory extends AbstractJodaTimeDateFactory {
private String currentTimestampQuery;

/**
* {@link org.springframework.jdbc.core.RowMapper} implementation maps the {@link java.sql.Timestamp} fetched from database
* into a {@link org.joda.time.DateTime} instance
* {@link org.springframework.jdbc.core.RowMapper} implementation maps the {@link java.sql.Timestamp} fetched from database into
* a {@link org.joda.time.DateTime} instance
*/
private static final RowMapper<DateTime> DATE_ROW_MAPPER = new RowMapper<DateTime>() {
@Override
Expand Down
Loading

0 comments on commit bda5c69

Please sign in to comment.