Skip to content

Commit 17137b5

Browse files
MalaxMalax
authored
Merge pull request heroku#114 from heroku/spring-boot-2.3.0
Upgrade to Spring-Boot 2.3.0
2 parents 7894b41 + 4ee2516 commit 17137b5

5 files changed

Lines changed: 103 additions & 12 deletions

File tree

‎docs/Gemfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source "https://rubygems.org"
2+
3+
gem "rundoc", github: "jkutner/rundoc", branch: "go-to-sleep-a-little-baby"

‎docs/Gemfile.lock‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
GIT
2+
remote: https://github.com/jkutner/rundoc.git
3+
revision: f18f1f39dcd0fd023b329f9af461fecfa98dfaa1
4+
branch: go-to-sleep-a-little-baby
5+
specs:
6+
rundoc (1.1.0)
7+
aws-sdk-s3 (~> 1)
8+
capybara (~> 3)
9+
dotenv
10+
parslet (~> 1)
11+
repl_runner
12+
selenium-webdriver (~> 3)
13+
thor
14+
15+
GEM
16+
remote: https://rubygems.org/
17+
specs:
18+
activesupport (6.0.3.1)
19+
concurrent-ruby (~> 1.0, >= 1.0.2)
20+
i18n (>= 0.7, < 2)
21+
minitest (~> 5.1)
22+
tzinfo (~> 1.1)
23+
zeitwerk (~> 2.2, >= 2.2.2)
24+
addressable (2.7.0)
25+
public_suffix (>= 2.0.2, < 5.0)
26+
aws-eventstream (1.1.0)
27+
aws-partitions (1.317.0)
28+
aws-sdk-core (3.96.1)
29+
aws-eventstream (~> 1, >= 1.0.2)
30+
aws-partitions (~> 1, >= 1.239.0)
31+
aws-sigv4 (~> 1.1)
32+
jmespath (~> 1.0)
33+
aws-sdk-kms (1.31.0)
34+
aws-sdk-core (~> 3, >= 3.71.0)
35+
aws-sigv4 (~> 1.1)
36+
aws-sdk-s3 (1.65.0)
37+
aws-sdk-core (~> 3, >= 3.96.1)
38+
aws-sdk-kms (~> 1)
39+
aws-sigv4 (~> 1.1)
40+
aws-sigv4 (1.1.3)
41+
aws-eventstream (~> 1.0, >= 1.0.2)
42+
capybara (3.32.2)
43+
addressable
44+
mini_mime (>= 0.1.3)
45+
nokogiri (~> 1.8)
46+
rack (>= 1.6.0)
47+
rack-test (>= 0.6.3)
48+
regexp_parser (~> 1.5)
49+
xpath (~> 3.2)
50+
childprocess (3.0.0)
51+
concurrent-ruby (1.1.6)
52+
dotenv (2.7.5)
53+
i18n (1.8.2)
54+
concurrent-ruby (~> 1.0)
55+
jmespath (1.4.0)
56+
mini_mime (1.0.2)
57+
mini_portile2 (2.4.0)
58+
minitest (5.14.1)
59+
nokogiri (1.10.9)
60+
mini_portile2 (~> 2.4.0)
61+
parslet (1.8.2)
62+
public_suffix (4.0.5)
63+
rack (2.2.2)
64+
rack-test (1.1.0)
65+
rack (>= 1.0, < 3)
66+
regexp_parser (1.7.0)
67+
repl_runner (0.0.3)
68+
activesupport
69+
rubyzip (2.3.0)
70+
selenium-webdriver (3.142.7)
71+
childprocess (>= 0.5, < 4.0)
72+
rubyzip (>= 1.2.2)
73+
thor (1.0.1)
74+
thread_safe (0.3.6)
75+
tzinfo (1.2.7)
76+
thread_safe (~> 0.1)
77+
xpath (3.2.0)
78+
nokogiri (~> 1.8)
79+
zeitwerk (2.3.0)
80+
81+
PLATFORMS
82+
ruby
83+
84+
DEPENDENCIES
85+
rundoc!
86+
87+
BUNDLED WITH
88+
2.1.2

‎docs/deploying-spring-boot-apps.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Now deploy your code:
113113

