[gradle-1.12] 25/211: Unapply 0.9.2-1 patches
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Jul 1 14:17:54 UTC 2015
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 8794484f1e8197a5a72ac7737bcd33da1e3c3f30
Author: Miguel Landaeta <miguel at miguel.cc>
Date: Sun May 1 22:54:39 2011 -0430
Unapply 0.9.2-1 patches
---
build.gradle | 52 +++++++++-------------
buildSrc/build.gradle | 21 +++------
.../main/groovy/org/gradle/build/Version.groovy | 2 +-
subprojects/code-quality/code-quality.gradle | 4 +-
subprojects/core/core.gradle | 31 +++++--------
.../api/internal/AbstractClassPathProvider.java | 2 +-
.../maven/pombuilder/CustomModelBuilder.java | 10 +----
.../publish/maven/pombuilder/ModelFactory.java | 12 ++---
.../maven/pombuilder/PlexusLoggerAdapter.java | 4 --
.../artifacts/repositories/WebdavRepository.java | 4 +-
subprojects/docs/docs.gradle | 13 +++---
subprojects/jetty/jetty.gradle | 12 ++---
subprojects/osgi/osgi.gradle | 6 ++-
subprojects/plugins/plugins.gradle | 2 +-
subprojects/wrapper/wrapper.gradle | 2 +-
15 files changed, 68 insertions(+), 109 deletions(-)
diff --git a/build.gradle b/build.gradle
index 48a5497..a93198e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,6 @@
import java.util.jar.Attributes
import org.gradle.api.artifacts.repositories.WebdavResolver
-import org.apache.ivy.plugins.resolver.FileSystemResolver
import org.gradle.api.internal.artifacts.dependencies.DefaultSelfResolvingDependency
import org.gradle.build.samples.WrapperProjectCreator
@@ -45,29 +44,28 @@ startScriptsDir = new File("$buildDir/startScripts")
archivesBaseName = 'gradle'
libraries = [
- ant: 'org.apache.ant:ant:1.8.0 at jar',
- ant_junit: 'org.apache.ant:ant-junit:1.8.0 at jar',
- ant_launcher: 'org.apache.ant:ant-launcher:1.8.0 at jar',
- ant_nodeps: 'org.apache.ant:ant-nodeps:1.8.0 at jar',
- ant_trax: 'org.apache.ant:ant-trax:1.8.0 at jar',
- ant_antlr: 'org.apache.ant:ant-antlr:1.8.0 at jar',
+ ant: 'org.apache.ant:ant:1.8.1 at jar',
+ ant_junit: 'org.apache.ant:ant-junit:1.8.1 at jar',
+ ant_launcher: 'org.apache.ant:ant-launcher:1.8.1 at jar',
+ ant_nodeps: 'org.apache.ant:ant-nodeps:1.8.1 at jar',
+ ant_antlr: 'org.apache.ant:ant-antlr:1.8.1 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.2 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.5 at jar',
dom4j: 'dom4j:dom4j:1.6.1 at jar',
google_collections: 'com.google.collections:google-collections:1.0 at jar',
- groovy: 'org.codehaus.groovy:groovy-all:1.7.9 at jar',
+ groovy: 'org.codehaus.groovy:groovy-all:1.7.6 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',
+ logback_classic: 'ch.qos.logback:logback-classic:0.9.24 at jar',
+ logback_core: 'ch.qos.logback:logback-core:0.9.24 at jar',
+ junit: 'junit:junit:4.8.1',
xmlunit: 'xmlunit:xmlunit:1.3',
]
@@ -84,9 +82,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'
@@ -97,11 +95,7 @@ allprojects {
}
repositories {
- add(new FileSystemResolver()) {
- name = 'repo'
- addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
- addArtifactPattern "/usr/share/java/[module].[ext]"
- }
+ mavenRepo(urls: 'http://gradle.artifactoryonline.com/gradle/libs')
}
version = this.version
@@ -365,7 +359,7 @@ zipRootFolder = "$archivesBaseName-${-> version}"
binDistImage = copySpec {
from 'src/toplevel'
- //from project(':docs').distDocs.destFile
+ from project(':docs').distDocs.destFile
into('bin') {
from startScriptsDir
fileMode = 0755
@@ -391,16 +385,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 +502,7 @@ def guessMaxForks() {
task testedDists(dependsOn: [assemble, check, integTest, embeddedIntegTest, 'openApi:integTest', ':ui:integTest'])
-//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'
@@ -586,8 +577,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, uploadDists
+ dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadArchives, uploadDists, ':docs:uploadDocs'
}
task wrapper(type: Wrapper) {
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 7706d03..f7e8b24 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -13,19 +13,14 @@
* 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 {
- add(new FileSystemResolver()) {
- name = 'repo'
- addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
- addArtifactPattern "/usr/share/java/[module].[ext]"
- }
+ mavenRepo(urls: 'http://gradle.artifactoryonline.com/gradle/libs')
}
dependencies {
@@ -33,14 +28,8 @@ dependencies {
compile 'com.google.collections:google-collections:1.0 at jar'
groovy localGroovy()
testCompile 'junit:junit:4.8.1 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 '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 '**'
-}
-
-//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/subprojects/code-quality/code-quality.gradle b/subprojects/code-quality/code-quality.gradle
index 3bdf458..b433c56 100644
--- a/subprojects/code-quality/code-quality.gradle
+++ b/subprojects/code-quality/code-quality.gradle
@@ -19,7 +19,7 @@ dependencies {
compile project(':core')
compile project(':plugins')
- compile "org.codenarc:CodeNarc:0.11 at jar"
+ compile "org.codenarc:CodeNarc:0.12 at jar"
compile libraries.slf4j_api
// CodeNarc dependencies
@@ -30,7 +30,7 @@ dependencies {
runtime "com.puppycrawl.tools:checkstyle:5.3 at jar",
libraries.google_collections,
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/core.gradle b/subprojects/core/core.gradle
index 83e0d2f..7473e3c 100644
--- a/subprojects/core/core.gradle
+++ b/subprojects/core/core.gradle
@@ -36,38 +36,31 @@ configurations {
dependencies {
groovy libraries.groovy_depends
- compile "commons-httpclient:commons-httpclient:3.0 at jar", "commons-codec:commons-codec:1.4 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'
compile libraries.ant,
libraries.ant_nodeps,
- libraries.ant_trax,
libraries.logback_classic,
libraries.logback_core,
libraries.slf4j_api,
libraries.jul_to_slf4j,
libraries.commons_io,
libraries.commons_lang,
- "commons-codec:commons-codec:1.4 at jar",
+ "commons-codec:commons-codec:1.2 at jar",
libraries.google_collections,
- "commons-collections:commons-collections3:3.2.1 at jar",
- "org.apache.maven:maven-ant-tasks:2.0.10 at jar",
+ "commons-collections:commons-collections:3.2.1 at jar",
+ "slide:webdavlib:2.0 at jar",
+ "org.apache.maven:maven-ant-tasks:2.1.1 at jar",
libraries.asm_all,
- 'org.fusesource.jansi:jansi:1.4',
- 'org.jruby.ext.posix:jna-posix:1.0.1',
- 'org.codehaus.plexus:plexus-component-annotations:1.0-beta-3.0.7',
- 'org.codehaus.plexus:plexus-component-api:1.0-alpha-22',
- 'org.codehaus.plexus:plexus-utils:1.5.15',
- 'org.apache.maven:maven-model:2.2.1',
- 'org.apache.maven:maven-settings:2.2.1',
- 'org.apache.maven:maven-project:2.2.1',
- 'org.apache.maven:maven-artifact:2.2.1',
- 'org.apache.maven:maven-artifact-manager:2.2.1',
- 'org.apache.maven:maven-settings:2.2.1',
- 'org.apache.maven.wagon:wagon-provider-api:1.0-beta-6'
-
- runtime 'net.java.dev.jna:jna:3.2.4'
+ 'org.fusesource.jansi:jansi:1.2.1',
+ 'org.jruby.ext.posix:jna-posix:1.0.3',
+ 'org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar',
+ 'org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar',
+ 'org.codehaus.plexus:plexus-component-annotations:1.5.2'
+
+ 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 3a498b6..d0b8461 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
@@ -60,7 +60,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 + "-.+"));
}
return patterns;
}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java
index ee50e93..8c9ad18 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java
+++ b/subprojects/core/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/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java
index 6a6cfbc..49b0f10 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java
+++ b/subprojects/core/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/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java
index 0cabd69..26dbb71 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java
+++ b/subprojects/core/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/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/docs/docs.gradle b/subprojects/docs/docs.gradle
index 0b4651f..a4a86d9 100644
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
@@ -28,7 +28,6 @@ configurations {
userGuideTask
}
-/*
dependencies {
ftpAntTask module("org.apache.ant:ant-commons-net:1.7.0") {
module("commons-net:commons-net:1.4.1") {
@@ -44,7 +43,6 @@ dependencies {
userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
}
-*/
RemoteLocations remoteLocations = new RemoteLocations(version: version)
@@ -102,10 +100,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) {
@@ -339,8 +337,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 36045b0..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"
-// "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 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 dd27cac..bd6713b 100644
--- a/subprojects/osgi/osgi.gradle
+++ b/subprojects/osgi/osgi.gradle
@@ -13,6 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+repositories {
+ mavenRepo urls: 'http://www.aQute.biz/repo'
+}
+
dependencies {
groovy libraries.groovy_depends
@@ -20,7 +24,7 @@ dependencies {
compile project(':plugins')
compile libraries.slf4j_api
- compile 'biz.aQute:bnd:0.0.384 at jar'
+ compile 'biz.aQute:bndlib:0.0.384 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 89fc04b..c8dda61 100644
--- a/subprojects/plugins/plugins.gradle
+++ b/subprojects/plugins/plugins.gradle
@@ -33,7 +33,7 @@ dependencies {
// This is for the ant junit task. Without it, we get file locking problems with some jvms because the default
// transformer does not close files
- runtime 'xalan:xalan2:2.7.1'
+ runtime 'xalan:xalan:2.7.1'
testCompile libraries.xmlunit
diff --git a/subprojects/wrapper/wrapper.gradle b/subprojects/wrapper/wrapper.gradle
index 83315d2..eefd65e 100644
--- a/subprojects/wrapper/wrapper.gradle
+++ b/subprojects/wrapper/wrapper.gradle
@@ -19,7 +19,7 @@ dependencies {
groovy libraries.groovy_depends
compile project(':core')
- compile libraries.commons_io, libraries.ant, libraries.ant_nodeps, libraries.ant_trax
+ compile libraries.commons_io, libraries.ant, libraries.ant_nodeps
testCompile project(path: ':core', configuration: 'testFixtures')
testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git
More information about the pkg-java-commits
mailing list