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
b50e8eb3
Commit
b50e8eb3
authored
Apr 07, 2020
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix package tangle in Gradle plugin
Relocate `VersionExtractor` to fix a package tangle.
parent
6e7b473f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
2 deletions
+23
-2
SpringBootPlugin.java
.../springframework/boot/gradle/plugin/SpringBootPlugin.java
+1
-0
BootBuildImage.java
...gframework/boot/gradle/tasks/bundling/BootBuildImage.java
+1
-1
VersionExtractor.java
...rg/springframework/boot/gradle/util/VersionExtractor.java
+1
-1
package-info.java
...va/org/springframework/boot/gradle/util/package-info.java
+20
-0
No files found.
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
View file @
b50e8eb3
...
...
@@ -30,6 +30,7 @@ import org.springframework.boot.gradle.dsl.SpringBootExtension;
import
org.springframework.boot.gradle.tasks.bundling.BootBuildImage
;
import
org.springframework.boot.gradle.tasks.bundling.BootJar
;
import
org.springframework.boot.gradle.tasks.bundling.BootWar
;
import
org.springframework.boot.gradle.util.VersionExtractor
;
/**
* Gradle plugin for Spring Boot.
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImage.java
View file @
b50e8eb3
...
...
@@ -38,7 +38,7 @@ import org.springframework.boot.buildpack.platform.docker.transport.DockerEngine
import
org.springframework.boot.buildpack.platform.docker.type.ImageName
;
import
org.springframework.boot.buildpack.platform.docker.type.ImageReference
;
import
org.springframework.boot.buildpack.platform.io.ZipFileTarArchive
;
import
org.springframework.boot.gradle.
plugin
.VersionExtractor
;
import
org.springframework.boot.gradle.
util
.VersionExtractor
;
import
org.springframework.util.StringUtils
;
/**
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/
plugin
/VersionExtractor.java
→
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/
util
/VersionExtractor.java
View file @
b50e8eb3
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
gradle
.
plugin
;
package
org
.
springframework
.
boot
.
gradle
.
util
;
import
java.io.File
;
import
java.io.IOException
;
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/util/package-info.java
0 → 100644
View file @
b50e8eb3
/*
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Shared utility classes.
*/
package
org
.
springframework
.
boot
.
gradle
.
util
;
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