Commit 6bb432d

committed

Merge branch '3.4.x'

2 parents 071c013 + 8bb35d0 commit 6bb432dCopy full SHA for 6bb432d

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`
`17`		`-package org.springframework.boot.web.context;`
	`17`	`+package org.springframework.boot.web.servlet.context;`
`18`	`18`
`19`	`19`	`import org.springframework.boot.io.ApplicationResourceLoader;`
`20`	`20`	`import org.springframework.boot.io.ApplicationResourceLoader.FilePathResolver;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -111,5 +111,5 @@ org.springframework.boot.io.Base64ProtocolResolver`
`111`	`111`	`# Resource File Path Resolvers`
`112`	`112`	`org.springframework.boot.io.ApplicationResourceLoader$FilePathResolver=\`
`113`	`113`	`org.springframework.boot.io.ClassPathResourceFilePathResolver,\`
`114`		`-org.springframework.boot.web.context.ServletContextResourceFilePathResolver,\`
`115`		`-org.springframework.boot.web.reactive.context.FilteredReactiveWebContextResourceFilePathResolver`
	`114`	`+org.springframework.boot.web.reactive.context.FilteredReactiveWebContextResourceFilePathResolver,\`
	`115`	`+org.springframework.boot.web.servlet.context.ServletContextResourceFilePathResolver`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`
`17`		`-package org.springframework.boot.web.context;`
	`17`	`+package org.springframework.boot.web.servlet.context;`
`18`	`18`
`19`	`19`	`import java.io.File;`
`20`	`20`

Comments

(0)