Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
e74f7779
Commit
e74f7779
authored
Sep 26, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove use of spring-core's Assert from PropertiesLauncher
Fixes gh-23474
parent
32519409
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
pom.xml
...boot-project/spring-boot-tools/spring-boot-loader/pom.xml
+1
-6
PropertiesLauncher.java
...a/org/springframework/boot/loader/PropertiesLauncher.java
+4
-3
No files found.
spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml
View file @
e74f7779
...
@@ -19,12 +19,7 @@
...
@@ -19,12 +19,7 @@
<developerConnection>
${git.developerConnection}
</developerConnection>
<developerConnection>
${git.developerConnection}
</developerConnection>
</scm>
</scm>
<dependencies>
<dependencies>
<!-- Optional (must never have compile/runtime time dependencies) -->
<!-- Mmust never have compile/runtime time dependencies -->
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-core
</artifactId>
<optional>
true
</optional>
</dependency>
<!-- Test -->
<!-- Test -->
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
...
...
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
View file @
e74f7779
/*
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -43,7 +43,6 @@ import org.springframework.boot.loader.archive.Archive.EntryFilter;
...
@@ -43,7 +43,6 @@ import org.springframework.boot.loader.archive.Archive.EntryFilter;
import
org.springframework.boot.loader.archive.ExplodedArchive
;
import
org.springframework.boot.loader.archive.ExplodedArchive
;
import
org.springframework.boot.loader.archive.JarFileArchive
;
import
org.springframework.boot.loader.archive.JarFileArchive
;
import
org.springframework.boot.loader.util.SystemPropertyUtils
;
import
org.springframework.boot.loader.util.SystemPropertyUtils
;
import
org.springframework.util.Assert
;
/**
/**
* {@link Launcher} for archives with user-configured classpath and main class via a
* {@link Launcher} for archives with user-configured classpath and main class via a
...
@@ -370,7 +369,9 @@ public class PropertiesLauncher extends Launcher {
...
@@ -370,7 +369,9 @@ public class PropertiesLauncher extends Launcher {
if
(
classLoader
==
null
)
{
if
(
classLoader
==
null
)
{
classLoader
=
newClassLoader
(
type
,
NO_PARAMS
);
classLoader
=
newClassLoader
(
type
,
NO_PARAMS
);
}
}
Assert
.
notNull
(
classLoader
,
"Unable to create class loader for "
+
className
);
if
(
classLoader
==
null
)
{
throw
new
IllegalArgumentException
(
"Unable to create class loader for "
+
className
);
}
return
classLoader
;
return
classLoader
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment