This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle.
commit da61b51b0f7840f47ef771ab04ef7be0f40f7839 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 30 12:08:05 2015 +0100 Refreshed the patches --- debian/changelog | 8 ++++ debian/patches/33_scala_zinc.diff | 15 ++++---- debian/patches/disable_aws.diff | 2 +- debian/patches/disable_distributions.diff | 3 +- debian/patches/disable_java9.diff | 2 +- debian/patches/disable_release_notes.diff | 8 +++- debian/patches/disable_sonar.diff | 8 +--- debian/patches/disable_tests.diff | 45 ++++++++++++++++++---- debian/patches/eclipse-aether.diff | 20 +++++----- debian/patches/generate_classpath.diff | 8 ++-- debian/patches/generate_pom.diff | 13 +++---- debian/patches/jcommander.diff | 10 +++++ debian/patches/maven-3.3.9-compatibility.patch | 2 +- debian/patches/maven-aether-provider.diff | 14 +++---- debian/patches/maven_builder_support.diff | 2 +- debian/patches/nekohtml.diff | 2 +- debian/patches/use_local_artifacts.diff | 53 +++++++++++++++----------- 17 files changed, 136 insertions(+), 79 deletions(-) diff --git a/debian/changelog b/debian/changelog index bfc77d0..591369f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gradle (2.8-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Tue, 29 Dec 2015 23:26:47 +0100 + gradle (2.7-4) unstable; urgency=medium * Team upload. diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff index 057bd97..4b502c8 100644 --- a/debian/patches/33_scala_zinc.diff +++ b/debian/patches/33_scala_zinc.diff @@ -13,16 +13,15 @@ Forwarded: not-needed compile project(":languageJvm") - // keep in sync with ScalaLanguagePlugin code - provided("com.typesafe.zinc:zinc:0.3.7") - + testCompile libraries.groovy } -@@ -15,3 +13,5 @@ - useTestFixtures() +@@ -16,3 +14,5 @@ useTestFixtures(project: ":languageJvm", sourceSet: 'testFixtures') useTestFixtures(project: ":platformBase") + useTestFixtures(project: ":launcher") + +sourceSets.main.java { exclude "**/ZincScalaCompiler.java" } -\ No newline at end of file --- 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 @@ -120,15 +120,7 @@ @@ -41,7 +40,7 @@ Forwarded: not-needed + compile.conventionMapping.zincClasspath = {} } } - + --- a/subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/DefaultScalaToolProvider.java +++ b/subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/DefaultScalaToolProvider.java @@ -21,7 +21,6 @@ @@ -53,7 +52,7 @@ Forwarded: not-needed import org.gradle.language.base.internal.compile.Compiler; import org.gradle.platform.base.internal.toolchain.ToolProvider; @@ -47,12 +46,7 @@ - + @SuppressWarnings("unchecked") public <T extends CompileSpec> org.gradle.language.base.internal.compile.Compiler<T> newCompiler(Class<T> spec) { - if (ScalaJavaJointCompileSpec.class.isAssignableFrom(spec)) { @@ -64,13 +63,13 @@ Forwarded: not-needed - throw new IllegalArgumentException(String.format("Cannot create Compiler for unsupported CompileSpec type '%s'", spec.getSimpleName())); + throw new org.gradle.api.GradleException("Gradle in Debian does not support Zinc compiler."); } - + @Override --- a/subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java +++ b/subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java @@ -64,7 +64,7 @@ Set<File> zincClasspathFiles = zincClasspath.getFiles(); - + // currently, we leave it to ZincScalaCompiler to also compile the Java code - Compiler<ScalaJavaJointCompileSpec> scalaCompiler = new DaemonScalaCompiler<ScalaJavaJointCompileSpec>(rootProjectDirectory, new ZincScalaCompiler(scalaClasspathFiles, zincClasspathFiles), compilerDaemonFactory, zincClasspathFiles); - return new NormalizingScalaCompiler(scalaCompiler); diff --git a/debian/patches/disable_aws.diff b/debian/patches/disable_aws.diff index 72a4fe4..4dedf80 100644 --- a/debian/patches/disable_aws.diff +++ b/debian/patches/disable_aws.diff @@ -3,7 +3,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-07-07 --- a/build.gradle +++ b/build.gradle -@@ -98,7 +98,7 @@ +@@ -143,7 +143,7 @@ 'diagnostics', 'reporting', 'publish', 'ivy', 'jacoco', 'buildInit', 'platformBase', 'platformJvm', 'languageJvm', 'languageJava', 'languageGroovy', 'languageScala', 'platformNative', 'platformPlay', 'languageNative', 'ideNative', 'testingNative', diff --git a/debian/patches/disable_distributions.diff b/debian/patches/disable_distributions.diff index dc8d390..49f4653 100644 --- a/debian/patches/disable_distributions.diff +++ b/debian/patches/disable_distributions.diff @@ -15,7 +15,7 @@ Last-Update: 2015-07-08 include 'core' --- a/build.gradle +++ b/build.gradle -@@ -203,22 +203,5 @@ +@@ -248,23 +248,6 @@ } } @@ -38,3 +38,4 @@ Last-Update: 2015-07-08 - apply from: "gradle/intTestImage.gradle" apply from: 'gradle/pullRequestBuild.gradle' + apply from: 'gradle/buildSplits.gradle' diff --git a/debian/patches/disable_java9.diff b/debian/patches/disable_java9.diff index 54ee4c4..47a9f9c 100644 --- a/debian/patches/disable_java9.diff +++ b/debian/patches/disable_java9.diff @@ -3,7 +3,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-07-08 --- a/build.gradle +++ b/build.gradle -@@ -141,7 +141,6 @@ +@@ -186,7 +186,6 @@ if (project in groovyProjects) { apply from: "$rootDir/gradle/groovyProject.gradle" apply from: "$rootDir/gradle/testWithUnknownOS.gradle" diff --git a/debian/patches/disable_release_notes.diff b/debian/patches/disable_release_notes.diff index b4f43a0..ef53055 100644 --- a/debian/patches/disable_release_notes.diff +++ b/debian/patches/disable_release_notes.diff @@ -45,7 +45,7 @@ Last-Update: 2015-07-02 tasks.addRule("view«Doc Task Name» - Opens entry point") { String taskName -> if (taskName.startsWith("view")) { def realTaskName = (taskName - "view") -@@ -436,15 +411,8 @@ +@@ -436,21 +411,8 @@ sourceSets.main.output.dir generatedResourcesDir, builtBy: defaultImports @@ -56,6 +56,12 @@ Last-Update: 2015-07-02 - -} - +-java9Test { +- dependsOn releaseNotes +- systemProperty "org.gradle.docs.releasenotes.source", releaseNotesMarkdown.source.singleFile +- systemProperty "org.gradle.docs.releasenotes.rendered", new File(releaseNotes.destinationDir, releaseNotes.fileName) +-} +- task docs { - dependsOn javadocAll, groovydocAll, userguide, distDocs, samplesDocs, dslHtml, releaseNotes + dependsOn javadocAll, groovydocAll, userguide, distDocs, samplesDocs, dslHtml diff --git a/debian/patches/disable_sonar.diff b/debian/patches/disable_sonar.diff index 6e83bf4..a9871fd 100644 --- a/debian/patches/disable_sonar.diff +++ b/debian/patches/disable_sonar.diff @@ -6,7 +6,7 @@ Last-Update: 2015-07-02 --- a/build.gradle +++ b/build.gradle -@@ -94,7 +94,7 @@ +@@ -139,7 +139,7 @@ publicGroovyProjects = groovyProjects - internalProjects pluginProjects = [ 'plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', @@ -27,7 +27,7 @@ Last-Update: 2015-07-02 include 'native' --- a/subprojects/docs/src/docs/userguide/sonarPlugin.xml +++ b/subprojects/docs/src/docs/userguide/sonarPlugin.xml -@@ -223,9 +223,8 @@ +@@ -223,7 +223,6 @@ <tr> <td><literal>sonarAnalyze</literal></td> <td>-</td> @@ -35,10 +35,6 @@ Last-Update: 2015-07-02 <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> --- a/subprojects/docs/src/docs/userguide/userguide.xml +++ b/subprojects/docs/src/docs/userguide/userguide.xml @@ -61,8 +61,6 @@ diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff index 5beeae9..73d75a6 100644 --- a/debian/patches/disable_tests.diff +++ b/debian/patches/disable_tests.diff @@ -3,7 +3,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-09-30 --- a/build.gradle +++ b/build.gradle -@@ -124,8 +124,6 @@ +@@ -169,8 +169,6 @@ apply from: "gradle/classycle.gradle" apply from: "gradle/strictCompile.gradle" apply from: "gradle/noDependencyResolutionDuringConfiguration.gradle" @@ -12,15 +12,17 @@ Last-Update: 2015-09-30 apply from: "gradle/taskOrdering.gradle" apply from: "gradle/fix-GRADLE-2492.gradle" -@@ -203,5 +201,4 @@ +@@ -248,7 +246,6 @@ } } -apply from: "gradle/intTestImage.gradle" apply from: 'gradle/pullRequestBuild.gradle' + apply from: 'gradle/buildSplits.gradle' + --- a/gradle/groovyProject.gradle +++ b/gradle/groovyProject.gradle -@@ -68,13 +68,16 @@ +@@ -71,19 +71,24 @@ def compileConfiguration = sourceSet == "main" ? "compile" : "${sourceSet}Compile" def runtimeConfiguration = sourceSet == "main" ? "runtime" : "${sourceSet}Runtime" @@ -37,9 +39,8 @@ Last-Update: 2015-09-30 if (file("src/testFixtures").exists()) { apply from: "$rootDir/gradle/testFixtures.gradle" } -@@ -83,6 +86,8 @@ - apply from: "$rootDir/gradle/integTest.gradle" - } + + apply from: "$rootDir/gradle/integTest.gradle" +*/ + @@ -413,7 +414,7 @@ Last-Update: 2015-09-30 - integTestRuntime project(':plugins') } - strictCompile() + useClassycle(exclude: ["org/gradle/api/internal/tasks/compile/**"]) --- a/subprojects/language-java/language-java.gradle +++ b/subprojects/language-java/language-java.gradle @@ -3,9 +3,6 @@ @@ -460,7 +461,7 @@ Last-Update: 2015-09-30 useClassycle() --- a/subprojects/platform-play/platform-play.gradle +++ b/subprojects/platform-play/platform-play.gradle -@@ -7,14 +7,7 @@ +@@ -7,16 +7,7 @@ compile project(":languageScala") compile project(":javascript") compile project(":diagnostics") @@ -471,7 +472,35 @@ Last-Update: 2015-09-30 -useTestFixtures() -useTestFixtures(project: ":languageScala", sourceSet: 'integTest') -useTestFixtures(project: ":languageJava", sourceSet: 'integTest') +-useTestFixtures(project: ':languageJvm', sourceSet: 'testFixtures') -useTestFixtures(project: ":launcher", sourceSet: 'testFixtures') +-useTestFixtures(project: ":diagnostics") - useClassycle() strictCompile() +--- a/gradle/buildSplits.gradle ++++ b/gradle/buildSplits.gradle +@@ -37,7 +37,7 @@ + def uncoveredProjects = subprojects.collect { ":${it.name}" } - coveredProjects + assert uncoveredProjects == [] : "The following projects should be added to a bucket: ${uncoveredProjects}" + +-ext.runtimeProjectPaths = runtimeProjects.collect { it.path } ++ext.runtimeProjectPaths = subprojects.collect { it.path } + + //Make sure there are no duplicates between buckets + for (int bucket : buckets.keySet().collect{it as int}) { +@@ -79,13 +79,5 @@ + } + + def String resolveTask(String projectPath, String task) { +- if (testGroupings.containsKey(task)) { +- if (projectPath in runtimeProjectPaths) { +- return testGroupings[task] +- } else { +- return null +- } +- } else { +- return task +- } ++ return task + } diff --git a/debian/patches/eclipse-aether.diff b/debian/patches/eclipse-aether.diff index 3690372..e9b5d68 100644 --- a/debian/patches/eclipse-aether.diff +++ b/debian/patches/eclipse-aether.diff @@ -61,7 +61,7 @@ Last-Update: 2015-09-30 import java.io.File; import java.util.Collection; -@@ -56,7 +56,7 @@ +@@ -57,7 +57,7 @@ throw new GradleException("Must specify a repository for deployment"); } @@ -70,7 +70,7 @@ Last-Update: 2015-09-30 DeployRequest request = new DeployRequest(); request.setRepository(aetherRepo); -@@ -68,22 +68,26 @@ +@@ -69,22 +69,26 @@ repositorySystem.deploy(session, request); } @@ -105,9 +105,9 @@ Last-Update: 2015-09-30 } --- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/MavenInstallAction.java +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/MavenInstallAction.java -@@ -18,11 +18,11 @@ - import java.io.File; - import java.util.Collection; +@@ -15,11 +15,11 @@ + */ + package org.gradle.api.publication.maven.internal.action; -import org.sonatype.aether.RepositorySystem; -import org.sonatype.aether.RepositorySystemSession; @@ -120,11 +120,11 @@ Last-Update: 2015-09-30 +import org.eclipse.aether.installation.InstallRequest; +import org.eclipse.aether.installation.InstallationException; - public class MavenInstallAction extends AbstractMavenPublishAction { - + import java.io.File; + import java.util.Collection; --- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java -@@ -27,16 +27,16 @@ +@@ -30,16 +30,16 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.gradle.api.GradleException; import org.gradle.internal.UncheckedException; @@ -151,7 +151,7 @@ Last-Update: 2015-09-30 import java.io.File; import java.io.FileReader; -@@ -66,7 +66,7 @@ +@@ -70,7 +70,7 @@ } public void setLocalMavenRepositoryLocation(File localMavenRepository) { @@ -160,7 +160,7 @@ Last-Update: 2015-09-30 } public void setMainArtifact(File file) { -@@ -113,7 +113,7 @@ +@@ -126,7 +126,7 @@ // This is a workaround for https://issues.gradle.org/browse/GRADLE-3324. // Somehow the ArrayList 'result' in `org.sonatype.aether.impl.internal.Utils#sortMetadataGeneratorFactories` ends up // being a list of nulls on windows and IBM's 1.6 JDK. diff --git a/debian/patches/generate_classpath.diff b/debian/patches/generate_classpath.diff index 6e252e1..8c931b9 100644 --- a/debian/patches/generate_classpath.diff +++ b/debian/patches/generate_classpath.diff @@ -8,9 +8,11 @@ Author: Kai-Chung Yan <[email protected]> Lasy-Update: 2015-10-03 --- a/build.gradle +++ b/build.gradle -@@ -201,3 +201,4 @@ - } +@@ -247,6 +247,7 @@ apply from: 'gradle/pullRequestBuild.gradle' + apply from: 'gradle/buildSplits.gradle' +apply from: 'debian/generate-classpath.gradle' -\ No newline at end of file + + def reportsFolder = new File(buildDir, "reports") + ext.preferencesTraceFile = new File(reportsFolder, "preferences.trace.log") diff --git a/debian/patches/generate_pom.diff b/debian/patches/generate_pom.diff index 5a0c80d..a0205bb 100644 --- a/debian/patches/generate_pom.diff +++ b/debian/patches/generate_pom.diff @@ -6,12 +6,11 @@ Author: Kai-Chung Yan <[email protected]> Last-Updtae: 2015-10-08 --- a/build.gradle +++ b/build.gradle -@@ -201,4 +201,5 @@ - } - +@@ -248,6 +248,7 @@ apply from: 'gradle/pullRequestBuild.gradle' --apply from: 'debian/generate-classpath.gradle' -\ No newline at end of file -+apply from: 'debian/generate-classpath.gradle' + apply from: 'gradle/buildSplits.gradle' + apply from: 'debian/generate-classpath.gradle' +apply from: 'debian/generate-pom.gradle' -\ No newline at end of file + + def reportsFolder = new File(buildDir, "reports") + ext.preferencesTraceFile = new File(reportsFolder, "preferences.trace.log") diff --git a/debian/patches/jcommander.diff b/debian/patches/jcommander.diff index 7aa425c..658da57 100644 --- a/debian/patches/jcommander.diff +++ b/debian/patches/jcommander.diff @@ -32,3 +32,13 @@ Last-Update: 2015-09-30 } useClassycle() +--- a/subprojects/plugins/plugins.gradle ++++ b/subprojects/plugins/plugins.gradle +@@ -39,6 +39,7 @@ + compile libraries.junit + compile libraries.slf4j_api + compile 'org.testng:testng:6.3.1' ++ compile "com.beust:jcommander" + + runtime libraries.commons_cli + diff --git a/debian/patches/maven-3.3.9-compatibility.patch b/debian/patches/maven-3.3.9-compatibility.patch index 3c585fa..44b2fda 100644 --- a/debian/patches/maven-3.3.9-compatibility.patch +++ b/debian/patches/maven-3.3.9-compatibility.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle -@@ -135,6 +135,8 @@ +@@ -136,6 +136,8 @@ dependency "org.eclipse.aether:eclipse-aether-spi" dependency "org.eclipse.aether:eclipse-aether-util" dependency 'org.eclipse.aether:eclipse-aether-connector-basic' diff --git a/debian/patches/maven-aether-provider.diff b/debian/patches/maven-aether-provider.diff index dc50b44..28a5195 100644 --- a/debian/patches/maven-aether-provider.diff +++ b/debian/patches/maven-aether-provider.diff @@ -4,20 +4,20 @@ Last-Update: 2015-09-30 --- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java @@ -18,7 +18,7 @@ - + import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; -import org.apache.maven.repository.internal.MavenRepositorySystemSession; +import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.apache.maven.repository.internal.SnapshotMetadataGeneratorFactory; import org.apache.maven.repository.internal.VersionsMetadataGeneratorFactory; - import org.codehaus.plexus.DefaultPlexusContainer; -@@ -56,7 +56,7 @@ - - protected AbstractMavenPublishAction(File pomFile) { - container = newPlexusContainer(); + import org.codehaus.plexus.DefaultContainerConfiguration; +@@ -60,7 +60,7 @@ + + protected AbstractMavenPublishAction(File pomFile, List<File> wagonJars) { + container = newPlexusContainer(wagonJars); - session = new MavenRepositorySystemSession(); + session = MavenRepositorySystemUtils.newSession(); session.setTransferListener(new LoggingMavenTransferListener()); session.getConfigProperties().put("maven.metadata.legacy", "true"); - + diff --git a/debian/patches/maven_builder_support.diff b/debian/patches/maven_builder_support.diff index bd74baa..cf41845 100644 --- a/debian/patches/maven_builder_support.diff +++ b/debian/patches/maven_builder_support.diff @@ -3,7 +3,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-07-22 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle -@@ -116,6 +116,7 @@ +@@ -117,6 +117,7 @@ dependency "org.apache.maven:maven3-compat" dependency "org.apache.maven:maven3-model-builder" dependency "org.apache.maven:maven3-model" diff --git a/debian/patches/nekohtml.diff b/debian/patches/nekohtml.diff index 75c1d5f..260e14a 100644 --- a/debian/patches/nekohtml.diff +++ b/debian/patches/nekohtml.diff @@ -3,7 +3,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-07-03 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle -@@ -94,6 +94,8 @@ +@@ -95,6 +95,8 @@ jsoup:'org.jsoup:jsoup:1.6.3' ] diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index 6960a0f..fb17fc0 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -9,7 +9,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-07-08 --- a/build.gradle +++ b/build.gradle -@@ -133,7 +133,7 @@ +@@ -178,7 +178,7 @@ group = 'org.gradle' repositories { @@ -53,7 +53,7 @@ Last-Update: 2015-07-08 apply from: '../gradle/taskOrdering.gradle' --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle -@@ -25,21 +25,21 @@ +@@ -25,42 +25,42 @@ versions.bouncycastle = "1.51" @@ -64,17 +64,20 @@ Last-Update: 2015-07-08 } -libraries.asm = 'org.ow2.asm:asm-all:5.0.3' +-libraries.bndlib = dependencies.module('biz.aQute.bnd:bndlib:2.4.0') -libraries.commons_cli = 'commons-cli:commons-cli:1.2@jar' +libraries.asm = 'org.ow2.asm:asm4-all' ++libraries.bndlib = dependencies.module('biz.aQute.bnd:bndlib') +libraries.commons_cli = 'commons-cli:commons-cli' 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.jsch = "com.jcraft:jsch:0.1.51" +-libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){ +libraries.commons_lang = 'commons-lang:commons-lang' +libraries.commons_collections = 'commons-collections:commons-collections3' +libraries.jsch = "com.jcraft:jsch" - libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){ ++libraries.ivy = dependencies.module('org.apache.ivy:ivy'){ dependency libraries.jsch } -libraries.jcip = "net.jcip:jcip-annotations:1.0@jar" @@ -83,8 +86,26 @@ Last-Update: 2015-07-08 +libraries.inject = dependencies.module('javax.inject:atinject-jsr330-api') // Logging - libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api:1.7.10') -@@ -59,7 +59,7 @@ +-libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api:1.7.10') +-libraries.jcl_to_slf4j = dependencies.module('org.slf4j:jcl-over-slf4j:1.7.10') { ++libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api') ++libraries.jcl_to_slf4j = dependencies.module('org.slf4j:jcl-over-slf4j') { + dependency libraries.slf4j_api + } +-libraries.jul_to_slf4j = dependencies.module('org.slf4j:jul-to-slf4j:1.7.10') { ++libraries.jul_to_slf4j = dependencies.module('org.slf4j:jul-to-slf4j') { + dependency libraries.slf4j_api + } +-libraries.log4j_to_slf4j = dependencies.module('org.slf4j:log4j-over-slf4j:1.7.10') { ++libraries.log4j_to_slf4j = dependencies.module('org.slf4j:log4j-over-slf4j') { + dependency libraries.slf4j_api + } +-libraries.logback_core = dependencies.module('ch.qos.logback:logback-core:1.0.13') +-libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic:1.0.13') { ++libraries.logback_core = dependencies.module('ch.qos.logback:logback-core') ++libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic') { + dependency libraries.logback_core + dependency libraries.slf4j_api } // Jetty @@ -93,7 +114,7 @@ Last-Update: 2015-07-08 libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") { dependency libraries.slf4j_api dependency libraries.servlet_api -@@ -73,72 +73,72 @@ +@@ -74,72 +74,72 @@ dependency "org.apache.httpcomponents:httpcore:4.2.2@jar" dependency libraries.jcl_to_slf4j dependency "commons-codec:commons-codec:1.6@jar" @@ -200,7 +221,7 @@ Last-Update: 2015-07-08 ] libraries.jmock = [ 'org.jmock:jmock:2.5.1', -@@ -147,16 +147,16 @@ +@@ -148,16 +148,16 @@ 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', libraries.objenesis, @@ -221,11 +242,10 @@ Last-Update: 2015-07-08 dependency libraries.bouncycastle_provider } -@@ -169,16 +169,4 @@ - 'com.fasterxml.jackson.core:jackson-core:2.3.2@jar', +@@ -171,15 +171,3 @@ 'com.fasterxml.jackson.core:jackson-annotations:2.3.2@jar', 'com.fasterxml.jackson.core:jackson-databind:2.3.2@jar' --] + libraries.commons_httpclient + libraries.joda + ] + libraries.commons_httpclient + libraries.joda - -allprojects { - configurations.all { @@ -238,8 +258,6 @@ Last-Update: 2015-07-08 - } - } -} -+] + libraries.commons_httpclient + libraries.joda -\ No newline at end of file --- a/subprojects/jetty/jetty.gradle +++ b/subprojects/jetty/jetty.gradle @@ -31,14 +31,12 @@ @@ -291,17 +309,6 @@ Last-Update: 2015-07-08 testCompile libraries.groovy } ---- a/subprojects/osgi/osgi.gradle -+++ b/subprojects/osgi/osgi.gradle -@@ -21,7 +21,7 @@ - compile project(':plugins') - compile libraries.slf4j_api - -- compile module('biz.aQute.bnd:bndlib:2.1.0') -+ compile module('biz.aQute.bnd:bndlib') - } - - useTestFixtures() --- a/subprojects/reporting/reporting.gradle +++ b/subprojects/reporting/reporting.gradle @@ -5,13 +5,13 @@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
