diff --git a/.travis.yml b/.travis.yml index dc756a93e..0c3005669 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ language: java jdk: - oraclejdk8 - openjdk8 + - oraclejdk11 + - openjdk11 cache: directories: diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 769634f81..9b44dcb08 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -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 diff --git a/pom.xml b/pom.xml index 4e223b320..ad07fd31d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 terasoluna-gfw org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT pom TERASOLUNA Server Framework for Java (5.x) Build TERASOLUNA Server Framework for Java (5.x) Build @@ -218,5 +218,15 @@ + + jdk11 + + 11 + + + + true + + diff --git a/terasoluna-gfw-common-libraries/pom.xml b/terasoluna-gfw-common-libraries/pom.xml index 4baf65df0..117a3d675 100644 --- a/terasoluna-gfw-common-libraries/pom.xml +++ b/terasoluna-gfw-common-libraries/pom.xml @@ -4,7 +4,7 @@ org.terasoluna.gfw terasoluna-gfw-parent - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../terasoluna-gfw-parent/pom.xml terasoluna-gfw-common-libraries @@ -154,8 +154,8 @@ - 2.17 - 0.7.5.201505241946 + 3.0.0-M3 + 0.8.2 1.7 1.4.0 2.0.1 @@ -168,4 +168,16 @@ 1.8 ${project.basedir} + + + jdk11 + + 11 + + + + true + + + \ No newline at end of file diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0201/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0201/pom.xml index 39b67a748..0ebdbfe1a 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0201/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0201/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-common-libraries org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../../../terasoluna-gfw-common-libraries/pom.xml 4.0.0 diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208/pom.xml index 3911bb814..4644892fe 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-common-libraries org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../../../terasoluna-gfw-common-libraries/pom.xml 4.0.0 diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208/src/main/java/org/terasoluna/gfw/common/codepoints/catalog/JIS_X_0208_SpecialChars.java b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208/src/main/java/org/terasoluna/gfw/common/codepoints/catalog/JIS_X_0208_SpecialChars.java index b67ca3a4d..9a63b1264 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208/src/main/java/org/terasoluna/gfw/common/codepoints/catalog/JIS_X_0208_SpecialChars.java +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208/src/main/java/org/terasoluna/gfw/common/codepoints/catalog/JIS_X_0208_SpecialChars.java @@ -20,11 +20,11 @@ /** * Code points which consist of JIS X 0208's rows 1 and 2 (Special characters). *

- * This class defines the code point set to change HORINZONTAL BAR( U+2015) to the EM DASH(U+2014).
+ * This class defines the code point set to change HORINZONTAL BAR({@code U+2015}) to the EM DASH({@code U+2014}).
* 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.
- * Full-size dash of common JIS Kanji is the EM DASH(U+2014).
- * Conversion table Unicode consortium provides is HORINZONTAL BAR( U+2015). + * Full-size dash of common JIS Kanji is the EM DASH({@code U+2014}).
+ * Conversion table Unicode consortium provides is HORINZONTAL BAR({@code U+2015}). * @since 5.1.0 */ public final class JIS_X_0208_SpecialChars extends CodePoints { diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208kanji/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208kanji/pom.xml index a972ef531..d0eac6a7e 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208kanji/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0208kanji/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-common-libraries org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../../../terasoluna-gfw-common-libraries/pom.xml 4.0.0 diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0213kanji/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0213kanji/pom.xml index 79638481f..442bf1235 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0213kanji/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/catalog/terasoluna-gfw-codepoints-jisx0213kanji/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-common-libraries org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../../../terasoluna-gfw-common-libraries/pom.xml 4.0.0 diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/pom.xml index 1928b15fc..d441d097e 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/pom.xml @@ -5,7 +5,7 @@ terasoluna-gfw-common-libraries org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-common-libraries/pom.xml terasoluna-gfw-codepoints @@ -68,7 +68,7 @@ true - org.hibernate + org.hibernate.validator hibernate-validator test diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-common/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-common/pom.xml index 89235a164..2d5b88d7a 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-common/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-common/pom.xml @@ -5,7 +5,7 @@ terasoluna-gfw-common-libraries org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-common-libraries/pom.xml terasoluna-gfw-common @@ -113,7 +113,7 @@ - org.hibernate + org.hibernate.validator hibernate-validator diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-jodatime/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-jodatime/pom.xml index d0c2178e2..a1b234e27 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-jodatime/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-jodatime/pom.xml @@ -5,7 +5,7 @@ org.terasoluna.gfw terasoluna-gfw-common-libraries - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-common-libraries/pom.xml terasoluna-gfw-jodatime diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-security-web/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-security-web/pom.xml index 0802787a9..1f752f617 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-security-web/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-security-web/pom.xml @@ -5,7 +5,7 @@ terasoluna-gfw-common-libraries org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-common-libraries/pom.xml terasoluna-gfw-security-web diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-string/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-string/pom.xml index f27128a60..c164fea74 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-string/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-string/pom.xml @@ -5,7 +5,7 @@ terasoluna-gfw-common-libraries org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-common-libraries/pom.xml terasoluna-gfw-string diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-validator/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-validator/pom.xml index 76af88f1b..663732852 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-validator/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-validator/pom.xml @@ -5,7 +5,7 @@ terasoluna-gfw-common-libraries org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-common-libraries/pom.xml terasoluna-gfw-validator @@ -68,7 +68,7 @@ - org.hibernate + org.hibernate.validator hibernate-validator test diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-web-jsp/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-web-jsp/pom.xml index 6e35db04d..a46860d55 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-web-jsp/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-web-jsp/pom.xml @@ -5,7 +5,7 @@ terasoluna-gfw-common-libraries org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-common-libraries/pom.xml terasoluna-gfw-web-jsp diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-web/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-web/pom.xml index d64aea399..cfea6504b 100644 --- a/terasoluna-gfw-common-libraries/terasoluna-gfw-web/pom.xml +++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-web/pom.xml @@ -5,7 +5,7 @@ terasoluna-gfw-common-libraries org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-common-libraries/pom.xml terasoluna-gfw-web diff --git a/terasoluna-gfw-dependencies/pom.xml b/terasoluna-gfw-dependencies/pom.xml index c10725bbb..f0acab708 100644 --- a/terasoluna-gfw-dependencies/pom.xml +++ b/terasoluna-gfw-dependencies/pom.xml @@ -4,7 +4,7 @@ org.terasoluna.gfw terasoluna-gfw-parent - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../terasoluna-gfw-parent/pom.xml terasoluna-gfw-dependencies diff --git a/terasoluna-gfw-dependencies/terasoluna-gfw-common-dependencies/pom.xml b/terasoluna-gfw-dependencies/terasoluna-gfw-common-dependencies/pom.xml index bf52930b8..2c11d9740 100644 --- a/terasoluna-gfw-dependencies/terasoluna-gfw-common-dependencies/pom.xml +++ b/terasoluna-gfw-dependencies/terasoluna-gfw-common-dependencies/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-dependencies org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-dependencies/pom.xml terasoluna-gfw-common-dependencies diff --git a/terasoluna-gfw-dependencies/terasoluna-gfw-jodatime-dependencies/pom.xml b/terasoluna-gfw-dependencies/terasoluna-gfw-jodatime-dependencies/pom.xml index 11a99ed89..db4b9a4a5 100644 --- a/terasoluna-gfw-dependencies/terasoluna-gfw-jodatime-dependencies/pom.xml +++ b/terasoluna-gfw-dependencies/terasoluna-gfw-jodatime-dependencies/pom.xml @@ -5,7 +5,7 @@ org.terasoluna.gfw terasoluna-gfw-dependencies - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-dependencies/pom.xml terasoluna-gfw-jodatime-dependencies diff --git a/terasoluna-gfw-dependencies/terasoluna-gfw-jpa-dependencies/pom.xml b/terasoluna-gfw-dependencies/terasoluna-gfw-jpa-dependencies/pom.xml index 87bf410ec..f35f28974 100644 --- a/terasoluna-gfw-dependencies/terasoluna-gfw-jpa-dependencies/pom.xml +++ b/terasoluna-gfw-dependencies/terasoluna-gfw-jpa-dependencies/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-dependencies org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-dependencies/pom.xml terasoluna-gfw-jpa-dependencies diff --git a/terasoluna-gfw-dependencies/terasoluna-gfw-mybatis3-dependencies/pom.xml b/terasoluna-gfw-dependencies/terasoluna-gfw-mybatis3-dependencies/pom.xml index 0ec86c3e6..34ffac71a 100644 --- a/terasoluna-gfw-dependencies/terasoluna-gfw-mybatis3-dependencies/pom.xml +++ b/terasoluna-gfw-dependencies/terasoluna-gfw-mybatis3-dependencies/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-dependencies org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-dependencies/pom.xml terasoluna-gfw-mybatis3-dependencies diff --git a/terasoluna-gfw-dependencies/terasoluna-gfw-recommended-dependencies/pom.xml b/terasoluna-gfw-dependencies/terasoluna-gfw-recommended-dependencies/pom.xml index 226ec6f7d..59c17b0dd 100644 --- a/terasoluna-gfw-dependencies/terasoluna-gfw-recommended-dependencies/pom.xml +++ b/terasoluna-gfw-dependencies/terasoluna-gfw-recommended-dependencies/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-dependencies org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-dependencies/pom.xml terasoluna-gfw-recommended-dependencies diff --git a/terasoluna-gfw-dependencies/terasoluna-gfw-recommended-web-dependencies/pom.xml b/terasoluna-gfw-dependencies/terasoluna-gfw-recommended-web-dependencies/pom.xml index cb1befb9a..3fc9043ed 100644 --- a/terasoluna-gfw-dependencies/terasoluna-gfw-recommended-web-dependencies/pom.xml +++ b/terasoluna-gfw-dependencies/terasoluna-gfw-recommended-web-dependencies/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-dependencies org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-dependencies/pom.xml terasoluna-gfw-recommended-web-dependencies diff --git a/terasoluna-gfw-dependencies/terasoluna-gfw-security-core-dependencies/pom.xml b/terasoluna-gfw-dependencies/terasoluna-gfw-security-core-dependencies/pom.xml index 36e63679c..30827afe0 100644 --- a/terasoluna-gfw-dependencies/terasoluna-gfw-security-core-dependencies/pom.xml +++ b/terasoluna-gfw-dependencies/terasoluna-gfw-security-core-dependencies/pom.xml @@ -5,7 +5,7 @@ terasoluna-gfw-dependencies org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-dependencies/pom.xml terasoluna-gfw-security-core-dependencies diff --git a/terasoluna-gfw-dependencies/terasoluna-gfw-security-web-dependencies/pom.xml b/terasoluna-gfw-dependencies/terasoluna-gfw-security-web-dependencies/pom.xml index 8f0df776b..001b45b97 100644 --- a/terasoluna-gfw-dependencies/terasoluna-gfw-security-web-dependencies/pom.xml +++ b/terasoluna-gfw-dependencies/terasoluna-gfw-security-web-dependencies/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-dependencies org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-dependencies/pom.xml terasoluna-gfw-security-web-dependencies diff --git a/terasoluna-gfw-dependencies/terasoluna-gfw-web-dependencies/pom.xml b/terasoluna-gfw-dependencies/terasoluna-gfw-web-dependencies/pom.xml index 393f93d3c..0783b8fe6 100644 --- a/terasoluna-gfw-dependencies/terasoluna-gfw-web-dependencies/pom.xml +++ b/terasoluna-gfw-dependencies/terasoluna-gfw-web-dependencies/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-dependencies org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-dependencies/pom.xml terasoluna-gfw-web-dependencies diff --git a/terasoluna-gfw-dependencies/terasoluna-gfw-web-jsp-dependencies/pom.xml b/terasoluna-gfw-dependencies/terasoluna-gfw-web-jsp-dependencies/pom.xml index 87f0e6e45..3f374cef0 100644 --- a/terasoluna-gfw-dependencies/terasoluna-gfw-web-jsp-dependencies/pom.xml +++ b/terasoluna-gfw-dependencies/terasoluna-gfw-web-jsp-dependencies/pom.xml @@ -4,7 +4,7 @@ terasoluna-gfw-dependencies org.terasoluna.gfw - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT ../../terasoluna-gfw-dependencies/pom.xml terasoluna-gfw-web-jsp-dependencies diff --git a/terasoluna-gfw-parent/pom.xml b/terasoluna-gfw-parent/pom.xml index 9a642d6a6..cfa23bdb4 100644 --- a/terasoluna-gfw-parent/pom.xml +++ b/terasoluna-gfw-parent/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.terasoluna.gfw terasoluna-gfw-parent - 5.5.0-SNAPSHOT + 5.5.1-SNAPSHOT pom TERASOLUNA Server Framework for Java (5.x) Parent The parent of TERASOLUNA Server Framework for Java (5.x) @@ -183,68 +183,146 @@ - + + + org.terasoluna.gfw + terasoluna-gfw-common + ${terasoluna.gfw.version} + + + org.terasoluna.gfw + terasoluna-gfw-web + ${terasoluna.gfw.version} + + + org.terasoluna.gfw + terasoluna-gfw-web-jsp + ${terasoluna.gfw.version} + + + org.terasoluna.gfw + terasoluna-gfw-jodatime + ${terasoluna.gfw.version} + - io.spring.platform - platform-bom - ${io.spring.platform.version} + org.terasoluna.gfw + terasoluna-gfw-security-core-dependencies + ${terasoluna.gfw.version} pom - import - - - - org.apache.tomcat - tomcat-jsp-api - ${tomcat.version} + org.terasoluna.gfw + terasoluna-gfw-security-web + ${terasoluna.gfw.version} - org.apache.tomcat - tomcat-annotations-api - ${tomcat.version} + org.terasoluna.gfw + terasoluna-gfw-validator + ${terasoluna.gfw.version} - org.apache.tomcat - tomcat-catalina-jmx-remote - ${tomcat.version} + org.terasoluna.gfw + terasoluna-gfw-string + ${terasoluna.gfw.version} - org.apache.tomcat - tomcat-dbcp - ${tomcat.version} + org.terasoluna.gfw + terasoluna-gfw-codepoints + ${terasoluna.gfw.version} - org.apache.tomcat - tomcat-jdbc - ${tomcat.version} + org.terasoluna.gfw.codepoints + terasoluna-gfw-codepoints-jisx0201 + ${terasoluna.gfw.version} - org.apache.tomcat - tomcat-websocket - ${tomcat.version} + org.terasoluna.gfw.codepoints + terasoluna-gfw-codepoints-jisx0208 + ${terasoluna.gfw.version} - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat.version} + org.terasoluna.gfw.codepoints + terasoluna-gfw-codepoints-jisx0208kanji + ${terasoluna.gfw.version} - org.apache.tomcat.embed - tomcat-embed-el - ${tomcat.version} + org.terasoluna.gfw.codepoints + terasoluna-gfw-codepoints-jisx0213kanji + ${terasoluna.gfw.version} - org.apache.tomcat.embed - tomcat-embed-jasper - ${tomcat.version} + org.terasoluna.gfw + terasoluna-gfw-recommended-dependencies + ${terasoluna.gfw.version} + pom - org.apache.tomcat.embed - tomcat-embed-websocket - ${tomcat.version} + org.terasoluna.gfw + terasoluna-gfw-recommended-web-dependencies + ${terasoluna.gfw.version} + pom - + + org.terasoluna.gfw + terasoluna-gfw-common-dependencies + ${terasoluna.gfw.version} + pom + + + org.terasoluna.gfw + terasoluna-gfw-web-dependencies + ${terasoluna.gfw.version} + pom + + + org.terasoluna.gfw + terasoluna-gfw-web-jsp-dependencies + ${terasoluna.gfw.version} + pom + + + org.terasoluna.gfw + terasoluna-gfw-jodatime-dependencies + ${terasoluna.gfw.version} + pom + + + org.terasoluna.gfw + terasoluna-gfw-security-web-dependencies + ${terasoluna.gfw.version} + pom + + + org.terasoluna.gfw + terasoluna-gfw-jpa-dependencies + ${terasoluna.gfw.version} + pom + + + org.terasoluna.gfw + terasoluna-gfw-mybatis3-dependencies + ${terasoluna.gfw.version} + pom + + + + + + org.springframework.boot + spring-boot-dependencies + ${org.springframework.boot.version} + pom + import + + + + + + org.springframework.security.oauth + spring-security-oauth2 + ${spring-security-oauth.version} + + @@ -301,128 +379,190 @@ - + - org.terasoluna.gfw - terasoluna-gfw-common - ${terasoluna.gfw.version} + com.google.guava + guava + ${guava.version} + + + - org.terasoluna.gfw - terasoluna-gfw-web - ${terasoluna.gfw.version} + commons-beanutils + commons-beanutils + ${commons-beanutils.version} - org.terasoluna.gfw - terasoluna-gfw-web-jsp - ${terasoluna.gfw.version} + commons-collections + commons-collections + ${commons-collections.version} - org.terasoluna.gfw - terasoluna-gfw-jodatime - ${terasoluna.gfw.version} + commons-fileupload + commons-fileupload + ${commons-fileupload.version} - org.terasoluna.gfw - terasoluna-gfw-security-core-dependencies - ${terasoluna.gfw.version} - pom + commons-io + commons-io + ${commons-io.version} + + + - org.terasoluna.gfw - terasoluna-gfw-security-web - ${terasoluna.gfw.version} + com.github.librepdf + openpdf + ${openpdf.version} + + + - org.terasoluna.gfw - terasoluna-gfw-validator - ${terasoluna.gfw.version} + org.apache.poi + poi + ${poi.version} - org.terasoluna.gfw - terasoluna-gfw-string - ${terasoluna.gfw.version} + org.apache.poi + poi-ooxml + ${poi.version} - org.terasoluna.gfw - terasoluna-gfw-codepoints - ${terasoluna.gfw.version} + org.apache.poi + poi-scratchpad + ${poi.version} + + + - org.terasoluna.gfw.codepoints - terasoluna-gfw-codepoints-jisx0201 - ${terasoluna.gfw.version} + org.apache.tiles + tiles-api + ${tiles.version} - org.terasoluna.gfw.codepoints - terasoluna-gfw-codepoints-jisx0208 - ${terasoluna.gfw.version} + org.apache.tiles + tiles-core + ${tiles.version} - org.terasoluna.gfw.codepoints - terasoluna-gfw-codepoints-jisx0208kanji - ${terasoluna.gfw.version} + org.apache.tiles + tiles-el + ${tiles.version} - org.terasoluna.gfw.codepoints - terasoluna-gfw-codepoints-jisx0213kanji - ${terasoluna.gfw.version} + org.apache.tiles + tiles-extras + ${tiles.version} - org.terasoluna.gfw - terasoluna-gfw-recommended-dependencies - ${terasoluna.gfw.version} - pom + org.apache.tiles + tiles-jsp + ${tiles.version} - org.terasoluna.gfw - terasoluna-gfw-recommended-web-dependencies - ${terasoluna.gfw.version} - pom + org.apache.tiles + tiles-servlet + ${tiles.version} + + + - org.terasoluna.gfw - terasoluna-gfw-common-dependencies - ${terasoluna.gfw.version} - pom + javax.el + javax.el-api + ${javax-el.version} - org.terasoluna.gfw - terasoluna-gfw-web-dependencies - ${terasoluna.gfw.version} - pom + javax.inject + javax.inject + ${javax-inject.version} - org.terasoluna.gfw - terasoluna-gfw-web-jsp-dependencies - ${terasoluna.gfw.version} - pom + javax.servlet.jsp + javax.servlet.jsp-api + ${javax-jsp.version} - org.terasoluna.gfw - terasoluna-gfw-jodatime-dependencies - ${terasoluna.gfw.version} - pom + org.apache.taglibs + taglibs-standard-impl + ${taglibs-standard.version} - org.terasoluna.gfw - terasoluna-gfw-security-web-dependencies - ${terasoluna.gfw.version} - pom + org.apache.taglibs + taglibs-standard-jstlel + ${taglibs-standard.version} - org.terasoluna.gfw - terasoluna-gfw-jpa-dependencies - ${terasoluna.gfw.version} - pom + org.apache.taglibs + taglibs-standard-spec + ${taglibs-standard.version} + + + - org.terasoluna.gfw - terasoluna-gfw-mybatis3-dependencies - ${terasoluna.gfw.version} - pom + org.apache.tomcat + tomcat-jsp-api + ${tomcat.version} - + + org.apache.tomcat + tomcat-annotations-api + ${tomcat.version} + + + org.apache.tomcat + tomcat-catalina-jmx-remote + ${tomcat.version} + + + org.apache.tomcat + tomcat-dbcp + ${tomcat.version} + + + org.apache.tomcat + tomcat-jdbc + ${tomcat.version} + + + org.apache.tomcat + tomcat-websocket + ${tomcat.version} + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.version} + + + org.apache.tomcat.embed + tomcat-embed-el + ${tomcat.version} + + + org.apache.tomcat.embed + tomcat-embed-jasper + ${tomcat.version} + + + org.apache.tomcat.embed + tomcat-embed-websocket + ${tomcat.version} + + + + + + org.hamcrest + hamcrest-all + ${hamcrest.version} + + + @@ -443,14 +583,14 @@ 1.6.8 - 5.5.0-SNAPSHOT - - Cairo-SR3 - - 9.0.10 + 5.5.1-SNAPSHOT + + 2.1.2.RELEASE + + 2.2.3.RELEASE - 3.4.6 - 1.3.2 + 3.5.0 + 2.0.0 6.4.1 @@ -458,6 +598,28 @@ 6.0.1.GA 0.2.7 + + 20.0 + + 1.9.3 + 3.2.2 + 1.3.3 + 2.6 + + 1.0.5 + + 3.17 + + 3.0.8 + + 3.0.1-b06 + 1 + 2.3.3 + 1.2.5 + + 9.0.10 + + 1.3 UTF-8 true @@ -468,7 +630,7 @@ http://localhost:18000 tomcat9x http://archive.apache.org/dist/tomcat/tomcat-9/v${cargo.tomcat9.version}/bin/apache-tomcat-${cargo.tomcat9.version}.zip - 9.0.10 + ${tomcat.version}