Skip to content

Commit

Permalink
Merge pull request #12 from kazuki43zoo/update-client-lib-version
Browse files Browse the repository at this point in the history
Update to jquery 3.5.1 and bootstrap 3.4.1
  • Loading branch information
kazuki43zoo committed Jun 30, 2020
2 parents 5a5c036 + 38fe964 commit c9950e8
Show file tree
Hide file tree
Showing 169 changed files with 15,084 additions and 7,121 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -16,9 +16,9 @@ Structure of this application is following.<br><br>

| Layer | Component/Library | Main responsibilities |
| :-----: | --------- | --------------------- |
| Client Layer | [jQuery 3.3.1](http://jquery.com/) | Provide the useful javascript operations. |
| Client Layer | [jQuery 3.5.1](http://jquery.com/) | Provide the useful javascript operations. |
| | [AngularJS 1.2.32](https://angularjs.org/) | Provide the JavaScript MVW Framework. |
| | [Bootstrap 3.3.7](http://getbootstrap.com/) | Provide the useful & stylish css configurations, and provide the useful client components(alert, message dialog, etc..). |
| | [Bootstrap 3.4.1](http://getbootstrap.com/) | Provide the useful & stylish css configurations, and provide the useful client components(alert, message dialog, etc..). |
| Server Side Platform | Java SE 8 Java Virtual Machine | Provide the execution environment for Java application. |
| | Java EE 7 Servlet Container | Provide the servlet engine that supports servlet 3.1 specification. |
| | [Spring Framework 5.2.3.RELEASE](http://projects.spring.io/spring-framework/) | Provide mechanism of CDI(Context and Dependency Inject). In this application, use the transaction management and AOP mechanism.|
Expand Down
4 changes: 2 additions & 2 deletions README_ja.md
Expand Up @@ -14,9 +14,9 @@

| レイヤ | コンポーネント/ライブラリ | 主な役割 |
| :-----: | --------- | --------------------- |
| Client Layer | [jQuery 3.3.1](http://jquery.com/) | 便利なJavaScript操作を提供します。 |
| Client Layer | [jQuery 3.5.1](http://jquery.com/) | 便利なJavaScript操作を提供します。 |
| | [AngularJS 1.2.32](https://angularjs.org/) | JavaScriptのMVW Frameworkのメカニズムを提供します。 |
| | [Bootstrap 3.3.7](http://getbootstrap.com/) | 便利でスタイリッシュなCSS定義とクライアントコンポーネント(Alert, メッセージダイアログなど)を提供します。 |
| | [Bootstrap 3.4.1](http://getbootstrap.com/) | 便利でスタイリッシュなCSS定義とクライアントコンポーネント(Alert, メッセージダイアログなど)を提供します。 |
| Server Side Platform | Java SE 8 Java Virtual Machine | Javaアプリケーションの実行環境を提供します。 |
| | Java EE 7 Servlet Container | サーブレット3.1仕様のサーブレットエンジンを提供します。 |
| | [Spring Framework 5.2.3.RELEASE](http://projects.spring.io/spring-framework/) | CDI(Context and Dependency Inject)のメカニズムを提供します。本アプリケーションでは、トランザクション管理やAOPなどのメカニズムも利用しています。|
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Expand Up @@ -5,7 +5,7 @@
"angular": "1.2.32",
"angular-resource": "1.2.32",
"angular-i18n": "1.2.32",
"jquery": "3.3.1",
"bootstrap": "3.3.7"
"jquery": "3.5.1",
"bootstrap": "3.4.1"
}
}
12 changes: 6 additions & 6 deletions src/main/webapp/resources/vendor/bootstrap/.bower.json
Expand Up @@ -11,7 +11,7 @@
"framework",
"web"
],
"homepage": "http://getbootstrap.com",
"homepage": "https://getbootstrap.com/",
"license": "MIT",
"moduleType": "globals",
"main": [
Expand All @@ -31,14 +31,14 @@
"dependencies": {
"jquery": "1.9.1 - 3"
},
"version": "3.3.7",
"_release": "3.3.7",
"version": "3.4.1",
"_release": "3.4.1",
"_resolution": {
"type": "version",
"tag": "v3.3.7",
"commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86"
"tag": "v3.4.1",
"commit": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
},
"_source": "https://github.com/twbs/bootstrap.git",
"_target": "3.3.7",
"_target": "3.4.1",
"_originalSource": "bootstrap"
}
4 changes: 2 additions & 2 deletions src/main/webapp/resources/vendor/bootstrap/CHANGELOG.md
@@ -1,5 +1,5 @@
Bootstrap uses [GitHub's Releases feature](https://github.com/blog/1547-release-your-software) for its changelogs.
Bootstrap uses [GitHub's Releases feature](https://blog.github.com/2013-07-02-release-your-software/) for its changelogs.

See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap.

Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release.
Release announcement posts on [the official Bootstrap blog](https://blog.getbootstrap.com/) contain summaries of the most noteworthy changes made in each release.
6 changes: 4 additions & 2 deletions src/main/webapp/resources/vendor/bootstrap/Gemfile
@@ -1,6 +1,8 @@
source 'https://rubygems.org'

group :development, :test do
gem 'jekyll', '~> 3.1.2'
gem 'jekyll-sitemap', '~> 0.11.0'
gem 'jekyll', '~> 3.8.5'
gem 'jekyll-redirect-from', '~> 0.14.0'
gem 'jekyll-sitemap', '~> 1.2.0'
gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
end
81 changes: 56 additions & 25 deletions src/main/webapp/resources/vendor/bootstrap/Gemfile.lock
@@ -1,43 +1,74 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.4.0)
colorator (0.1)
ffi (1.9.14-x64-mingw32)
jekyll (3.1.6)
colorator (~> 0.1)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
concurrent-ruby (1.1.4)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)
ffi (1.10.0)
ffi (1.10.0-x64-mingw32)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.5)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 3.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
liquid (~> 4.0)
mercenary (~> 0.3.3)
rouge (~> 1.7)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-sass-converter (1.4.0)
jekyll-redirect-from (0.14.0)
jekyll (~> 3.3)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-sitemap (0.11.0)
addressable (~> 2.4.0)
jekyll-watch (1.4.0)
listen (~> 3.0, < 3.1)
kramdown (1.11.1)
liquid (3.0.6)
listen (3.0.8)
jekyll-sitemap (1.2.0)
jekyll (~> 3.3)
jekyll-watch (2.1.2)
listen (~> 3.0)
kramdown (1.17.0)
liquid (4.0.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rouge (1.11.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.0.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rouge (3.3.0)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.4.22)
sass (3.7.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
wdm (0.1.1)

PLATFORMS
ruby
x64-mingw32

DEPENDENCIES
jekyll (~> 3.1.2)
jekyll-sitemap (~> 0.11.0)
jekyll (~> 3.8.5)
jekyll-redirect-from (~> 0.14.0)
jekyll-sitemap (~> 1.2.0)
wdm (~> 0.1.1)

BUNDLED WITH
1.12.5
1.17.3

0 comments on commit c9950e8

Please sign in to comment.