Skip to content

Commit

Permalink
removing use of deprecated plugin conventions
Browse files Browse the repository at this point in the history
Signed-off-by: Arun Venmany <[email protected]>
  • Loading branch information
arunvenmany-ibm committed Sep 9, 2024
1 parent d6de8bc commit f80eb88
Showing 1 changed file with 5 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,11 @@
*/
package io.openliberty.tools.gradle.tasks

import java.io.File;
import java.text.MessageFormat;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.HashSet;

import org.gradle.api.tasks.TaskAction
import io.openliberty.tools.ant.jsp.CompileJSPs
import org.apache.tools.ant.Project
import org.gradle.api.Task
import org.gradle.api.GradleException
import org.gradle.api.tasks.TaskAction
import org.gradle.api.tasks.bundling.War
import org.gradle.api.logging.LogLevel

import org.apache.tools.ant.Project;
import io.openliberty.tools.ant.jsp.CompileJSPs;

class CompileJSPTask extends AbstractFeatureTask {
protected Project ant = new Project();
Expand Down Expand Up @@ -69,8 +59,8 @@ class CompileJSPTask extends AbstractFeatureTask {
War war;
if(project.plugins.hasPlugin("war")){
war = (War)project.war
if ( war.webAppDirectory.asFile.get() != null) {
compileJsp.setSrcdir( war.webAppDirectory.asFile.get())
if ( war.getWebAppDirectory().getAsFile().get() != null) {
compileJsp.setSrcdir( war.getWebAppDirectory().getAsFile().get())
}
}else {
compileJsp.setSrcdir(new File("src/main/webapp"))
Expand Down

0 comments on commit f80eb88

Please sign in to comment.