Skip to content

Commit 87e9b58

Browse files
wilkinsonawilkinsona
committed
Update samples' dependencies
1 parent 11f8702 commit 87e9b58

File tree

24 files changed

+671
-216
lines changed

24 files changed

+671
-216
lines changed

‎samples/junit5/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id "eclipse"
33
id "java"
44
id "org.asciidoctor.jvm.convert" version "3.3.2"
5-
id "org.springframework.boot" version "2.4.7"
5+
id "org.springframework.boot" version "2.6.2"
66
}
77

88
apply plugin: 'io.spring.dependency-management'

‎samples/rest-assured/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id "eclipse"
33
id "java"
44
id "org.asciidoctor.jvm.convert" version "3.3.2"
5-
id "org.springframework.boot" version "2.4.7"
5+
id "org.springframework.boot" version "2.6.2"
66
}
77

88
apply plugin: 'io.spring.dependency-management'
@@ -34,7 +34,7 @@ dependencies {
3434

3535
implementation 'org.springframework.boot:spring-boot-starter-web'
3636

37-
testImplementation 'io.rest-assured:rest-assured:3.0.2'
37+
testImplementation 'io.rest-assured:rest-assured'
3838
testImplementation('org.junit.vintage:junit-vintage-engine') {
3939
exclude group: 'org.hamcrest', module: 'hamcrest-core'
4040
}

‎samples/rest-notes-slate/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "eclipse"
33
id "java"
4-
id "org.springframework.boot" version "2.4.7"
4+
id "org.springframework.boot" version "2.6.2"
55
}
66

77
apply plugin: 'io.spring.dependency-management'

‎samples/rest-notes-slate/slate/.dockerignore

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.git/
2+
.github/
3+
build/
4+
.editorconfig
5+
.gitattributes
6+
.gitignore
7+
CHANGELOG.md
8+
CODE_OF_CONDUCT.md
9+
deploy.sh
10+
font-selection.json
11+
README.md
12+
Vagrantfile

‎samples/rest-notes-slate/slate/CHANGELOG.md

+65
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,70 @@
11
# Changelog
22