114114
```term
115115
:::>- $ git push heroku master
116-
:::-> | $ (head -6; echo "..."; tail -18)
116+
:::-> | (head -6; echo "..."; tail -18)
117117
```
118118

119119
Heroku automatically detects the application as a Maven/Java app due to the presence of a `pom.xml` file. It installed Java 8 by default, but you can easily configure this with a `system.properties` file as described in the [Specifying a Java version](https://devcenter.heroku.com/articles/java-support#specifying-a-java-version) Dev Center article. It will run your app using the [default command](https://devcenter.heroku.com/articles/java-support#default-web-process-type).

‎docs/java-getting-started.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,15 @@ First, create an app on Heroku, which prepares Heroku to receive your source cod
127127
:::>> $ heroku create
128128
```
129129

130-
When you create an app, a Git remote (named `heroku`) is also created and associated with your local Git repository.
130+
When you create an app, a Git remote (named `heroku`) is also created and associated with your local Git repository.
131131

132132
By default, Heroku generates a random name for your app. You can pass a parameter to specify your own app name.
133133

134134
Now deploy your code:
135135

136136
```term
137137
:::>- $ git push heroku master
138-
:::-> | $ (head -6; echo "..."; tail -18)
138+
:::-> | (head -6; echo "..."; tail -18)
139139
```
140140

141141
The application is now deployed. Ensure that at least one instance of the app is running:
@@ -236,7 +236,7 @@ Run `mvn clean install` in your local directory to install the dependencies, pre
236236

237237
```term
238238
:::>- $ mvn clean install
239-
:::-> | $ (echo "..."; tail -7)
239+
:::-> | (echo "..."; tail -7)
240240
```
241241

242242
If you do not have Maven installed, or get an error like `'mvn' is not recognized as an internal or external command`, then you can use the wrapper command instead by running `mvnw clean install` on Windows or `./mvnw clean install` on Mac and Linux. This both installs Maven and runs the Maven command.
@@ -265,8 +265,8 @@ Once dependencies are installed, you can run your app locally.
265265
Start your application locally with the `heroku local` CLI command (make sure you've already run `mvn clean install`):
266266

267267
```term
268-
:::>- background.start("heroku local web", name: "local1", wait: "Tomcat started", timeout: 30)
269-
:::-> | $ (echo "..."; tail -4)
268+
:::>- background.start("heroku local web", name: "local1", wait: "Tomcat started", timeout: 75)
269+
:::-> | (echo "..."; tail -4)
270270
:::-- background.stop(name: "local1")
271271
```
272272

@@ -312,7 +312,7 @@ String hello(Map<String, Object> model) {
312312
model.put("science", "E=mc^2: 12 GeV = " + m.toString());
313313
return "hello";
314314
}
315-
```
315+
```
316316

317317
Finally, create a `src/main/resources/templates/hello.html` file with these contents:
318318

@@ -334,9 +334,9 @@ Now test your changes locally:
334334

335335
```term
336336
:::>- $ mvn clean install
337-
:::-> | $ (echo "..."; tail -7)
338-
:::>- background.start("heroku local web", name: "local2", wait: "Tomcat started", timeout: 30)
339-
:::-> | $ (echo "..."; tail -4)
337+
:::-> | (echo "..."; tail -7)
338+
:::>- background.start("heroku local web", name: "local2", wait: "Tomcat started", timeout: 75)
339+
:::-> | (echo "..."; tail -4)
340340
:::-- background.stop(name: "local2")
341341
```
342342

@@ -426,7 +426,7 @@ The `heroku run` command lets you run maintenance and administrative tasks on yo
426426

427427
```term
428428
:::>- $ heroku run java -version
429-
:::-> | $ tail -4
429+
:::-> | tail -4
430430
```
431431

432432
If you receive an error, `Error connecting to process`, then you might need to [configure your firewall](one-off-dynos#timeout-awaiting-process).

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.boot</groupId>
1212
<artifactId>spring-boot-starter-parent</artifactId>
13-
<version>2.1.6.RELEASE</version>
13+
<version>2.3.0.RELEASE</version>
1414
<relativePath/>
1515
</parent>
1616
<name>java-getting-started</name>

0 commit comments

Comments
 (0)