This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit be98f228e80089b00f6a05896406bf533ffbcb68 Author: Damien Raude-Morvan <[email protected]> Date: Thu Feb 14 22:52:27 2013 +0100 d/rules: Use finalRelease property. --- build.gradle | 11 +++-- buildSrc/build.gradle | 14 ++++-- .../org/gradle/build/docs/Docbook2XHtml.groovy | 4 +- .../org/gradle/plugins/pegdown/PegDown.groovy | 13 ++--- debian/rules | 2 +- gradle/buildReceipt.gradle | 8 ++-- gradle/dependencies.gradle | 56 +++++++++++----------- gradle/integTest.gradle | 2 +- settings.gradle | 4 +- subprojects/code-quality/code-quality.gradle | 4 +- .../internal/findbugs/FindBugsExecuter.java | 10 +++- subprojects/core-impl/core-impl.gradle | 4 +- .../internal/artifacts/PlexusLoggerAdapter.java | 4 ++ subprojects/core/core.gradle | 4 +- .../internal/classpath/DefaultModuleRegistry.java | 9 ++-- .../org/gradle/profile/ProfileReportRenderer.java | 2 +- .../resources/org/gradle/reporting/base-style.css | 2 +- .../groovy/org/gradle/util/Matchers.java | 4 +- subprojects/docs/docs.gradle | 48 ++++++++++--------- subprojects/docs/src/docs/dsl/dsl.xml | 4 +- subprojects/docs/src/docs/stylesheets/dslHtml.xsl | 4 +- .../docs/src/docs/stylesheets/standaloneHtml.xsl | 4 +- .../docs/src/docs/stylesheets/userGuideHtml.xsl | 4 +- .../src/docs/stylesheets/userGuideHtmlCommon.xsl | 4 +- .../docs/src/docs/stylesheets/userGuidePdf.xsl | 4 +- .../src/docs/stylesheets/userGuideSingleHtml.xsl | 4 +- .../docs/src/docs/userguide/sonarPlugin.xml | 3 +- subprojects/docs/src/docs/userguide/userguide.xml | 2 +- subprojects/javascript/javascript.gradle | 6 ++- subprojects/jetty/jetty.gradle | 16 +++---- subprojects/maven/maven.gradle | 2 +- subprojects/native/native.gradle | 7 ++- .../filesystem/FileSystemServices.java | 6 +-- .../nativeplatform/filesystem/LibCStat.java | 19 ++------ .../nativeplatform/filesystem/PosixUtil.java | 4 +- .../nativeplatform/jna/JnaBootPathConfigurer.java | 12 ++++- subprojects/osgi/osgi.gradle | 2 +- subprojects/performance/performance.gradle | 2 +- subprojects/plugins/plugins.gradle | 2 +- .../testing/junit/report/DefaultTestReport.java | 2 +- .../internal/tasks/testing/junit/report/style.css | 2 +- subprojects/scala/scala.gradle | 5 +- .../api/plugins/scala/ScalaBasePlugin.groovy | 12 ++--- subprojects/signing/signing.gradle | 6 +-- 44 files changed, 189 insertions(+), 154 deletions(-) diff --git a/build.gradle b/build.gradle index d5bca86..8eecb17 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,7 @@ import org.gradle.build.Install import org.gradle.build.BuildTypes import org.gradle.build.TestReportAggregator +import org.apache.ivy.plugins.resolver.FileSystemResolver defaultTasks 'assemble' apply plugin: 'java-base' @@ -86,7 +87,7 @@ ext { publishedProjects = [project(':core'), project(':toolingApi'), project(':wrapper'), project(':baseServices'), project(':messaging')] pluginProjects = [ 'plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', - 'ide', 'announce', 'scala', 'sonar', 'signing', 'cpp', 'ear', 'javascript', 'buildComparison', + 'ide', 'announce', 'scala', 'signing', 'cpp', 'ear', 'javascript', 'buildComparison', 'diagnostics', 'reporting', 'publish', 'ivy' ].collect { project(it) @@ -107,7 +108,11 @@ allprojects { group = 'org.gradle' repositories { - maven { url 'http://repo.gradle.org/gradle/libs' } + add(new FileSystemResolver()) { + name = 'repo' + addArtifactPattern "/usr/share/java/[module].[ext]" + addArtifactPattern "/usr/share/java/[module]-[revision].[ext]" + } } } @@ -193,4 +198,4 @@ task installAll(type: Install) { installDirPropertyName = 'gradle_installPath' } -apply from: "gradle/intTestImage.gradle" \ No newline at end of file +apply from: "gradle/intTestImage.gradle" diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 6973939..f093768 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import org.apache.ivy.plugins.resolver.FileSystemResolver apply plugin: 'groovy' apply plugin: 'checkstyle' @@ -21,8 +22,14 @@ apply plugin: 'idea' apply plugin: 'eclipse' repositories { - maven { url 'http://repo.gradle.org/gradle/libs' } - mavenCentral() + //maven { url 'http://repo.gradle.org/gradle/libs' } + //mavenCentral() + //maven { url '/usr/share/maven-repo/' } + add(new FileSystemResolver()) { + name = 'repo' + addArtifactPattern "/usr/share/java/[module].[ext]" + addArtifactPattern "/usr/share/java/[module]-[revision].[ext]" + } } dependencies { @@ -30,10 +37,9 @@ dependencies { compile 'com.google.guava:guava:11.0.2@jar' compile 'commons-lang:commons-lang:2.6@jar' groovy localGroovy() - testCompile 'junit:junit:4.11@jar' + testCompile 'junit:junit4:4.x@jar' testCompile 'org.spockframework:spock-core:0.7-groovy-1.8@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' - compile "org.pegdown:pegdown:1.1.0" compile "org.jsoup:jsoup:1.6.3" //below dependency was deployed to the repo.gradle.org diff --git a/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy b/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy index 2ddf336..6825c9c 100755 --- a/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy +++ b/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy @@ -71,8 +71,8 @@ class Docbook2Xhtml extends SourceTask { jvmArgs '-Xmx256m' classpath ClasspathUtil.getClasspathForClass(XslTransformer) classpath this.classpath - classpath new File(stylesheetsDir, 'extensions/xalan27.jar') - systemProperty 'xslthl.config', new File("$stylesheetsDir/highlighting/xslthl-config.xml").toURI() + classpath new File('/usr/share/java/xalan2.jar') + systemProperty 'xslthl.config', new File("/usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting/xslthl-config.xml").toURI() systemProperty 'org.apache.xerces.xni.parser.XMLParserConfiguration', 'org.apache.xerces.parsers.XIncludeParserConfiguration' } } diff --git a/buildSrc/src/main/groovy/org/gradle/plugins/pegdown/PegDown.groovy b/buildSrc/src/main/groovy/org/gradle/plugins/pegdown/PegDown.groovy index d5718ab..19c6f9b 100644 --- a/buildSrc/src/main/groovy/org/gradle/plugins/pegdown/PegDown.groovy +++ b/buildSrc/src/main/groovy/org/gradle/plugins/pegdown/PegDown.groovy @@ -21,9 +21,9 @@ import org.gradle.api.tasks.Optional import org.gradle.api.tasks.SourceTask import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction -import org.pegdown.Extensions +//import org.pegdown.Extensions import org.gradle.api.InvalidUserDataException -import org.pegdown.PegDownProcessor +//import org.pegdown.PegDownProcessor class PegDown extends SourceTask { @@ -50,11 +50,12 @@ class PegDown extends SourceTask { @TaskAction void process() { - int optionsValue = getCalculatedOptions() + /*int optionsValue = getCalculatedOptions() PegDownProcessor processor = new PegDownProcessor(optionsValue) String markdown = getSource().singleFile.getText(getInputEncoding()) String html = processor.markdownToHtml(markdown) - getDestination().write(html, getOutputEncoding()) + getDestination().write(html, getOutputEncoding())*/ + throw new UnsupportedOperationException("PegDown"); } int getCalculatedOptions() { @@ -63,11 +64,11 @@ class PegDown extends SourceTask { protected int toOptionValue(String optionName) { String upName = val.toUpperCase() - try { + /*try { Extensions."$upName" } catch (MissingPropertyException e) { throw new InvalidUserDataException("$optionName is not a valid PegDown extension name") - } + }*/ } void options(String... options) { diff --git a/debian/rules b/debian/rules index 0d5fef0..166dd39 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ export GRADLE_OPTS=-Dfile.encoding=UTF-8 -Xmx512m export GRADLE_USER_HOME=$(CURDIR)/.gradlehome # Only for debug purpose # export JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -DEB_GRADLE_OPTS := --project-prop notSnapshot=true --project-prop version=$(UPSTREAM_VERSION) --stacktrace --offline +DEB_GRADLE_OPTS := --project-prop finalRelease=true --stacktrace --offline # Support for DEB_BUILD_OPTIONS parallel=n ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) diff --git a/gradle/buildReceipt.gradle b/gradle/buildReceipt.gradle index 893ce2e..ae44b2c 100644 --- a/gradle/buildReceipt.gradle +++ b/gradle/buildReceipt.gradle @@ -32,7 +32,7 @@ ext { } } -task determineCommitId { +/*task determineCommitId { ext.commitId = null doLast { @@ -93,9 +93,9 @@ task determineCommitId { throw new InvalidUserDataException("Could not determine commit id") } } -} +}*/ -task createBuildReceipt(dependsOn: determineCommitId) { +task createBuildReceipt() { ext.receiptFile = file("$buildDir/$buildReceiptFileName") outputs.file receiptFile outputs.upToDateWhen { false } @@ -107,7 +107,7 @@ task createBuildReceipt(dependsOn: determineCommitId) { hostName = "unknown" } def data = [ - commitId: determineCommitId.commitId, + commitId: "UNKNOWN", versionNumber: version, versionBase: versionBase, isSnapshot: isSnapshot, diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index f269dbb..33fe832 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -25,16 +25,16 @@ libraries.ant = dependencies.module('org.apache.ant:ant:1.8.4') { dependency 'org.apache.ant:ant-launcher:1.8.4@jar' } -libraries.asm = 'org.ow2.asm:asm-all:4.0@jar' +libraries.asm = 'asm:asm4-all:4.1@jar' libraries.commons_cli = 'commons-cli:commons-cli:1.2@jar' libraries.commons_io = dependencies.module(versions.commons_io) libraries.commons_lang = 'commons-lang:commons-lang:2.6@jar' -libraries.commons_collections = 'commons-collections:commons-collections:3.2.1@jar' +libraries.commons_collections = 'commons-collections:commons-collections3:3.2.1@jar' libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){ dependency "com.jcraft:jsch:0.1.46" } -libraries.jcip = "net.jcip:jcip-annotations:1.0@jar" -libraries.inject = dependencies.module('javax.inject:javax.inject:1') +libraries.jcip = "net.jcip:jcip:debian" +libraries.inject = dependencies.module('javax.inject:atinject-jsr330-api:1.0') // Logging libraries.slf4j_api = 'org.slf4j:slf4j-api:1.7.2@jar' @@ -54,7 +54,7 @@ libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic: } // Jetty -libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211@jar" +libraries.servlet_api = "javax.servlet:servlet-api:2.5@jar" libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") { dependency libraries.slf4j_api dependency libraries.servlet_api @@ -83,44 +83,46 @@ libraries += [ jsr305: 'com.google.code.findbugs:jsr305:1.3.9@jar', groovy: 'org.codehaus.groovy:groovy-all:1.8.6@jar', jaxen: 'jaxen:jaxen:1.1@jar', - jcip: "net.jcip:jcip-annotations:1.0@jar", + jcip: "net.jcip:jcip:debian", jna: 'net.java.dev.jna:jna:3.2.7@jar', - junit: 'junit:junit:4.11@jar', + junit: 'junit:junit4:4.x@jar', xmlunit: 'xmlunit:xmlunit:1.3', - nekohtml: 'net.sourceforge.nekohtml:nekohtml:1.9.14', + nekohtml: dependencies.module('net.sourceforge.nekohtml:nekohtml:1.9.14') { + dependency "xerces:xercesImpl:debian@jar" + }, xbean: 'org.apache.xbean:xbean-reflect:3.4@jar', //required by maven3 classes nativePlatform: 'net.rubygrapefruit:native-platform:0.2', xerces: "xerces:xercesImpl:2.9.1", objenesis: 'org.objenesis:objenesis:1.2@jar' ] -libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") { - dependency "org.apache.maven:maven-settings:3.0.4@jar" - dependency "org.apache.maven:maven-settings-builder:3.0.4@jar" +libraries.maven3 = dependencies.module("org.apache.maven:maven-core-3.x:3.x") { + dependency "org.apache.maven:maven-settings-3.x:3.x@jar" + dependency "org.apache.maven:maven-settings-builder-3.x:3.x@jar" //plexus: - dependency "org.codehaus.plexus:plexus-utils:2.0.6@jar" + dependency "org.codehaus.plexus:plexus-utils2:debian@jar" dependency "org.codehaus.plexus:plexus-interpolation:1.14@jar" - dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5@jar" - dependency "org.codehaus.plexus:plexus-container-default:1.5.5@jar" - dependency "org.codehaus.plexus:plexus-classworlds:2.4@jar" + dependency "org.codehaus.plexus:plexus-component-annotations-1.5:debian@jar" + dependency "org.codehaus.plexus:plexus-container-default-1.5:debian@jar" + dependency "org.codehaus.plexus:plexus-classworlds2:2.4@jar" //sonatype plexus dependency "org.sonatype.plexus:plexus-cipher:1.7@jar" dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3@jar" //core: - dependency "org.apache.maven:maven-core:3.0.4@jar" - dependency "org.apache.maven:maven-model-builder:3.0.4@jar" - dependency "org.apache.maven:maven-model:3.0.4@jar" + dependency "org.apache.maven:maven-core-3.x:3.x@jar" + dependency "org.apache.maven:maven-model-builder-3.x:3.x@jar" + dependency "org.apache.maven:maven-model-3.x:3.x@jar" //somewhat core: - dependency "org.apache.maven:maven-artifact:3.0.4@jar" - dependency "org.apache.maven:maven-compat:3.0.4@jar" - dependency "org.apache.maven:maven-repository-metadata:3.0.4@jar" - dependency "org.apache.maven:maven-plugin-api:3.0.4@jar" - dependency "org.apache.maven:maven-aether-provider:3.0.4@jar" - dependency "org.apache.maven.wagon:wagon-provider-api:2.2@jar" + dependency "org.apache.maven:maven-artifact-3.x:3.x@jar" + dependency "org.apache.maven:maven-compat-3.x:3.x@jar" + dependency "org.apache.maven:maven-repository-metadata-3.x:3.x@jar" + dependency "org.apache.maven:maven-plugin-api-3.x:3.x@jar" + dependency "org.apache.maven:maven-aether-provider-3.x:3.x@jar" + dependency "org.apache.maven.wagon:wagon-provider-api-2.x:2.x@jar" //eather: dependency "org.sonatype.aether:aether-api:1.13.1@jar" @@ -136,11 +138,11 @@ libraries.spock = [ 'cglib:cglib-nodep:2.2.2' ] libraries.jmock = [ - 'org.jmock:jmock:2.5.1', + 'org.jmock:jmock2:2.5.1', 'org.hamcrest:hamcrest-core:1.3', 'org.hamcrest:hamcrest-library:1.3', - dependencies.create('org.jmock:jmock-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types. - 'org.jmock:jmock-legacy:2.5.1', + dependencies.create('org.jmock:jmock2-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types. + 'org.jmock:jmock2-legacy:2.5.1', libraries.objenesis, 'cglib:cglib-nodep:2.2' ] diff --git a/gradle/integTest.gradle b/gradle/integTest.gradle index d5b36ca..cc9577b 100644 --- a/gradle/integTest.gradle +++ b/gradle/integTest.gradle @@ -13,7 +13,7 @@ configurations { } dependencies { - integTestCompile project(":internalIntegTesting") + //integTestCompile project(":internalIntegTesting") //so that implicit help tasks are available: integTestRuntime project(':diagnostics') diff --git a/settings.gradle b/settings.gradle index 801a90d..cb236b8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -36,13 +36,13 @@ include 'openApi' include 'toolingApi' include 'docs' include 'integTest' -include 'sonar' +//include 'sonar' include 'signing' include 'cpp' include 'ear' include 'native' include 'internalTesting' -include 'internalIntegTesting' +//include 'internalIntegTesting' include 'performance' include 'javascript' include 'buildComparison' diff --git a/subprojects/code-quality/code-quality.gradle b/subprojects/code-quality/code-quality.gradle index 90640da..d58cc53 100644 --- a/subprojects/code-quality/code-quality.gradle +++ b/subprojects/code-quality/code-quality.gradle @@ -26,8 +26,8 @@ dependencies { // minimal dependencies to make our code compile // we don't ship these dependencies because findbugs plugin will download them (and more) at runtime - provided "com.google.code.findbugs:findbugs:2.0.1@jar" - provided "com.google.code.findbugs:bcel:2.0.1@jar" + //provided "com.google.code.findbugs:findbugs:2.0.1@jar" + //provided "com.google.code.findbugs:bcel:2.0.1@jar" provided "dom4j:dom4j:1.6.1@jar" provided "jaxen:jaxen:1.1.1@jar" } diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsExecuter.java b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsExecuter.java index 4ed3c51..45f7bf0 100644 --- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsExecuter.java +++ b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsExecuter.java @@ -16,10 +16,12 @@ package org.gradle.api.plugins.quality.internal.findbugs; +/* import edu.umd.cs.findbugs.FindBugs; import edu.umd.cs.findbugs.FindBugs2; import edu.umd.cs.findbugs.IFindBugsEngine; import edu.umd.cs.findbugs.TextUICommandLine; +*/ import java.io.IOException; import java.io.Serializable; @@ -36,7 +38,7 @@ public class FindBugsExecuter implements Serializable { final List<String> args = spec.getArguments(); String[] strArray = new String[args.size()]; args.toArray(strArray); - +/* Thread.currentThread().setContextClassLoader(FindBugs2.class.getClassLoader()); FindBugs2 findBugs2 = new FindBugs2(); TextUICommandLine commandLine = new TextUICommandLine(); @@ -44,15 +46,19 @@ public class FindBugsExecuter implements Serializable { findBugs2.execute(); return createFindbugsResult(findBugs2); +*/ + return null; } finally { Thread.currentThread().setContextClassLoader(contextClassLoader); } } +/* FindBugsResult createFindbugsResult(IFindBugsEngine findBugs) { int bugCount = findBugs.getBugCount(); int missingClassCount = findBugs.getMissingClassCount(); int errorCount = findBugs.getErrorCount(); return new FindBugsResult(bugCount, missingClassCount, errorCount); } -} \ No newline at end of file +*/ +} diff --git a/subprojects/core-impl/core-impl.gradle b/subprojects/core-impl/core-impl.gradle index 495307e..86007fd 100644 --- a/subprojects/core-impl/core-impl.gradle +++ b/subprojects/core-impl/core-impl.gradle @@ -58,7 +58,7 @@ def avoidConflictingPlexusComponents(JarJar task) { //I'm removing the components.xml file from the sec-dispatcher jar. //This file contains only single component so I think we can remove it. task.doLast { - def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher-1.3.jar" + def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher.jar" def plexusSecNoComps = "$plexusSec-noComps" ant { zip(destfile: plexusSecNoComps, update: true) { @@ -69,4 +69,4 @@ def avoidConflictingPlexusComponents(JarJar task) { move(file: plexusSecNoComps, tofile: plexusSec) } } -} \ No newline at end of file +} diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java index 4bb5c77..0397d59 100644 --- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java +++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java @@ -98,4 +98,8 @@ public class PlexusLoggerAdapter implements Logger { public String getName() { return logger.getName(); } + + public void setThreshold(int level) { + throw new UnsupportedOperationException("setThreshold"); + } } diff --git a/subprojects/core/core.gradle b/subprojects/core/core.gradle index 53b252e..82fe6ca 100755 --- a/subprojects/core/core.gradle +++ b/subprojects/core/core.gradle @@ -59,9 +59,9 @@ dependencies { testCompile project(':coreImpl') - integTestCompile project(":internalIntegTesting") + //integTestCompile project(":internalIntegTesting") - reports 'css3-pie:css3-pie:1.0beta3' + //reports 'css3-pie:css3-pie:1.0beta3' } useTestFixtures() diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java index 0ba1e15..6a0d698 100644 --- a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java +++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java @@ -223,15 +223,18 @@ public class DefaultModuleRegistry implements ModuleRegistry, GradleDistribution } private File findExternalJar(String name) { - Pattern pattern = Pattern.compile(Pattern.quote(name) + "-\\d.+\\.jar"); + Pattern patternVersion = Pattern.compile(Pattern.quote(name) + "-\\d.+\\.jar"); + Pattern pattern = Pattern.compile(Pattern.quote(name) + ".jar"); for (File file : classpath) { - if (pattern.matcher(file.getName()).matches()) { + if (patternVersion.matcher(file.getName()).matches() + || pattern.matcher(file.getName()).matches()) { return file; } } for (File libDir : libDirs) { for (File file : libDir.listFiles()) { - if (pattern.matcher(file.getName()).matches()) { + if (patternVersion.matcher(file.getName()).matches() + || pattern.matcher(file.getName()).matches()) { return file; } } diff --git a/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java b/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java index a958cb7..d9a776f 100644 --- a/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java +++ b/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java @@ -30,7 +30,7 @@ public class ProfileReportRenderer { HtmlReportRenderer renderer = new HtmlReportRenderer(); renderer.requireResource(getClass().getResource("/org/gradle/reporting/base-style.css")); renderer.requireResource(getClass().getResource("/org/gradle/reporting/report.js")); - renderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc")); + //renderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc")); renderer.requireResource(getClass().getResource("style.css")); renderer.renderer(new ProfilePageRenderer()).writeTo(buildProfile, file); } diff --git a/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css b/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css index e09a387..89ee415 100644 --- a/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css +++ b/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css @@ -68,7 +68,7 @@ ul.tabLinks li { margin-right: 25px; border: solid 1px #d4d4d4; background-color: #f0f0f0; - behavior: url(css3-pie-1.0beta3.htc); + /*behavior: url(css3-pie-1.0beta3.htc);*/ } ul.tabLinks li:hover { diff --git a/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java b/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java index 13e0cd3..2854dfb 100644 --- a/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java +++ b/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java @@ -273,7 +273,7 @@ public class Matchers { } @Factory - public static Matcher<Task> dependsOn(final Matcher<? extends Iterable<String>> matcher) { + public static Matcher<Task> dependsOn(final Matcher matcher) { return new BaseMatcher<Task>() { public boolean matches(Object o) { Task task = (Task) o; @@ -303,7 +303,7 @@ public class Matchers { } @Factory - public static <T extends Buildable> Matcher<T> builtBy(final Matcher<? extends Iterable<String>> matcher) { + public static <T extends Buildable> Matcher<T> builtBy(final Matcher matcher) { return new BaseMatcher<T>() { public boolean matches(Object o) { Buildable task = (Buildable) o; diff --git a/subprojects/docs/docs.gradle b/subprojects/docs/docs.gradle index 87bba4f..d62ce26 100755 --- a/subprojects/docs/docs.gradle +++ b/subprojects/docs/docs.gradle @@ -25,7 +25,6 @@ import org.gradle.build.docs.releasenotes.checks.* import org.apache.tools.ant.filters.ReplaceTokens apply plugin: 'base' -apply plugin: 'pegdown' apply plugin: 'jsoup' apply plugin: 'javascript-base' @@ -43,22 +42,23 @@ repositories { } configurations { - userGuideStyleSheets + //userGuideStyleSheets userGuideTask jquery - fonts + //fonts } dependencies { - userGuideTask 'xalan:xalan:2.7.1', libraries.xerces - userGuideTask module('xhtmlrenderer:xhtmlrenderer:R8rc1') { + userGuideTask 'xalan:xalan2:2.7.1', 'xerces:xercesImpl:2.9.1' + userGuideTask module('xhtmlrenderer:core-renderer:R8rc1') { dependency 'itext:itext:2.0.8@jar' } userGuideTask 'xslthl:xslthl:2.0.1@jar' - userGuideStyleSheets 'docbook:docbook-xsl:1.75.2@zip' + //userGuideStyleSheets 'docbook:docbook-xsl:1.75.2@zip' jquery "jquery:jquery.min:1.8.0@js" + /* fonts \ "lato:regular:6:v0SdcGFAl2aezM9Vq_aFTQ@ttf", "lato:regular-italic:6:LqowQDslGv4DmUBAfWa2Vw@ttf", @@ -68,6 +68,7 @@ dependencies { "ubuntumono:regular-italic:3:KAKuHXAHZOeECOWAHsRKA-LrC4Du4e_yfTJ8Ol60xk0@ttf", "ubuntumono:bold:3:ceqTZGKHipo8pJj4molytp_TkvowlIOtbR7ePgFOpF4@ttf", "ubuntumono:bold-italic:3:n_d8tv_JOIiYyMXR4eaV9WsGzsqhEorxQDpu60nfWEc@ttf" + */ groovy libraries.groovy testCompile "org.pegdown:pegdown:1.1.0" @@ -97,11 +98,11 @@ outputs.distDocs = files(distDocsDir) { builtBy 'distDocs' } outputs.docs = files(docsDir) { - builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml', 'releaseNotes' + builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml' } tasks.withType(Docbook2Xhtml) { - dependsOn userguideStyleSheets + //dependsOn userguideStyleSheets classpath = configurations.userGuideTask stylesheetsDir = userguideStyleSheets.destinationDir } @@ -131,12 +132,12 @@ task configureCss << { [it.name, it.bytes.encodeBase64().toString()] } - def fonts = configurations.fonts.resolvedConfiguration.resolvedArtifacts.collectEntries { + /*def fonts = configurations.fonts.resolvedConfiguration.resolvedArtifacts.collectEntries { def id = it.moduleVersion.id ["${id.group}-${id.name}".toString(), it.file.bytes.encodeBase64().toString()] - } + }*/ - ext.tokens = images + fonts + ext.tokens = images // + fonts css.inputs.property 'tokens', tokens css.filter ReplaceTokens, tokens: tokens } @@ -176,10 +177,10 @@ task userguideStyleSheets(type: Copy) { include '*.xsl' } from(cssFiles) - from({ zipTree(configurations.userGuideStyleSheets.singleFile) }) { - // Remove the prefix - eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') } - } + //from({ zipTree(configurations.userGuideStyleSheets.singleFile) }) { + // // Remove the prefix + // eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') } + //} } task samplesDocbook(type: AssembleSamplesDocTask) { @@ -275,8 +276,10 @@ task userguidePdf(type: Xhtml2Pdf, dependsOn: pdfUserguideXhtml) { classpath = configurations.userGuideTask } -def javaApiUrl = "http://docs.oracle.com/javase/1.5.0/docs/api/"; -def groovyApiUrl = "http://groovy.codehaus.org/gapi/"; +//def javaApiUrl = "http://docs.oracle.com/javase/1.5.0/docs/api/"; +def javaApiUrl = "file:///usr/share/doc/default-jdk-doc/api" +//def groovyApiUrl = "http://groovy.codehaus.org/gapi/"; +def groovyApiUrl = "file:///usr/share/doc/groovy-doc/gapi/" task javadocAll(type: Javadoc) { ext.stylesheetFile = file("src/docs/css/javadoc.css") @@ -298,8 +301,7 @@ task javadocAll(type: Javadoc) { include 'org/gradle/testfixtures/**' include 'org/gradle/tooling/**' exclude '**/internal/**' - options.links(javaApiUrl, groovyApiUrl, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs";, - "http://maven.apache.org/ref/2.2.1/maven-model/apidocs";) + options.links(javaApiUrl, groovyApiUrl, "file:///usr/share/doc/libmaven2-core-java/api") doFirst { title = "Gradle API $version" } @@ -361,10 +363,10 @@ task userguide { group = 'documentation' } -import org.gradle.plugins.pegdown.PegDown +//import org.gradle.plugins.pegdown.PegDown import org.gradle.plugins.jsoup.Jsoup -task editReleaseNotes() { +/*task editReleaseNotes() { group = "release notes" doLast { Class.forName("java.awt.Desktop").newInstance().edit(file("src/docs/release/notes.md")) @@ -409,14 +411,14 @@ test { systemProperty "org.gradle.docs.releasenotes.source", releaseNotesMarkdown.source.singleFile systemProperty "org.gradle.docs.releasenotes.rendered", new File(releaseNotes.destinationDir, releaseNotes.fileName) -} +}*/ if (project.hasProperty('noDocsTests')) { gradle.startParameter.excludedTaskNames << test.path } task docs { - dependsOn javadocAll, groovydocAll, userguide, distDocs, samplesDocs, dslHtml, releaseNotes + dependsOn javadocAll, groovydocAll, userguide, distDocs, samplesDocs, dslHtml description = 'Generates all documentation' group = 'documentation' } diff --git a/subprojects/docs/src/docs/dsl/dsl.xml b/subprojects/docs/src/docs/dsl/dsl.xml index 3089f13..c071f3a 100644 --- a/subprojects/docs/src/docs/dsl/dsl.xml +++ b/subprojects/docs/src/docs/dsl/dsl.xml @@ -318,9 +318,11 @@ <tr> <td>org.gradle.plugins.signing.Sign</td> </tr> +<!-- <tr> <td>org.gradle.api.plugins.sonar.SonarAnalyze</td> </tr> +--> <tr> <td>org.gradle.api.tasks.Sync</td> </tr> @@ -427,4 +429,4 @@ </table> </section> -</book> \ No newline at end of file +</book> diff --git a/subprojects/docs/src/docs/stylesheets/dslHtml.xsl b/subprojects/docs/src/docs/stylesheets/dslHtml.xsl index b232faa..bb68681 100644 --- a/subprojects/docs/src/docs/stylesheets/dslHtml.xsl +++ b/subprojects/docs/src/docs/stylesheets/dslHtml.xsl @@ -14,7 +14,7 @@ ~ limitations under the License. --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="2.0"> - <xsl:import href="html/chunkfast.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunkfast.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> <xsl:output method="html" doctype-system="http://www.w3.org/TR/html4/strict.dtd"; @@ -209,4 +209,4 @@ <dt><xsl:apply-templates select="$segtitles[$segnum=position()]" mode="segtitle-in-seg"/>:</dt> <dd><xsl:apply-templates/></dd> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> diff --git a/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl b/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl index 53e75ae..f00edfc 100644 --- a/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl +++ b/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl @@ -17,7 +17,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:xi="http://www.w3.org/2001/XInclude"; version="1.0"> - <xsl:import href="html/docbook.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> <xsl:param name="section.autolabel">0</xsl:param> @@ -36,4 +36,4 @@ <xi:include href="userguide.css" parse="text"/> </style> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> diff --git a/subprojects/docs/src/docs/stylesheets/userGuideHtml.xsl b/subprojects/docs/src/docs/stylesheets/userGuideHtml.xsl index 98fe4e1..755adaf 100644 --- a/subprojects/docs/src/docs/stylesheets/userGuideHtml.xsl +++ b/subprojects/docs/src/docs/stylesheets/userGuideHtml.xsl @@ -15,7 +15,7 @@ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"> - <xsl:import href="html/chunkfast.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunkfast.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> <xsl:param name="root.filename">userguide</xsl:param> @@ -84,4 +84,4 @@ </div> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> diff --git a/subprojects/docs/src/docs/stylesheets/userGuideHtmlCommon.xsl b/subprojects/docs/src/docs/stylesheets/userGuideHtmlCommon.xsl index e8ea7e8..31f5c84 100644 --- a/subprojects/docs/src/docs/stylesheets/userGuideHtmlCommon.xsl +++ b/subprojects/docs/src/docs/stylesheets/userGuideHtmlCommon.xsl @@ -16,8 +16,8 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:xslthl="http://xslthl.sf.net"; version="1.0"> - <xsl:import href="highlighting/common.xsl"/> - <xsl:import href="html/highlight.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting/common.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/highlight.xsl"/> <xsl:output method="html" encoding="UTF-8" diff --git a/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl b/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl index 002ea21..7b10e8e 100644 --- a/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl +++ b/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl @@ -14,7 +14,7 @@ ~ limitations under the License. --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"> - <xsl:import href="xhtml/docbook.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/docbook.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> <xsl:output method="xml" @@ -59,4 +59,4 @@ <xsl:apply-templates select=".." mode="title.markup"/> </h1> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> diff --git a/subprojects/docs/src/docs/stylesheets/userGuideSingleHtml.xsl b/subprojects/docs/src/docs/stylesheets/userGuideSingleHtml.xsl index e09e7ce..886ddc4 100644 --- a/subprojects/docs/src/docs/stylesheets/userGuideSingleHtml.xsl +++ b/subprojects/docs/src/docs/stylesheets/userGuideSingleHtml.xsl @@ -15,6 +15,6 @@ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"> - <xsl:import href="html/docbook.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> diff --git a/subprojects/docs/src/docs/userguide/sonarPlugin.xml b/subprojects/docs/src/docs/userguide/sonarPlugin.xml index ce430bc..b911de6 100644 --- a/subprojects/docs/src/docs/userguide/sonarPlugin.xml +++ b/subprojects/docs/src/docs/userguide/sonarPlugin.xml @@ -147,9 +147,8 @@ <tr> <td><literal>sonarAnalyze</literal></td> <td>-</td> - <td><apilink class="org.gradle.api.plugins.sonar.SonarAnalyze"/></td> <td>Analyzes a project hierarchy and stores the results in the Sonar database.</td> </tr> </table> </section> -</chapter> \ No newline at end of file +</chapter> diff --git a/subprojects/docs/src/docs/userguide/userguide.xml b/subprojects/docs/src/docs/userguide/userguide.xml index 4b664b3..89c5598 100755 --- a/subprojects/docs/src/docs/userguide/userguide.xml +++ b/subprojects/docs/src/docs/userguide/userguide.xml @@ -60,7 +60,7 @@ <xi:include href='findBugsPlugin.xml'/> <xi:include href='jdependPlugin.xml'/> <xi:include href='pmdPlugin.xml'/> - <xi:include href='sonarPlugin.xml'/> +<!-- <xi:include href='sonarPlugin.xml'/> --> <xi:include href='osgi.xml'/> <xi:include href='eclipsePlugin.xml'/> <xi:include href='ideaPlugin.xml'/> diff --git a/subprojects/javascript/javascript.gradle b/subprojects/javascript/javascript.gradle index ce4823b..5eed172 100644 --- a/subprojects/javascript/javascript.gradle +++ b/subprojects/javascript/javascript.gradle @@ -17,9 +17,9 @@ dependencies { groovy libraries.groovy - compile "org.mozilla:rhino:1.7R3" + compile "org.mozilla:js:1.7R3" compile "com.google.code.gson:gson:2.2.1" // used by JsHint - compile "org.simpleframework:simple:4.1.21" // used by http package in envjs + //compile "org.simpleframework:simple:4.1.21" // used by http package in envjs compile project(':core'), project(":plugins") compile libraries.inject @@ -27,4 +27,6 @@ dependencies { compile project(':coreImpl') } +sourceSets.main.groovy.excludes = ['**/org/gradle/plugins/javascript/envjs/**'] + useTestFixtures() diff --git a/subprojects/jetty/jetty.gradle b/subprojects/jetty/jetty.gradle index 6f54116..f4ad01a 100644 --- a/subprojects/jetty/jetty.gradle +++ b/subprojects/jetty/jetty.gradle @@ -23,22 +23,22 @@ dependencies { compile libraries.jetty compile libraries.jetty_util compile libraries.servlet_api - compile module("org.mortbay.jetty:jetty-plus:6.1.25") { + compile module("org.mortbay.jetty:jetty-plus:6.x") { dependency libraries.jetty - module("org.mortbay.jetty:jetty-naming:6.1.25") { + module("org.mortbay.jetty:jetty-naming:6.x") { dependency libraries.jetty } } - runtime module("org.mortbay.jetty:jsp-2.1:6.1.14") { - dependency "org.eclipse.jdt:core:3.1.1@jar" - dependency "org.mortbay.jetty:jsp-api-2.1:6.1.14@jar" + runtime module("org.mortbay.jetty:jsp-api:2.1") { + dependency "org.eclipse.jdt:eclipse-ecj:3.1.1@jar" + dependency "org.mortbay.jetty:jsp-api-2.1:6.x@jar" dependency libraries.jetty_util dependency libraries.servlet_api } - runtime "org.mortbay.jetty:jetty-annotations:6.1.25@jar" - runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0@jar" + runtime "org.mortbay.jetty:jetty-annotations:6.x@jar" + //runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0@jar" } -useTestFixtures() \ No newline at end of file +useTestFixtures() diff --git a/subprojects/maven/maven.gradle b/subprojects/maven/maven.gradle index 0e62608..bcbc088 100644 --- a/subprojects/maven/maven.gradle +++ b/subprojects/maven/maven.gradle @@ -26,7 +26,7 @@ dependencies { compile libraries.maven_ant_tasks compile "org.sonatype.pmaven:pmaven-common:0.8-20100325@jar" compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325@jar" - compile "org.codehaus.plexus:plexus-component-annotations:1.5.2@jar" + compile "org.codehaus.plexus:plexus-component-annotations-1.5:debian@jar" } useTestFixtures() diff --git a/subprojects/native/native.gradle b/subprojects/native/native.gradle index 04f1ac8..addacf3 100755 --- a/subprojects/native/native.gradle +++ b/subprojects/native/native.gradle @@ -9,10 +9,13 @@ dependencies { compile libraries.slf4j_api compile libraries.jna compile libraries.nativePlatform - compile module('org.jruby.ext.posix:jna-posix:1.0.3') { + compile module('org.jruby.ext.posix:jnr-posix:debian') { dependency libraries.jna } - compile module('org.fusesource.jansi:jansi:1.2.1') { + compile 'org.jruby.extras:constantine:debian' + compile 'org.jruby.extras:jaffl:debian' + compile 'org.jruby.extras:jffi:debian' + compile module('org.fusesource.jansi:jansi:debian') { dependency libraries.jna } compile libraries.guava diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java index 40e36d8..f2ca612 100644 --- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java +++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java @@ -23,8 +23,6 @@ import org.gradle.internal.nativeplatform.jna.LibC; import org.gradle.internal.os.OperatingSystem; import org.gradle.internal.service.DefaultServiceRegistry; import org.gradle.internal.service.ServiceRegistry; -import org.jruby.ext.posix.BaseNativePOSIX; -import org.jruby.ext.posix.JavaPOSIX; import org.jruby.ext.posix.POSIX; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +59,7 @@ public class FileSystemServices { if (libC != null && (operatingSystem.isLinux() || operatingSystem.isMacOsX())) { FilePathEncoder filePathEncoder = createEncoder(libC); serviceRegistry.add(Chmod.class, new LibcChmod(libC, filePathEncoder)); - serviceRegistry.add(Stat.class, new LibCStat(libC, operatingSystem, (BaseNativePOSIX) PosixUtil.current(), filePathEncoder)); + serviceRegistry.add(Stat.class, new LibCStat(libC, operatingSystem, PosixUtil.current(), filePathEncoder)); return; } @@ -95,7 +93,7 @@ public class FileSystemServices { private static Stat createStat() { POSIX posix = PosixUtil.current(); - if (posix instanceof JavaPOSIX) { + if (posix.getClass().toString().equals("org.jruby.ext.posix.JavaPOSIX")) { return new FallbackStat(); } else { return new PosixStat(posix); diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java index a9ad76c..b342ef2 100644 --- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java +++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java @@ -18,9 +18,8 @@ package org.gradle.internal.nativeplatform.filesystem; import org.gradle.internal.nativeplatform.jna.LibC; import org.gradle.internal.os.OperatingSystem; -import org.jruby.ext.posix.BaseNativePOSIX; import org.jruby.ext.posix.FileStat; -import org.jruby.ext.posix.Linux64FileStat; +import org.jruby.ext.posix.POSIX; import java.io.File; import java.io.IOException; @@ -29,9 +28,9 @@ class LibCStat implements Stat { private final LibC libc; private final FilePathEncoder encoder; private final OperatingSystem operatingSystem; - private final BaseNativePOSIX nativePOSIX; + private final POSIX nativePOSIX; - public LibCStat(LibC libc, OperatingSystem operatingSystem, BaseNativePOSIX nativePOSIX, FilePathEncoder encoder) { + public LibCStat(LibC libc, OperatingSystem operatingSystem, POSIX nativePOSIX, FilePathEncoder encoder) { this.libc = libc; this.operatingSystem = operatingSystem; this.nativePOSIX = nativePOSIX; @@ -39,17 +38,7 @@ class LibCStat implements Stat { } public int getUnixMode(File f) throws IOException { - FileStat stat = nativePOSIX.allocateStat(); - initPlatformSpecificStat(stat, encoder.encode(f)); + FileStat stat = nativePOSIX.stat(new String(encoder.encode(f))); return stat.mode() & 0777; } - - private void initPlatformSpecificStat(FileStat stat, byte[] encodedFilePath) { - if (operatingSystem.isMacOsX()) { - libc.stat(encodedFilePath, stat); - } else { - final int statVersion = stat instanceof Linux64FileStat ? 3 : 0; - libc.__xstat64(statVersion, encodedFilePath, stat); - } - } } diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java index 7d236b3..4eb49b2 100644 --- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java +++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java @@ -20,6 +20,8 @@ import org.jruby.ext.posix.POSIX; import org.jruby.ext.posix.POSIXFactory; import org.jruby.ext.posix.POSIXHandler; +import com.kenai.constantine.platform.Errno; + import java.io.File; import java.io.InputStream; import java.io.PrintStream; @@ -32,7 +34,7 @@ public class PosixUtil { } private static class POSIXHandlerImpl implements POSIXHandler { - public void error(POSIX.ERRORS error, String message) { + public void error(Errno error, String message) { throw new UnsupportedOperationException(error + " - " + message); } diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java index 8b486f4..f8c444e 100644 --- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java +++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java @@ -39,9 +39,17 @@ public class JnaBootPathConfigurer { */ public void configure(File storageDir) { String nativePrefix = OperatingSystem.current().getNativePrefix(); - File tmpDir = new File(storageDir, String.format("jna/%s", nativePrefix)); - tmpDir.mkdirs(); + File tmpDir = new File(storageDir, "jni/"); String jnaLibName = OperatingSystem.current().isMacOsX() ? "libjnidispatch.jnilib" : System.mapLibraryName("jnidispatch"); + + // Try to load /usr/lib/jni/jnidispatch.so first before storageDir + File usrDir = new File("/usr/lib/jni/"); + File usrLibFile = new File(usrDir, jnaLibName); + if (usrLibFile.isFile()) { + System.setProperty("jna.boot.library.path", usrDir.getAbsolutePath()); + return; + } + File libFile = new File(tmpDir, jnaLibName); if (!libFile.exists()) { String resourceName = "/com/sun/jna/" + nativePrefix + "/" + jnaLibName; diff --git a/subprojects/osgi/osgi.gradle b/subprojects/osgi/osgi.gradle index 57d7c1f..e1a1d22 100644 --- a/subprojects/osgi/osgi.gradle +++ b/subprojects/osgi/osgi.gradle @@ -21,7 +21,7 @@ dependencies { compile project(':plugins') compile libraries.slf4j_api - compile module('biz.aQute:bndlib:1.50.0') + compile module('biz.aQute:bndlib:debian') } useTestFixtures() diff --git a/subprojects/performance/performance.gradle b/subprojects/performance/performance.gradle index 62ed02b..4d95938 100644 --- a/subprojects/performance/performance.gradle +++ b/subprojects/performance/performance.gradle @@ -8,7 +8,7 @@ configurations { dependencies { junit 'junit:junit:4.11' groovy libraries.groovy - testFixturesCompile project(':internalIntegTesting') + //testFixturesCompile project(':internalIntegTesting') plugin gradleApi() } diff --git a/subprojects/plugins/plugins.gradle b/subprojects/plugins/plugins.gradle index b163af0..45caf16 100644 --- a/subprojects/plugins/plugins.gradle +++ b/subprojects/plugins/plugins.gradle @@ -38,7 +38,7 @@ dependencies { compile libraries.commons_lang compile libraries.junit compile libraries.slf4j_api - compile 'org.testng:testng:6.3.1' + compile 'org.testng:testng:5.11@jar' provided files(jvm.toolsJar) // for SunJavaCompiler diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java index 918cb86..d706af9 100644 --- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java +++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java @@ -37,7 +37,7 @@ public class DefaultTestReport implements TestReporter { public DefaultTestReport() { htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/report.js")); htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/base-style.css")); - htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc")); + //htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc")); htmlRenderer.requireResource(getClass().getResource("style.css")); } diff --git a/subprojects/plugins/src/main/resources/org/gradle/api/internal/tasks/testing/junit/report/style.css b/subprojects/plugins/src/main/resources/org/gradle/api/internal/tasks/testing/junit/report/style.css index 2440a1f..c558310 100644 --- a/subprojects/plugins/src/main/resources/org/gradle/api/internal/tasks/testing/junit/report/style.css +++ b/subprojects/plugins/src/main/resources/org/gradle/api/internal/tasks/testing/junit/report/style.css @@ -41,7 +41,7 @@ border: solid 2px #d0d0d0; -moz-border-radius: 10px; border-radius: 10px; - behavior: url(css3-pie-1.0beta3.htc); + /*behavior: url(css3-pie-1.0beta3.htc);*/ } #successRate { diff --git a/subprojects/scala/scala.gradle b/subprojects/scala/scala.gradle index ad6e0ce..d8991e1 100644 --- a/subprojects/scala/scala.gradle +++ b/subprojects/scala/scala.gradle @@ -23,11 +23,14 @@ dependencies { compile project(":plugins") // keep in sync with ScalaBasePlugin code - provided("com.typesafe.zinc:zinc:0.2.0") + // provided("com.typesafe.zinc:zinc:0.2.0") testCompile libraries.slf4j_api } +// No Zinc compiler +sourceSets.main.groovy.excludes = ['**/org/gradle/api/internal/tasks/scala/jdk6/**'] + useTestFixtures(project: ":plugins") // includes core test fixtures if (!javaVersion.java6Compatible) { diff --git a/subprojects/scala/src/main/groovy/org/gradle/api/plugins/scala/ScalaBasePlugin.groovy b/subprojects/scala/src/main/groovy/org/gradle/api/plugins/scala/ScalaBasePlugin.groovy index 1dd6118..d56b825 100644 --- a/subprojects/scala/src/main/groovy/org/gradle/api/plugins/scala/ScalaBasePlugin.groovy +++ b/subprojects/scala/src/main/groovy/org/gradle/api/plugins/scala/ScalaBasePlugin.groovy @@ -119,11 +119,11 @@ class ScalaBasePlugin implements Plugin<Project> { compile.conventionMapping.scalaClasspath = { getScalaClasspath(compile.classpath) } compile.conventionMapping.zincClasspath = { def config = project.configurations[ZINC_CONFIGURATION_NAME] - if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) { - project.dependencies { - zinc("com.typesafe.zinc:zinc:$DEFAULT_ZINC_VERSION") - } - } + //if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) { + // project.dependencies { + // zinc("com.typesafe.zinc:zinc:$DEFAULT_ZINC_VERSION") + // } + //} config } } @@ -159,4 +159,4 @@ class ScalaBasePlugin implements Plugin<Project> { } null } -} \ No newline at end of file +} diff --git a/subprojects/signing/signing.gradle b/subprojects/signing/signing.gradle index dd4ae7f..055c36d 100644 --- a/subprojects/signing/signing.gradle +++ b/subprojects/signing/signing.gradle @@ -21,9 +21,9 @@ dependencies { compile project(":plugins") compile project(":maven") - compile module("org.bouncycastle:bcpg-jdk15:1.46") { - dependency "org.bouncycastle:bcprov-jdk15:1.46@jar" + compile module("org.bouncycastle:bcpg:debian") { + dependency "org.bouncycastle:bcprov:debian@jar" } } -useTestFixtures() \ No newline at end of file +useTestFixtures() -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