3+
## Version 2.12.0
4+
5+
*November 04, 2021*
6+
7+
* Bump nokogiri from 1.12.3 to 1.12.5
8+
* Bump ffi from 1.15.0 to 1.15.4
9+
* Bump rouge from 3.26.0 to 3.26.1
10+
* Bump middleman from 4.4.0 to 4.4.2
11+
* Remove unnecessary files from docker images
12+
13+
## Version 2.11.0
14+
15+
*August 12, 2021*
16+
17+
* __[Security]__ Bump addressable transitive dependency from 2.7.0 to 2.8.0
18+
* Support specifying custom meta tags in YAML front-matter
19+
* Bump nokogiri from 1.11.3 to 1.12.3 (minimum supported version is 1.11.4)
20+
* Bump middleman-autoprefixer from 2.10.1 to 3.0.0
21+
* Bump jquery from 3.5.1 to 3.6.0
22+
* Bump middleman from [`d180ca3`](https://github.com/middleman/middleman/commit/d180ca337202873f2601310c74ba2b6b4cf063ec) to 4.4.0
23+
24+
## Version 2.10.0
25+
26+
*April 13, 2021*
27+
28+
* Add support for Ruby 3.0 (thanks @shaun-scale)
29+
* Add requirement for Git on installing dependencies
30+
* Bump nokogiri from 1.11.2 to 1.11.3
31+
* Bump middleman from 4.3.11 to [`d180ca3`](https://github.com/middleman/middleman/commit/d180ca337202873f2601310c74ba2b6b4cf063ec)
32+
33+
## Version 2.9.2
34+
35+
*March 30, 2021*
36+
37+
* __[Security]__ Bump kramdown from 2.3.0 to 2.3.1
38+
* Bump nokogiri from 1.11.1 to 1.11.2
39+
40+
## Version 2.9.1
41+
42+
*February 27, 2021*
43+
44+
* Fix Slate language tabs not working if localStorage is disabled
45+
46+
## Version 2.9.0
47+
48+
*January 19, 2021*
49+
50+
* __Drop support for Ruby 2.3 and 2.4__
51+
* __[Security]__ Bump nokogiri from 1.10.10 to 1.11.1
52+
* __[Security]__ Bump redcarpet from 3.5.0 to 3.5.1
53+
* Specify slate is not supported on Ruby 3.x
54+
* Bump rouge from 3.24.0 to 3.26.0
55+
56+
## Version 2.8.0
57+
58+
*October 27, 2020*
59+
60+
* Remove last trailing newline when using the copy code button
61+
* Rework docker image and make available at slatedocs/slate
62+
* Improve Dockerfile layout to improve caching (thanks @micvbang)
63+
* Bump rouge from 3.20 to 3.24
64+
* Bump nokogiri from 1.10.9 to 1.10.10
65+
* Bump middleman from 4.3.8 to 4.3.11
66+
* Bump lunr.js from 2.3.8 to 2.3.9
67+
368
## Version 2.7.1
469

570
*August 13, 2020*

‎samples/rest-notes-slate/slate/Dockerfile

+12-3
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,28 @@ FROM ruby:2.6-slim
22

33
WORKDIR /srv/slate
44

5+
VOLUME /srv/slate/build
56
VOLUME /srv/slate/source
7+
68
EXPOSE 4567
79

8-
COPY . /srv/slate
10+
COPY Gemfile .
11+
COPY Gemfile.lock .
912

1013
RUN apt-get update \
1114
&& apt-get install -y --no-install-recommends \
1215
build-essential \
16+
git \
1317
nodejs \
1418
&& gem install bundler \
1519
&& bundle install \
16-
&& apt-get remove -y build-essential \
20+
&& apt-get remove -y build-essential git \
1721
&& apt-get autoremove -y \
1822
&& rm -rf /var/lib/apt/lists/*
1923

20-
CMD ["bundle", "exec", "middleman", "server", "--watcher-force-polling"]
24+
COPY . /srv/slate
25+
26+
RUN chmod +x /srv/slate/slate.sh
27+
28+
ENTRYPOINT ["/srv/slate/slate.sh"]
29+
CMD ["build"]

‎samples/rest-notes-slate/slate/Gemfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
ruby '>=2.3.1'
1+
ruby '>= 2.5'
22
source 'https://rubygems.org'
33

44
# Middleman
5-
gem 'middleman', '~>4.3'
5+
gem 'middleman', '~> 4.4'
66
gem 'middleman-syntax', '~> 3.2'
7-
gem 'middleman-autoprefixer', '~> 2.7'
7+
gem 'middleman-autoprefixer', '~> 3.0'
88
gem 'middleman-sprockets', '~> 4.1'
9-
gem 'rouge', '~> 3.20'
9+
gem 'rouge', '~> 3.21'
1010
gem 'redcarpet', '~> 3.5.0'
11-
gem 'nokogiri', '~> 1.10.8'
11+
gem 'nokogiri', '~> 1.12.1'
1212
gem 'sass'
13+
gem 'webrick'

‎samples/rest-notes-slate/slate/Gemfile.lock

+62-53
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,59 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.2.4.3)
4+
activesupport (6.1.4.1)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
6-
i18n (>= 0.7, < 2)
7-
minitest (~> 5.1)
8-
tzinfo (~> 1.1)
9-
addressable (2.7.0)
6+
i18n (>= 1.6, < 2)
7+
minitest (>= 5.1)
8+
tzinfo (~> 2.0)
9+
zeitwerk (~> 2.3)
10+
addressable (2.8.0)
1011
public_suffix (>= 2.0.2, < 5.0)
11-
autoprefixer-rails (9.5.1.1)
12-
execjs
13-
backports (3.18.1)
12+
autoprefixer-rails (10.2.5.0)
13+
execjs (< 2.8.0)
14+
backports (3.21.0)
1415
coffee-script (2.4.1)
1516
coffee-script-source
1617
execjs
1718
coffee-script-source (1.12.2)
18-
concurrent-ruby (1.1.7)
19+
concurrent-ruby (1.1.9)
1920
contracts (0.13.0)
2021
dotenv (2.7.6)
2122
erubis (2.7.0)
2223
execjs (2.7.0)
23-
fast_blank (1.0.0)
24-
fastimage (2.2.0)
25-
ffi (1.13.1)
26-
haml (5.1.2)
24+
fast_blank (1.0.1)
25+
fastimage (2.2.5)
26+
ffi (1.15.4)
27+
haml (5.2.2)
2728
temple (>= 0.8.0)
2829
tilt
2930
hamster (3.0.0)
3031
concurrent-ruby (~> 1.0)
3132
hashie (3.6.0)
32-
i18n (0.9.5)
33+
i18n (1.6.0)
3334
concurrent-ruby (~> 1.0)
34-
kramdown (2.3.0)
35+
kramdown (2.3.1)
3536
rexml
3637
listen (3.0.8)
3738
rb-fsevent (~> 0.9, >= 0.9.4)
3839
rb-inotify (~> 0.9, >= 0.9.7)
3940
memoist (0.16.2)
40-
middleman (4.3.8)
41+
middleman (4.4.2)
4142
coffee-script (~> 2.2)
4243
haml (>= 4.0.5)
4344
kramdown (>= 2.3.0)
44-
middleman-cli (= 4.3.8)
45-
middleman-core (= 4.3.8)
46-
middleman-autoprefixer (2.10.1)
47-
autoprefixer-rails (~> 9.1)
48-
middleman-core (>= 3.3.3)
49-
middleman-cli (4.3.8)
45+
middleman-cli (= 4.4.2)
46+
middleman-core (= 4.4.2)
47+
middleman-autoprefixer (3.0.0)
48+
autoprefixer-rails (~> 10.0)
49+
middleman-core (>= 4.0.0)
50+
middleman-cli (4.4.2)
5051
thor (>= 0.17.0, < 2.0)
51-
middleman-core (4.3.8)
52-
activesupport (>= 4.2, < 6.0)
53-
addressable (~> 2.3)
52+
middleman-core (4.4.2)
53+
activesupport (>= 6.1, < 7.0)
54+
addressable (~> 2.4)
5455
backports (~> 3.6)
55-
bundler
56+
bundler (~> 2.0)
5657
contracts (~> 0.13.0)
5758
dotenv
5859
erubis
@@ -61,41 +62,45 @@ GEM
6162
fastimage (~> 2.0)
6263
hamster (~> 3.0)
6364
hashie (~> 3.4)
64-
i18n (~> 0.9.0)
65+
i18n (~> 1.6.0)
6566
listen (~> 3.0.0)
6667
memoist (~> 0.14)
67-
padrino-helpers (~> 0.13.0)
68+
padrino-helpers (~> 0.15.0)
6869
parallel
6970
rack (>= 1.4.5, < 3)
7071
sassc (~> 2.0)
7172
servolux
7273
tilt (~> 2.0.9)
74+
toml
7375
uglifier (~> 3.0)
76+
webrick
7477
middleman-sprockets (4.1.1)
7578
middleman-core (~> 4.0)
7679
sprockets (>= 3.0)
7780
middleman-syntax (3.2.0)
7881
middleman-core (>= 3.2)
7982
rouge (~> 3.2)
80-
mini_portile2 (2.4.0)
81-
minitest (5.14.1)
82-
nokogiri (1.10.9)
83-
mini_portile2 (~> 2.4.0)
84-
padrino-helpers (0.13.3.4)
85-
i18n (~> 0.6, >= 0.6.7)
86-
padrino-support (= 0.13.3.4)
83+
mini_portile2 (2.6.1)
84+
minitest (5.14.4)
85+
nokogiri (1.12.5)
86+
mini_portile2 (~> 2.6.1)
87+
racc (~> 1.4)
88+
padrino-helpers (0.15.1)
89+
i18n (>= 0.6.7, < 2)
90+
padrino-support (= 0.15.1)
8791
tilt (>= 1.4.1, < 3)
88-
padrino-support (0.13.3.4)
89-
activesupport (>= 3.1)
90-
parallel (1.19.2)
91-
public_suffix (4.0.5)
92+
padrino-support (0.15.1)
93+
parallel (1.21.0)
94+
parslet (2.0.0)
95+
public_suffix (4.0.6)
96+
racc (1.5.2)
9297
rack (2.2.3)
93-
rb-fsevent (0.10.4)
98+
rb-fsevent (0.11.0)
9499
rb-inotify (0.10.1)
95100
ffi (~> 1.0)
96-
redcarpet (3.5.0)
97-
rexml (3.2.4)
98-
rouge (3.20.0)
101+
redcarpet (3.5.1)
102+
rexml (3.2.5)
103+
rouge (3.26.1)
99104
sass (3.7.4)
100105
sass-listen (~> 4.0.0)
101106
sass-listen (4.0.0)
@@ -108,29 +113,33 @@ GEM
108113
concurrent-ruby (~> 1.0)
109114
rack (> 1, < 3)
110115
temple (0.8.2)
111-
thor (1.0.1)
112-
thread_safe (0.3.6)
116+
thor (1.1.0)
113117
tilt (2.0.10)
114-
tzinfo (1.2.7)
115-
thread_safe (~> 0.1)
118+
toml (0.3.0)
119+
parslet (>= 1.8.0, < 3.0.0)
120+
tzinfo (2.0.4)
121+
concurrent-ruby (~> 1.0)
116122
uglifier (3.2.0)
117123
execjs (>= 0.3.0, < 3)
124+
webrick (1.7.0)
125+
zeitwerk (2.5.1)
118126

119127
PLATFORMS
120128
ruby
121129

122130
DEPENDENCIES
123-
middleman (~> 4.3)
124-
middleman-autoprefixer (~> 2.7)
131+
middleman (~> 4.4)
132+
middleman-autoprefixer (~> 3.0)
125133
middleman-sprockets (~> 4.1)
126134
middleman-syntax (~> 3.2)
127-
nokogiri (~> 1.10.8)
135+
nokogiri (~> 1.12.1)
128136
redcarpet (~> 3.5.0)
129-
rouge (~> 3.20)
137+
rouge (~> 3.21)
130138
sass
139+
webrick
131140

132141
RUBY VERSION
133-
ruby 2.3.3p222
142+
ruby 2.7.2p137
134143

135144
BUNDLED WITH
136-
2.1.4
145+
2.2.22

0 commit comments

Comments
 (0)