Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

apply spring boot dependencies 2.1.2, mybatis 3.5.0 #858 #859 #860 #861

Merged
merged 4 commits into from
Jan 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ language: java
jdk:
- oraclejdk8
- openjdk8
- oraclejdk11
- openjdk11

cache:
directories:
Expand Down
2 changes: 1 addition & 1 deletion ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

## Fix Version/s
(To be written later by project member)
- [ ] 5.5.0 (master)
- [ ] 5.5.1 (master)
- [ ] 5.4.2 (5.4.x)

## Issue Links
Expand Down
12 changes: 11 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>terasoluna-gfw</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TERASOLUNA Server Framework for Java (5.x) Build</name>
<description>TERASOLUNA Server Framework for Java (5.x) Build</description>
Expand Down Expand Up @@ -218,5 +218,15 @@
</pluginManagement>
</build>
</profile>
<profile>
<id>jdk11</id>
<activation>
<jdk>11</jdk>
</activation>
<properties>
<!-- coverall 4.3.0 or previous version does not work on Java 11, see https://github.com/trautonen/coveralls-maven-plugin/issues/112 -->
<coveralls.skip>true</coveralls.skip>
</properties>
</profile>
</profiles>
</project>
18 changes: 15 additions & 3 deletions terasoluna-gfw-common-libraries/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.terasoluna.gfw</groupId>
<artifactId>terasoluna-gfw-parent</artifactId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../terasoluna-gfw-parent/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
Expand Down Expand Up @@ -154,8 +154,8 @@
</build>
<properties>
<!-- == Maven Plugin Versions == -->
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<jacoco-maven-plugin.version>0.7.5.201505241946</jacoco-maven-plugin.version>
<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>
<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>
Expand All @@ -168,4 +168,16 @@
<java-version>1.8</java-version>
<project.root.basedir>${project.basedir}</project.root.basedir>
</properties>
<profiles>
<profile>
<id>jdk11</id>
<activation>
<jdk>11</jdk>
</activation>
<properties>
<!-- coverall 4.3.0 or previous version does not work on Java 11, see https://github.com/trautonen/coveralls-maven-plugin/issues/112 -->
<coveralls.skip>true</coveralls.skip>
</properties>
</profile>
</profiles>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
/**
* Code points which consist of JIS X 0208's rows 1 and 2 (Special characters).
* <p>
* This class defines the code point set to change HORINZONTAL BAR( <tt>U+2015</tt>) to the EM DASH(<tt>U+2014</tt>). <br>
* This class defines the code point set to change HORINZONTAL BAR({@code U+2015}) to the EM DASH({@code U+2014}). <br>
* For general conversion rules and Unicode conversion tables are different. There is a possibility that a problem may arise
* according to Unicode conversion table when code point set is defined. <br>
* Full-size dash of common JIS Kanji is the EM DASH(<tt>U+2014</tt>). <br>
* Conversion table Unicode consortium provides is HORINZONTAL BAR( <tt>U+2015</tt>).
* Full-size dash of common JIS Kanji is the EM DASH({@code U+2014}). <br>
* Conversion table Unicode consortium provides is HORINZONTAL BAR({@code U+2015}).
* @since 5.1.0
*/
public final class JIS_X_0208_SpecialChars extends CodePoints {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-codepoints</artifactId>
Expand Down Expand Up @@ -68,7 +68,7 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions terasoluna-gfw-common-libraries/terasoluna-gfw-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-common</artifactId>
Expand Down Expand Up @@ -113,7 +113,7 @@

<!-- == Begin BeanValidation == -->
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<!-- == End BeanValidation == -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.terasoluna.gfw</groupId>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-jodatime</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-security-web</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-string</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-validator</artifactId>
Expand Down Expand Up @@ -68,7 +68,7 @@
</dependency>
<!-- == Begin Unit Test == -->
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>test</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-web-jsp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion terasoluna-gfw-common-libraries/terasoluna-gfw-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>terasoluna-gfw-common-libraries</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-common-libraries/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-web</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion terasoluna-gfw-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.terasoluna.gfw</groupId>
<artifactId>terasoluna-gfw-parent</artifactId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../terasoluna-gfw-parent/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-dependencies</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-dependencies/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-common-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.terasoluna.gfw</groupId>
<artifactId>terasoluna-gfw-dependencies</artifactId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-dependencies/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-jodatime-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-dependencies</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-dependencies/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-jpa-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-dependencies</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-dependencies/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-mybatis3-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-dependencies</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-dependencies/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-recommended-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-dependencies</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-dependencies/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-recommended-web-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>terasoluna-gfw-dependencies</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-dependencies/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-security-core-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-dependencies</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-dependencies/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-security-web-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-dependencies</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-dependencies/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-web-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>terasoluna-gfw-dependencies</artifactId>
<groupId>org.terasoluna.gfw</groupId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.1-SNAPSHOT</version>
<relativePath>../../terasoluna-gfw-dependencies/pom.xml</relativePath>
</parent>
<artifactId>terasoluna-gfw-web-jsp-dependencies</artifactId>
Expand Down
Loading