[SCM] Gradle: Groovy based build system branch, master, updated. debian/1.0_m3-1-5-gec4b313
Miguel Landaeta
miguel at miguel.cc
Tue Jul 3 00:10:36 UTC 2012
The following commit has been merged in the master branch:
commit 13263dc751f4a5e35b8fcf7a4af60e99b2fda4c8
Author: Miguel Landaeta <miguel at miguel.cc>
Date: Mon Jul 2 20:21:06 2012 -0430
Unapply 1.0~m3-1 patches
diff --git a/build.gradle b/build.gradle
index 101c3c0..a2913e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,6 @@ import org.gradle.build.Install
import org.gradle.build.Git
import java.util.jar.Attributes
import org.gradle.api.internal.artifacts.dependencies.DefaultSelfResolvingDependency
-import org.apache.ivy.plugins.resolver.FileSystemResolver
/**
* For building Gradle you usually don't need to specify any properties. Only certain functionality of the Gradle requires
@@ -48,25 +47,22 @@ libraries = [
ant_launcher: 'org.apache.ant:ant-launcher:1.8.2 at jar',
ant_antlr: 'org.apache.ant:ant-antlr:1.8.2 at jar',
antlr: 'antlr:antlr:2.7.7 at jar',
- asm_all: 'asm:asm3-all:3.2 at jar',
+ asm_all: 'asm:asm-all:3.3.1 at jar',
commons_cli: 'commons-cli:commons-cli:1.2 at jar',
commons_io: 'commons-io:commons-io:1.4 at jar',
- commons_lang: 'commons-lang:commons-lang:2.4 at jar',
+ commons_lang: 'commons-lang:commons-lang:2.6 at jar',
dom4j: 'dom4j:dom4j:1.6.1 at jar',
- // Guava is a super set of Google Collections library,
- // it can be used until Guava is packaged
- //guava: 'com.google.guava:guava:r08 at jar',
- guava: 'com.google.guava:google-collections:1.0 at jar',
+ guava: 'com.google.guava:guava:r08 at jar',
groovy: 'org.codehaus.groovy:groovy-all:1.7.10 at jar',
ivy: 'org.apache.ivy:ivy:2.2.0 at jar',
- jaxen: 'jaxen:jaxen:1.1.2 at jar',
+ jaxen: 'jaxen:jaxen:1.1 at jar',
slf4j_api: 'org.slf4j:slf4j-api:1.6.1 at jar',
jcl_to_slf4j: 'org.slf4j:jcl-over-slf4j:1.6.1 at jar',
jul_to_slf4j: 'org.slf4j:jul-to-slf4j:1.6.1 at jar',
log4j_to_slf4j: 'org.slf4j:log4j-over-slf4j:1.6.1 at jar',
logback_classic: 'ch.qos.logback:logback-classic:0.9.28 at jar',
logback_core: 'ch.qos.logback:logback-core:0.9.28 at jar',
- junit: 'junit:junit4:4.8.2',
+ junit: 'junit:junit:4.8.2',
xmlunit: 'xmlunit:xmlunit:1.3',
]
@@ -83,9 +79,9 @@ libraries.jmock = ['org.jmock:jmock:2.5.1 at jar',
'org.objenesis:objenesis:1.2',
'cglib:cglib-nodep:2.2']
libraries.groovy_depends = [libraries.groovy, libraries.commons_cli]
-libraries.jetty_depends = ["org.mortbay.jetty:jetty:6.1.24 at jar",
- "org.mortbay.jetty:jetty-util:6.1.24 at jar",
- "javax.servlet:servlet-api:2.5 at jar"]
+libraries.jetty_depends = ["org.mortbay.jetty:jetty:6.1.25 at jar",
+ "org.mortbay.jetty:jetty-util:6.1.25 at jar",
+ "org.mortbay.jetty:servlet-api:2.5-20081211 at jar"]
allprojects {
group = 'org.gradle'
@@ -96,12 +92,7 @@ allprojects {
}
repositories {
- //mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
- add(new FileSystemResolver()) {
- name = 'repo'
- addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
- addArtifactPattern "/usr/share/java/[module].[ext]"
- }
+ mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
}
version = this.version
@@ -122,20 +113,10 @@ configure(groovyProjects()) {
}
tasks.withType(Jar).each { jar ->
- // Set missing Class-Path in jars
- if (jar.getArchiveName() ==~ /^gradle-core-[0-9].*/) {
- jar.manifest.mainAttributes([
- (Attributes.Name.IMPLEMENTATION_TITLE.toString()): 'Gradle',
- (Attributes.Name.IMPLEMENTATION_VERSION.toString()): version,
- (Attributes.Name.CLASS_PATH.toString()): 'logback-core.jar logback-classic.jar google-collections.jar joptsimple.jar commons-collections3.jar commons-httpclient.jar commons-io.jar commons-lang.jar jansi.jar asm3-all.jar jcl-over-slf4j.jar log4j-over-slf4j.jar slf4j-log4j12.jar jul-to-slf4j.jar maven-ant-tasks.jar maven-artifact-manager.jar maven-artifact.jar maven-model.jar maven-project.jar plexus-component-api.jar plexus-utils.jar libplexus-utils.jar',
- ])
- } else {
- jar.manifest.mainAttributes([
- (Attributes.Name.IMPLEMENTATION_TITLE.toString()): 'Gradle',
- (Attributes.Name.IMPLEMENTATION_VERSION.toString()): version,
- (Attributes.Name.CLASS_PATH.toString()): 'grails-core.jar',
- ])
- }
+ jar.manifest.mainAttributes([
+ (Attributes.Name.IMPLEMENTATION_TITLE.toString()): 'Gradle',
+ (Attributes.Name.IMPLEMENTATION_VERSION.toString()): version,
+ ])
}
}
@@ -406,7 +387,7 @@ binDistImage = copySpec {
from('src/toplevel') {
expand(version: version)
}
- //from project(':docs').distDocs.destFile
+ from project(':docs').distDocs.destFile
into('bin') {
from startScriptsDir
fileMode = 0755
@@ -435,16 +416,14 @@ allDistImage = copySpec {
}
}
-//task allZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs', 'docs:samples']) {
-task allZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs']) {
+task allZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs', 'docs:samples']) {
classifier = 'all'
into(zipRootFolder) {
with allDistImage
}
}
-//task binZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:distDocs']) {
-task binZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs']) {
+task binZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:distDocs']) {
classifier = 'bin'
into(zipRootFolder) {
with binDistImage
@@ -510,8 +489,7 @@ def guessMaxForks() {
task testedDists(dependsOn: [assemble, check, integTests])
-//task nightlyBuild(dependsOn: [clean, testedDists, ':docs:uploadDocs'])
-task nightlyBuild(dependsOn: [clean, testedDists])
+task nightlyBuild(dependsOn: [clean, testedDists, ':docs:uploadDocs'])
task install(type: Install) {
description = 'Installs the minimal distribution into directory $gradle_installPath'
@@ -595,8 +573,7 @@ task releaseArtifacts {
task release {
description = 'Builds, tests and uploads the release artifacts'
group = 'release'
- //dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadArchives, uploadDists, ':docs:uploadDocs'
- dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadArchives, uploadDists
+ dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadArchives, uploadDists, ':docs:uploadDocs'
}
task wrapper(type: Wrapper) {
@@ -616,8 +593,7 @@ def runtimeProjects() {
}
def pluginProjects() {
- //['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala', 'sonar'].collect {
- ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala'].collect {
+ ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala', 'sonar'].collect {
project(it)
}
}
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 73d6fa6..1fff211 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -13,39 +13,23 @@
* 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: 'code-quality'
+apply plugin: 'code-quality'
apply plugin: 'idea'
apply plugin: 'eclipse'
repositories {
- //mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
- add(new FileSystemResolver()) {
- name = 'repo'
- addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
- addArtifactPattern "/usr/share/java/[module].[ext]"
- }
+ mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
}
dependencies {
compile gradleApi()
compile 'com.google.collections:google-collections:1.0 at jar'
groovy localGroovy()
- testCompile 'junit:junit4:4.8.2 at jar'
- //testCompile 'org.spockframework:spock-core:0.5-groovy-1.7 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
+ testCompile 'junit:junit:4.8.2 at jar'
+ testCompile 'org.spockframework:spock-core:0.5-groovy-1.7 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
}
-// All tests for this subproject are disabled because they depend on Spock
-// Framework and that software is not available in Debian yet.
-compileTestGroovy {
- exclude '**'
-}
-
-test {
- testReport = false
-}
-
-//apply from: '../gradle/compile.gradle'
-//apply from: '../gradle/codeQuality.gradle'
+apply from: '../gradle/compile.gradle'
+apply from: '../gradle/codeQuality.gradle'
diff --git a/buildSrc/src/main/groovy/org/gradle/build/Version.groovy b/buildSrc/src/main/groovy/org/gradle/build/Version.groovy
index 5398bb1..5631deb 100644
--- a/buildSrc/src/main/groovy/org/gradle/build/Version.groovy
+++ b/buildSrc/src/main/groovy/org/gradle/build/Version.groovy
@@ -48,7 +48,7 @@ class Version {
if (graph.hasTask(':releaseVersion')) {
release = true
} else {
- //this.versionNumber += "-" + getTimestamp()
+ this.versionNumber += "-" + getTimestamp()
release = false
}
}
diff --git a/settings.gradle b/settings.gradle
index f04b5d9..e5cc1ba 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,7 +31,7 @@ include 'openApi'
include 'toolingApi'
include 'docs'
include 'integTest'
-//include 'sonar'
+include 'sonar'
rootProject.name = 'gradle'
rootProject.children.each {project ->
diff --git a/subprojects/code-quality/code-quality.gradle b/subprojects/code-quality/code-quality.gradle
index c83764d..833e67b 100644
--- a/subprojects/code-quality/code-quality.gradle
+++ b/subprojects/code-quality/code-quality.gradle
@@ -30,7 +30,7 @@ dependencies {
runtime "com.puppycrawl.tools:checkstyle:5.3 at jar",
libraries.guava,
libraries.antlr,
- "commons-beanutils:commons-beanutils:1.8.3 at jar"
+ "commons-beanutils:commons-beanutils-core:1.8.3 at jar"
testCompile project(path: ':core', configuration: 'testFixtures')
testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
diff --git a/subprojects/core-impl/core-impl.gradle b/subprojects/core-impl/core-impl.gradle
index 86d0def..b810424 100644
--- a/subprojects/core-impl/core-impl.gradle
+++ b/subprojects/core-impl/core-impl.gradle
@@ -8,21 +8,10 @@ dependencies {
compile libraries.commons_lang
compile libraries.ivy
compile "org.apache.maven:maven-ant-tasks:2.1.1 at jar"
- //compile "org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar"
- //compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
- //compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
- compile "org.codehaus.plexus:plexus-component-annotations:1.0-beta-3.0.7 at jar"
- compile "org.codehaus.plexus:plexus-component-api:1.0-alpha-22 at jar"
- compile "org.codehaus.plexus:plexus-utils:1.5.15 at jar"
- compile "org.apache.maven:maven-model:2.2.1 at jar"
- compile "org.apache.maven:maven-settings:2.2.1 at jar"
- compile "org.apache.maven:maven-project:2.2.1 at jar"
- compile "org.apache.maven:maven-artifact:2.2.1 at jar"
- compile "org.apache.maven:maven-artifact-manager:2.2.1 at jar"
- compile "org.apache.maven:maven-settings:2.2.1 at jar"
- compile "org.apache.maven.wagon:wagon-provider-api:1.0-beta-6 at jar"
-
+ compile "org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar"
+ compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
+ compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
testCompile libraries.junit
testCompile project(path: ':core', configuration: 'testFixtures')
-}
+}
\ No newline at end of file
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java
index ee50e93..8c9ad18 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java
@@ -19,11 +19,9 @@ import groovy.util.FactoryBuilderSupport;
import org.apache.maven.model.Model;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.slf4j.LoggerFactory;
-/*
import org.sonatype.maven.polyglot.execute.ExecuteManager;
import org.sonatype.maven.polyglot.execute.ExecuteManagerImpl;
import org.sonatype.maven.polyglot.groovy.builder.ModelBuilder;
-*/
import java.lang.reflect.Field;
import java.util.Map;
@@ -31,11 +29,9 @@ import java.util.Map;
/**
* This is a slightly modified version as shipped with polyglot Maven.
*/
-//public class CustomModelBuilder extends ModelBuilder {
-public class CustomModelBuilder {
+public class CustomModelBuilder extends ModelBuilder {
public CustomModelBuilder(Model model) {
- /*
ExecuteManager executeManager = new ExecuteManagerImpl();
setProp(executeManager.getClass(), executeManager, "log",
new PlexusLoggerAdapter(LoggerFactory.getLogger(ExecuteManagerImpl.class)));
@@ -51,8 +47,6 @@ public class CustomModelBuilder {
factories.remove("project");
ModelFactory modelFactory = new ModelFactory(model);
registerFactory(modelFactory.getName(), null, modelFactory);
- */
- throw new UnsupportedOperationException("CustomModelBuilder");
}
public static void setProp(Class c, Object obj, String fieldName, Object value) {
@@ -84,4 +78,4 @@ public class CustomModelBuilder {
throw new RuntimeException(e);
}
}
-}
+}
\ No newline at end of file
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java
index 6a6cfbc..49b0f10 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java
@@ -17,31 +17,27 @@ package org.gradle.api.internal.artifacts.publish.maven.pombuilder;
import groovy.util.FactoryBuilderSupport;
import org.apache.maven.model.Model;
-//import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory;
+import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory;
import java.util.Map;
/**
* This is a slightly modified version as shipped with polyglot Maven.
*/
-//public class ModelFactory extends NamedFactory {
-public class ModelFactory {
+public class ModelFactory extends NamedFactory {
private Model model;
public ModelFactory(Model model) {
- /*
super("project");
this.model = model;
- */
- throw new UnsupportedOperationException("ModelFactory");
}
public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attrs) throws InstantiationException, IllegalAccessException {
return model;
}
- //@Override
+ @Override
public void onNodeCompleted(FactoryBuilderSupport builder, Object parent, Object node) {
Model model = (Model)node;
}
-}
+}
\ No newline at end of file
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java
index 0cabd69..26dbb71 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java
@@ -98,8 +98,4 @@ 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 4260cbd..caba001 100644
--- a/subprojects/core/core.gradle
+++ b/subprojects/core/core.gradle
@@ -36,7 +36,7 @@ configurations {
dependencies {
groovy libraries.groovy_depends
- compile "commons-httpclient:commons-httpclient:3.1 at jar", "commons-codec:commons-codec:1.5 at jar", libraries.jcl_to_slf4j
+ compile "commons-httpclient:commons-httpclient:3.0 at jar", "commons-codec:commons-codec:1.2 at jar", libraries.jcl_to_slf4j
compile libraries.ivy, "com.jcraft:jsch:0.1.42 at jar", 'com.jcraft:jzlib:1.0.7 at jar'
@@ -48,15 +48,15 @@ dependencies {
libraries.jul_to_slf4j,
libraries.commons_io,
libraries.commons_lang,
- "commons-codec:commons-codec:1.5 at jar",
+ "commons-codec:commons-codec:1.2 at jar",
libraries.guava,
- "commons-collections:commons-collections3:3.2.1 at jar",
- //"slide:webdavlib:2.0 at jar",
+ "commons-collections:commons-collections:3.2.1 at jar",
+ "slide:webdavlib:2.0 at jar",
libraries.asm_all,
- 'org.fusesource.jansi:jansi:1.4',
- 'org.jruby.ext.posix:jna-posix:1.0.1'
+ 'org.fusesource.jansi:jansi:1.2.1',
+ 'org.jruby.ext.posix:jna-posix:1.0.3'
- runtime 'net.java.dev.jna:jna:3.2.7'
+ runtime 'net.java.dev.jna:jna:3.2.2'
runtime libraries.log4j_to_slf4j, libraries.jcl_to_slf4j
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java
index 3656601..3873844 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java
@@ -63,8 +63,7 @@ public abstract class AbstractClassPathProvider implements ClassPathProvider, Gr
protected static List<Pattern> toPatterns(String... patternStrings) {
List<Pattern> patterns = new ArrayList<Pattern>();
for (String patternString : patternStrings) {
- //patterns.add(Pattern.compile(patternString + "-.+"));
- patterns.add(Pattern.compile(patternString + "-?.*"));
+ patterns.add(Pattern.compile(patternString + "-.+"));
}
return patterns;
}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java
index 67ad723..d395a96 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java
@@ -17,6 +17,7 @@ package org.gradle.api.internal.artifacts.repositories;
import org.apache.commons.httpclient.HttpsURL;
import org.apache.ivy.plugins.repository.url.URLRepository;
+import org.apache.webdav.lib.WebdavResource;
import java.io.File;
import java.io.IOException;
@@ -51,12 +52,9 @@ public class WebdavRepository extends URLRepository {
String destinationFileName = destination.substring(fileNameStart + 1);
HttpsURL hrl = new HttpsURL(baseUrl);
hrl.setUserinfo(user, userPassword);
- /*
WebdavResource wdr = new WebdavResource(hrl);
wdr.putMethod(wdr.getPath() + '/' + destinationFileName, source);
wdr.close();
- */
- throw new UnsupportedOperationException("put");
}
// Alternative implementation with httpclient only. Unfortunately this is slower.
diff --git a/subprojects/core/src/main/groovy/org/gradle/logging/LoggingServiceRegistry.java b/subprojects/core/src/main/groovy/org/gradle/logging/LoggingServiceRegistry.java
index 7db7309..04f5578 100644
--- a/subprojects/core/src/main/groovy/org/gradle/logging/LoggingServiceRegistry.java
+++ b/subprojects/core/src/main/groovy/org/gradle/logging/LoggingServiceRegistry.java
@@ -107,8 +107,7 @@ public class LoggingServiceRegistry extends DefaultServiceRegistry {
protected OutputEventRenderer createOutputEventRenderer() {
Spec<FileDescriptor> terminalDetector;
if (detectConsole) {
- //terminalDetector = new TerminalDetector(StartParameter.DEFAULT_GRADLE_USER_HOME);
- terminalDetector = new TerminalDetector(new java.io.File("/usr/lib"));
+ terminalDetector = new TerminalDetector(StartParameter.DEFAULT_GRADLE_USER_HOME);
} else {
terminalDetector = Specs.satisfyNone();
}
diff --git a/subprojects/core/src/main/groovy/org/gradle/logging/internal/TerminalDetector.java b/subprojects/core/src/main/groovy/org/gradle/logging/internal/TerminalDetector.java
index 24d7b99..62fa544 100644
--- a/subprojects/core/src/main/groovy/org/gradle/logging/internal/TerminalDetector.java
+++ b/subprojects/core/src/main/groovy/org/gradle/logging/internal/TerminalDetector.java
@@ -29,9 +29,8 @@ import java.io.*;
public class TerminalDetector implements Spec<FileDescriptor> {
public TerminalDetector(File libCacheDir) {
// Some hackery to prevent JNA from creating a shared lib in the tmp dir, as it does not clean things up
- //File tmpDir = new File(libCacheDir, "jna");
- File tmpDir = new File(libCacheDir, "jni");
- //tmpDir.mkdirs();
+ File tmpDir = new File(libCacheDir, "jna");
+ tmpDir.mkdirs();
String libName = System.mapLibraryName("jnidispatch");
File libFile = new File(tmpDir, libName);
if (!libFile.exists()) {
diff --git a/subprojects/docs/docs.gradle b/subprojects/docs/docs.gradle
index 60cd1f8..4042c52 100644
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
@@ -28,7 +28,6 @@ configurations {
userGuideTask
}
-/*
dependencies {
userGuideTask 'xalan:xalan:2.7.1', 'xerces:xercesImpl:2.9.1'
userGuideTask module('xhtmlrenderer:xhtmlrenderer:R8rc1') {
@@ -38,7 +37,6 @@ dependencies {
userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
}
-*/
RemoteLocations remoteLocations = new RemoteLocations(version: version)
@@ -96,10 +94,10 @@ task userguideStyleSheets(type: Copy) {
from(cssSrcDir) {
include '*.css'
}
- //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) {
@@ -238,9 +236,8 @@ task javadoc(type: Javadoc) {
include 'org/gradle/testfixtures/**'
include 'org/gradle/tooling/**'
exclude '**/internal/**'
- //options.links("http://download.oracle.com/javase/1.5.0/docs/api", "http://groovy.codehaus.org/gapi/", "http://maven.apache.org/ref/2.2.1/maven-core/apidocs",
- // "http://maven.apache.org/ref/2.2.1/maven-model/apidocs")
- options.links("file:///usr/share/doc/default-jdk-doc/api", "file:///usr/share/doc/groovy-doc/gapi/", "file:///usr/share/doc/libmaven2-core-java/api")
+ options.links("http://download.oracle.com/javase/1.5.0/docs/api", "http://groovy.codehaus.org/gapi/", "http://maven.apache.org/ref/2.2.1/maven-core/apidocs",
+ "http://maven.apache.org/ref/2.2.1/maven-model/apidocs")
doFirst {
title = "Gradle API $version"
}
@@ -335,8 +332,7 @@ task userguide {
}
task docs {
- //dependsOn javadoc, groovydoc, userguide, distDocs, samplesDocs, dslHtml
- dependsOn javadoc, groovydoc
+ dependsOn javadoc, groovydoc, userguide, distDocs, samplesDocs, dslHtml
description = 'Generates all documentation'
group = 'documentation'
}
diff --git a/subprojects/jetty/jetty.gradle b/subprojects/jetty/jetty.gradle
index c964948..6b72d0c 100644
--- a/subprojects/jetty/jetty.gradle
+++ b/subprojects/jetty/jetty.gradle
@@ -21,12 +21,14 @@ dependencies {
compile libraries.slf4j_api,
libraries.jetty_depends,
- "org.mortbay.jetty:jetty-plus:6.1.24 at jar"
+ "org.mortbay.jetty:jetty-plus:6.1.25 at jar"
- runtime "org.mortbay.jetty:jsp-api:2.1 at jar",
- "org.mortbay.jetty:jetty-naming:6.1.24 at jar",
- "org.mortbay.jetty:jetty-annotations:6.1.24 at jar"
- "javax.annotations:annotations-api:6.0.32 at jar"
+ runtime "org.mortbay.jetty:jsp-api-2.1:6.1.14 at jar",
+ "org.mortbay.jetty:jsp-2.1:6.1.14 at jar",
+ "org.eclipse.jdt:core:3.1.1 at jar",
+ "org.mortbay.jetty:jetty-naming:6.1.25 at jar",
+ "org.mortbay.jetty:jetty-annotations:6.1.25 at jar",
+ "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
testCompile project(path: ':core', configuration: 'testFixtures')
testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
diff --git a/subprojects/osgi/osgi.gradle b/subprojects/osgi/osgi.gradle
index b35f576..8bb9536 100644
--- a/subprojects/osgi/osgi.gradle
+++ b/subprojects/osgi/osgi.gradle
@@ -21,7 +21,7 @@ dependencies {
compile project(':plugins')
compile libraries.slf4j_api
- compile 'biz.aQute:bnd:0.0.384 at jar'
+ compile 'biz.aQute:bndlib:1.15.0 at jar'
testCompile project(path: ':core', configuration: 'testFixtures')
testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
diff --git a/subprojects/plugins/plugins.gradle b/subprojects/plugins/plugins.gradle
index 0fc222d..e61774e 100644
--- a/subprojects/plugins/plugins.gradle
+++ b/subprojects/plugins/plugins.gradle
@@ -31,9 +31,9 @@ dependencies {
libraries.asm_all,
libraries.junit,
libraries.ant,
- 'org.testng:testng:5.11'
+ 'org.testng:testng:5.14.10'
- //reports 'css3-pie:css3-pie:1.0beta3'
+ reports 'css3-pie:css3-pie:1.0beta3'
testCompile libraries.xmlunit, 'net.sourceforge.nekohtml:nekohtml:1.9.14'
testCompile project(path: ':core', configuration: 'testFixtures')
--
Gradle: Groovy based build system
More information about the pkg-java-commits
mailing list