Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use bootWar instead of war for Spring Boot war projects #1787

Merged
merged 5 commits into from
Jun 20, 2019
Merged

Use bootWar instead of war for Spring Boot war projects #1787

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d1bd2b
Use bootWar instead of war for Spring Boot war projects
larsgrefer Jun 20, 2019
47988c7
Don't use the WarPluginConvention anymore
larsgrefer Jun 20, 2019
d68ca2d
Add unit tests for the new getWarTask() implementation
larsgrefer Jun 20, 2019
3b3ce6f
Merge branch 'master' of git://github.com/GoogleContainerTools/jib in…
larsgrefer Jun 20, 2019
2faddc1
Add comment
larsgrefer Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/TaskCommon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@
import java.util.logging.Level;
import javax.annotation.Nullable;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.logging.Logger;
import org.gradle.api.plugins.WarPluginConvention;
import org.gradle.api.plugins.WarPlugin;
import org.gradle.api.tasks.bundling.War;
import org.gradle.internal.logging.events.LogEvent;
import org.gradle.internal.logging.events.OutputEventListener;
Expand All @@ -38,12 +39,19 @@ class TaskCommon {

@Nullable
static War getWarTask(Project project) {
WarPluginConvention warPluginConvention =
project.getConvention().findPlugin(WarPluginConvention.class);
if (warPluginConvention == null) {

if (!project.getPlugins().hasPlugin(WarPlugin.class)) {
return null;
}
return (War) warPluginConvention.getProject().getTasks().findByName("war");

if (project.getPlugins().hasPlugin("org.springframework.boot")) {
Task bootWar = project.getTasks().findByName("bootWar");
if (bootWar != null) { // Spring Boot > 2.0
return (War) bootWar;
}
}

return (War) project.getTasks().findByName(WarPlugin.WAR_TASK_NAME);
}

/** Disables annoying Apache HTTP client logging. */
Expand Down
13 changes: 6 additions & 7 deletions ...e-plugin/src/test/java/com/google/cloud/tools/jib/gradle/GradleProjectPropertiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@
import org.gradle.api.logging.configuration.ConsoleOutput;
import org.gradle.api.plugins.Convention;
import org.gradle.api.plugins.JavaPluginConvention;
import org.gradle.api.plugins.WarPluginConvention;
import org.gradle.api.plugins.PluginContainer;
import org.gradle.api.plugins.WarPlugin;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.SourceSetContainer;
import org.gradle.api.tasks.SourceSetOutput;
Expand Down Expand Up @@ -170,6 +171,7 @@ private static Path getResource(String path) throws URISyntaxException {
@Mock private Project mockProject;
@Mock private Convention mockConvention;
@Mock private TaskContainer mockTaskContainer;
@Mock private PluginContainer mockPluginContainer;
@Mock private Logger mockLogger;
@Mock private Gradle mockGradle;
@Mock private StartParameter mockStartParameter;
Expand All @@ -190,6 +192,7 @@ public void setup() throws URISyntaxException, IOException {
.thenReturn(mockJavaPluginConvention);
Mockito.when(mockJavaPluginConvention.getSourceSets()).thenReturn(mockSourceSetContainer);
Mockito.when(mockProject.getTasks()).thenReturn(mockTaskContainer);
Mockito.when(mockProject.getPlugins()).thenReturn(mockPluginContainer);
Mockito.when(mockJar.getManifest()).thenReturn(manifest);
Mockito.when(mockProject.getGradle()).thenReturn(mockGradle);
Mockito.when(mockGradle.getStartParameter()).thenReturn(mockStartParameter);
Expand Down Expand Up @@ -252,7 +255,7 @@ public void testGetWar_warProject() throws URISyntaxException {
@Test
public void testGetWar_noWarPlugin() throws URISyntaxException {
setUpWarProject(getResource("gradle/webapp"));
Mockito.when(mockConvention.findPlugin(WarPluginConvention.class)).thenReturn(null);
Mockito.when(mockPluginContainer.hasPlugin(WarPlugin.class)).thenReturn(false);

Assert.assertNull(TaskCommon.getWarTask(mockProject));
}
Expand Down Expand Up @@ -559,10 +562,6 @@ private BuildConfiguration setupBuildConfiguration(String appRoot)
private void setUpWarProject(Path webAppDirectory) {
Mockito.when(mockProject.getBuildDir()).thenReturn(webAppDirectory.toFile());
Mockito.when(mockTaskContainer.findByName("war")).thenReturn(war);

WarPluginConvention warPluginConvention = Mockito.mock(WarPluginConvention.class);
Mockito.when(warPluginConvention.getProject()).thenReturn(mockProject);
Mockito.when(mockConvention.findPlugin(WarPluginConvention.class))
.thenReturn(warPluginConvention);
Mockito.when(mockPluginContainer.hasPlugin(WarPlugin.class)).thenReturn(true);
}
}