From 7923dbe5ebf1cd6396f220edc2e3c3f72afb7404 Mon Sep 17 00:00:00 2001 From: Christian Buehlmann Date: Wed, 19 Apr 2017 11:52:42 +0200 Subject: [PATCH 1/4] adapt to gradle 3.x collection addition using plus() --- .../org/akhikhl/wuff/OsgiBundleConfigurer.groovy | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/wuff-plugin/src/main/groovy/org/akhikhl/wuff/OsgiBundleConfigurer.groovy b/libs/wuff-plugin/src/main/groovy/org/akhikhl/wuff/OsgiBundleConfigurer.groovy index 486aa72..73425c0 100644 --- a/libs/wuff-plugin/src/main/groovy/org/akhikhl/wuff/OsgiBundleConfigurer.groovy +++ b/libs/wuff-plugin/src/main/groovy/org/akhikhl/wuff/OsgiBundleConfigurer.groovy @@ -337,27 +337,27 @@ class OsgiBundleConfigurer extends JavaConfigurer { } @Override - protected void createConfigurations() { + protected void createConfigurations() { super.createConfigurations() if(!project.configurations.findByName('publicLib')) { Configuration configuration = project.configurations.create('publicLib') - project.sourceSets.each { it.compileClasspath += [configuration] } + project.sourceSets.each { it.compileClasspath.plus(configuration) } if (project.plugins.hasPlugin('idea')) - project.idea.module.scopes.COMPILE.plus += [configuration] + project.idea.module.scopes.COMPILE.plus(configuration) if (project.plugins.hasPlugin('eclipse')) - project.eclipse.classpath.plusConfigurations += [configuration] + project.eclipse.classpath.plusConfigurations.plus(configuration) } if(!project.configurations.findByName('privateLib')) { Configuration configuration = project.configurations.create('privateLib') - project.sourceSets.each { it.compileClasspath += [configuration] } + project.sourceSets.each { it.compileClasspath.plus(configuration) } if (project.plugins.hasPlugin('idea')) - project.idea.module.scopes.COMPILE.plus += [configuration] + project.idea.module.scopes.COMPILE.plus(configuration) if (project.plugins.hasPlugin('eclipse')) - project.eclipse.classpath.plusConfigurations += [configuration] + project.eclipse.classpath.plusConfigurations.plus(configuration) } } From 15c08fef9c1c4e205509c3067ca7f84030e140d3 Mon Sep 17 00:00:00 2001 From: Christian Buehlmann Date: Wed, 19 Apr 2017 21:25:05 +0200 Subject: [PATCH 2/4] use mirrors that still host old eclipse binaries --- .../org/akhikhl/wuff/defaultConfig.groovy | 86 ++++++++----------- 1 file changed, 37 insertions(+), 49 deletions(-) diff --git a/libs/wuff-plugin/src/main/resources/org/akhikhl/wuff/defaultConfig.groovy b/libs/wuff-plugin/src/main/resources/org/akhikhl/wuff/defaultConfig.groovy index 5fa07ec..76bfeea 100644 --- a/libs/wuff-plugin/src/main/resources/org/akhikhl/wuff/defaultConfig.groovy +++ b/libs/wuff-plugin/src/main/resources/org/akhikhl/wuff/defaultConfig.groovy @@ -1,5 +1,14 @@ wuff { + // select you mirror + // def eclipseMirror = 'http://mirror.switch.ch' + + def eclipseMirror = 'http://www.eclipse.org/downloads/download.php?file=' + + def eclipseArchiveMirror = 'http://www.eclipse.org/downloads/download.php?file=' + // old access path: + // def eclipseArchiveMirror = 'http://archive.eclipse.org' + wuffDir = new File(System.getProperty('user.home'), '.wuff') localMavenRepositoryDir = new File(wuffDir, 'm2_repository') @@ -9,15 +18,11 @@ wuff { def suffix_os = [ 'linux': 'linux-gtk', 'macosx': 'macosx-cocoa', 'windows': 'win32' ] def suffix_arch = [ 'x86_32': '', 'x86_64': '-x86_64' ] def fileExt_os = [ 'linux': 'tar.gz', 'macosx': 'tar.gz', 'windows': 'zip' ] - + eclipseVersion('3.7.1') { eclipseMavenGroup = 'eclipse-indigo-sr1' - eclipseMirror = 'http://mirror.netcologne.de' - - eclipseArchiveMirror = 'http://archive.eclipse.org' - sources { source "${eclipseArchiveMirror}/technology/epp/downloads/release/indigo/SR1/eclipse-jee-indigo-SR1-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" @@ -213,10 +218,6 @@ wuff { eclipseMavenGroup = 'eclipse-indigo-sr2' - eclipseMirror = 'http://mirror.netcologne.de' - - eclipseArchiveMirror = 'http://archive.eclipse.org' - sources { source "${eclipseMirror}/eclipse//technology/epp/downloads/release/indigo/SR2/eclipse-jee-indigo-SR2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" @@ -227,6 +228,22 @@ wuff { languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.11.1/indigo/BabelLanguagePack-rt.equinox-${language}_3.7.0.v20131123061707.zip' } } + + eclipseVersion('3.8.0') { + + extendsFrom '3.7.2' + + eclipseMavenGroup = 'eclipse-juno' + + sources { + source "${eclipseArchiveMirror}/technology/epp/downloads/release/juno/R/eclipse-jee-juno-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" + source "${eclipseArchiveMirror}/eclipse/downloads/drops/R-3.8-201206081200/eclipse-SDK-3.8-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true + source "${eclipseArchiveMirror}/eclipse/downloads/drops/R-3.8-201206081200/eclipse-3.8-delta-pack.zip" + + //languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.11.1/indigo/BabelLanguagePack-eclipse-${language}_3.7.0.v20131123061707.zip' + //languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.11.1/indigo/BabelLanguagePack-rt.equinox-${language}_3.7.0.v20131123061707.zip' + } + } eclipseVersion('4.2.1') { @@ -234,10 +251,6 @@ wuff { eclipseMavenGroup = 'eclipse-juno-sr1' - eclipseMirror = 'http://mirror.netcologne.de' - - eclipseArchiveMirror = 'http://archive.eclipse.org' - sources { source "${eclipseArchiveMirror}/technology/epp/downloads/release/juno/SR1/eclipse-jee-juno-SR1-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" @@ -291,10 +304,6 @@ wuff { eclipseMavenGroup = 'eclipse-juno-sr2' - eclipseMirror = 'http://mirror.netcologne.de' - - eclipseArchiveMirror = 'http://archive.eclipse.org' - sources { source "${eclipseMirror}/eclipse//technology/epp/downloads/release/juno/SR2/eclipse-jee-juno-SR2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" @@ -312,10 +321,6 @@ wuff { eclipseMavenGroup = 'eclipse-kepler-sr1' - eclipseMirror = 'http://mirror.netcologne.de' - - eclipseArchiveMirror = 'http://archive.eclipse.org' - sources { source "${eclipseArchiveMirror}/technology/epp/downloads/release/kepler/SR1/eclipse-jee-kepler-SR1-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" @@ -332,15 +337,11 @@ wuff { eclipseMavenGroup = 'eclipse-kepler-sr2' - eclipseMirror = 'http://mirror.netcologne.de' - - eclipseArchiveMirror = 'http://archive.eclipse.org' - sources { source "$eclipseMirror/eclipse//technology/epp/downloads/release/kepler/SR2/eclipse-jee-kepler-SR2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" - source "$eclipseMirror/eclipse//eclipse/downloads/drops4/R-4.3.2-201402211700/eclipse-SDK-4.3.2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true - source "$eclipseMirror/eclipse//eclipse/downloads/drops4/R-4.3.2-201402211700/eclipse-4.3.2-delta-pack.zip" + source "${eclipseArchiveMirror}/eclipse//eclipse/downloads/drops4/R-4.3.2-201402211700/eclipse-SDK-4.3.2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true + source "${eclipseArchiveMirror}//eclipse/downloads/drops4/R-4.3.2-201402211700/eclipse-4.3.2-delta-pack.zip" languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.11.1/kepler/BabelLanguagePack-eclipse-${language}_4.3.0.v20131123020001.zip' } @@ -352,15 +353,11 @@ wuff { eclipseMavenGroup = 'eclipse-luna' - eclipseMirror = 'http://mirror.netcologne.de' - - eclipseArchiveMirror = 'http://archive.eclipse.org' - sources { source "$eclipseMirror/eclipse//technology/epp/downloads/release/luna/R/eclipse-jee-luna-R-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" - source "$eclipseArchiveMirror/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" - source "$eclipseArchiveMirror/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-4.4-delta-pack.zip" + source "${eclipseArchiveMirror}/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" + source "${eclipseArchiveMirror}/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-4.4-delta-pack.zip" languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.12.1/luna/BabelLanguagePack-eclipse-${language}_4.4.0.v20141223043836.zip' } @@ -385,10 +382,6 @@ wuff { eclipseMavenGroup = 'eclipse-luna-sr1' - eclipseMirror = 'http://mirror.netcologne.de' - - eclipseArchiveMirror = 'http://archive.eclipse.org' - sources { source "${eclipseMirror}/eclipse//technology/epp/downloads/release/luna/SR1/eclipse-jee-luna-SR1-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" @@ -404,15 +397,14 @@ wuff { eclipseMavenGroup = 'eclipse-luna-sr2' - eclipseMirror = 'http://mirror.netcologne.de' - - eclipseArchiveMirror = 'http://archive.eclipse.org' - + // not available on all mirrors, but here: + eclipseMirror = 'http://mirror.switch.ch' + sources { - source "${eclipseMirror}/eclipse//technology/epp/downloads/release/luna/SR2/eclipse-jee-luna-SR2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" - source "${eclipseMirror}/eclipse//eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true - source "${eclipseMirror}/eclipse//eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-4.4.2-delta-pack.zip" + source "${eclipseMirror}/eclipse/technology/epp/downloads/release/luna/SR2/eclipse-jee-luna-SR2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" + source "${eclipseArchiveMirror}/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true + source "${eclipseArchiveMirror}/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-4.4.2-delta-pack.zip" languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.12.1/luna/BabelLanguagePack-eclipse-${language}_4.4.0.v20141223043836.zip' } @@ -424,14 +416,10 @@ wuff { eclipseMavenGroup = 'eclipse-mars' - eclipseMirror = 'http://mirror.netcologne.de' - - eclipseArchiveMirror = 'http://archive.eclipse.org' - sources { source "${eclipseMirror}/eclipse//technology/epp/downloads/release/mars/R/eclipse-jee-mars-R-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}" - source "${eclipseMirror}/eclipse//eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true + source "${eclipseArchiveMirror}/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.13.0/mars/BabelLanguagePack-eclipse-${language}_4.5.0.v20150804081228.zip' } From 82b02a214c86acd994570b1e3feed04ca8886a00 Mon Sep 17 00:00:00 2001 From: bue Date: Mon, 24 Apr 2017 00:35:49 +0200 Subject: [PATCH 3/4] use unpuzzle version 0.0.23 fix maven pom add dependency to maven-ant-tasks:2.1.3 --- gradle.properties | 2 +- libs/publish.gradle | 14 +++++++++++++- libs/wuff-plugin/build.gradle | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index d0a2b95..15d6c5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,6 @@ logback_version=1.1.3 projectId=wuff projectLabels=wuff,gradle,plugin,eclipse,osgi,maven,rcp,ide slf4j_version=1.7.7 -unpuzzle_version=0.0.22 +unpuzzle_version=0.0.23 version=0.0.20 diff --git a/libs/publish.gradle b/libs/publish.gradle index 56851e5..89f0563 100644 --- a/libs/publish.gradle +++ b/libs/publish.gradle @@ -44,7 +44,19 @@ publishing { pom.withXml { asNode().children().last() + configurePom } - } + + // add dependencies + pom.withXml { + def dependenciesNode = asNode().appendNode('dependencies') + configurations.compile.allDependencies.findAll { it.name != 'unspecified' } .each { + println 'adding dependency ' + it.name + ' to ' + project.name + def dependencyNode = dependenciesNode.appendNode('dependency') + dependencyNode.appendNode('groupId', it.group) + dependencyNode.appendNode('artifactId', it.name) + dependencyNode.appendNode('version', it.version) + } + } + } } } diff --git a/libs/wuff-plugin/build.gradle b/libs/wuff-plugin/build.gradle index b449327..af70d69 100644 --- a/libs/wuff-plugin/build.gradle +++ b/libs/wuff-plugin/build.gradle @@ -12,4 +12,5 @@ dependencies { compile 'commons-io:commons-io:2.4' compile 'commons-codec:commons-codec:1.9' compile 'commons-configuration:commons-configuration:1.10' + runtime 'org.apache.maven:maven-ant-tasks:2.1.3' } From a621b566e6d4a00470f1c58d97b7bbee48ffcae6 Mon Sep 17 00:00:00 2001 From: bueli Date: Mon, 24 Apr 2017 18:27:19 +0200 Subject: [PATCH 4/4] define scope for dependencies in maven pom remove obsolete dependencies --- libs/publish.gradle | 1 + libs/wuff-plugin/build.gradle | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/publish.gradle b/libs/publish.gradle index 89f0563..f3cbc1e 100644 --- a/libs/publish.gradle +++ b/libs/publish.gradle @@ -54,6 +54,7 @@ publishing { dependencyNode.appendNode('groupId', it.group) dependencyNode.appendNode('artifactId', it.name) dependencyNode.appendNode('version', it.version) + dependencyNode.appendNode('scope', 'runtime') } } } diff --git a/libs/wuff-plugin/build.gradle b/libs/wuff-plugin/build.gradle index af70d69..c85d6d5 100644 --- a/libs/wuff-plugin/build.gradle +++ b/libs/wuff-plugin/build.gradle @@ -9,8 +9,5 @@ dependencies { compile "org.akhikhl.unpuzzle:unpuzzle-plugin:$unpuzzle_version", { exclude group: 'org.codehaus.groovy', module: 'groovy-all' } - compile 'commons-io:commons-io:2.4' - compile 'commons-codec:commons-codec:1.9' compile 'commons-configuration:commons-configuration:1.10' - runtime 'org.apache.maven:maven-ant-tasks:2.1.3' }