From fa80515866e2f3941d97ca0fa5d460c2452db4d2 Mon Sep 17 00:00:00 2001 From: mattbsox Date: Thu, 8 Mar 2018 16:05:07 -0600 Subject: [PATCH 1/2] applying eclipse-wtp earlier --- .../groovy/net/wasdev/wlp/gradle/plugins/Liberty.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/groovy/net/wasdev/wlp/gradle/plugins/Liberty.groovy b/src/main/groovy/net/wasdev/wlp/gradle/plugins/Liberty.groovy index 9e53c8a97..b3770fa35 100644 --- a/src/main/groovy/net/wasdev/wlp/gradle/plugins/Liberty.groovy +++ b/src/main/groovy/net/wasdev/wlp/gradle/plugins/Liberty.groovy @@ -56,6 +56,10 @@ class Liberty implements Plugin { project.configurations.create('libertyLicense') project.configurations.create('libertyRuntime') + //Used to set project facets in Eclipse + project.pluginManager.apply('eclipse-wtp') + project.tasks.getByName('eclipseWtpFacet').finalizedBy 'libertyCreate' + //Create expected server extension from liberty extension data project.afterEvaluate { setEclipseFacets(project) @@ -225,10 +229,6 @@ class Liberty implements Plugin { } private void setEclipseFacets(Project project) { - //Used to set project facets in Eclipse - project.pluginManager.apply('eclipse-wtp') - project.tasks.getByName('eclipseWtpFacet').finalizedBy 'libertyCreate' - //Uplift the jst.web facet version to 3.0 if less than 3.0 so WDT can deploy properly to Liberty. //There is a known bug in the wtp plugin that will add duplicate facets, the first of the duplicates is honored. if(project.plugins.hasPlugin('war')) { From 5584432fe56b7462cdf67689d1ba5b88068d704f Mon Sep 17 00:00:00 2001 From: mattbsox Date: Thu, 8 Mar 2018 16:17:06 -0600 Subject: [PATCH 2/2] reverting version update for rerelease --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 31232d952..f7517fa74 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ task wrapper(type: Wrapper) { archivesBaseName = 'liberty-gradle-plugin' group = 'net.wasdev.wlp.gradle.plugins' -version = '2.3-SNAPSHOT' +version = '2.2-SNAPSHOT' task sourcesJar(type: Jar) { classifier = 'sources'