Skip to content

Commit

Permalink
Merge pull request #232 from mattbsox/apply-eclipse-plugin
Browse files Browse the repository at this point in the history
applying eclipse-wtp earlier and reverting release versions
  • Loading branch information
mattbsox authored Mar 8, 2018
2 parents 6550618 + 5584432 commit b6b5b44
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions src/main/groovy/net/wasdev/wlp/gradle/plugins/Liberty.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ class Liberty implements Plugin<Project> {
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)
Expand Down Expand Up @@ -225,10 +229,6 @@ class Liberty implements Plugin<Project> {
}

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')) {
Expand Down

0 comments on commit b6b5b44

Please sign in to comment.