[gradle] 02/06: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Dec 22 10:37:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository gradle.
commit 66add11217de635ec9d9817e14cbcd9c7972eb2b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 21 18:29:52 2016 +0100
Refreshed the patches
---
debian/changelog | 8 ++++
debian/patches/34_disable_code_quality.diff | 18 ++++----
debian/patches/disable_aws.diff | 2 +-
debian/patches/docs.diff | 39 ++++++++--------
debian/patches/drop_http-builder.patch | 14 +++---
debian/patches/drop_jmh-gradle-plugin.patch | 2 +-
debian/patches/eclipse-aether.diff | 2 +-
debian/patches/fix-classpath-annotation.patch | 15 +++++++
debian/patches/generate_pom.diff | 2 +-
debian/patches/groovy-jar.patch | 18 ++++----
debian/patches/ivy-2.4.0.patch | 2 +-
debian/patches/maven-3.3-compatibility.patch | 14 +++---
debian/patches/nekohtml.diff | 8 ++--
debian/patches/remove_timestamps.patch | 6 +--
debian/patches/series | 1 +
debian/patches/upgrade-to-jetty9.patch | 24 +++++-----
debian/patches/use_local_artifacts.diff | 64 +++++++++++++++------------
17 files changed, 135 insertions(+), 104 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2d1ebe7..fe3667a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gradle (3.2-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 21 Dec 2016 15:50:02 +0100
+
gradle (3.1-2) unstable; urgency=medium
* d/control:
diff --git a/debian/patches/34_disable_code_quality.diff b/debian/patches/34_disable_code_quality.diff
index 61c01ea..bb9bdfb 100644
--- a/debian/patches/34_disable_code_quality.diff
+++ b/debian/patches/34_disable_code_quality.diff
@@ -21,7 +21,7 @@ Forwarded: not-needed
\ No newline at end of file
--- a/build.gradle
+++ b/build.gradle
-@@ -233,8 +233,6 @@
+@@ -234,8 +234,6 @@
apply from: "$rootDir/gradle/publish.gradle"
}
@@ -43,7 +43,7 @@ Forwarded: not-needed
configurations {
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
-@@ -354,11 +354,7 @@
+@@ -356,11 +356,7 @@
ext.entryPoint = "$destinationDir/index.html"
}
@@ -56,13 +56,13 @@ Forwarded: not-needed
}
task userguideFragmentSrc(type: UserGuideTransformTask, dependsOn: [userguideStyleSheets]) {
---- a/gradle/classycle.gradle
-+++ b/gradle/classycle.gradle
-@@ -64,7 +64,6 @@
- }
- classycle.dependsOn taskName
- check.dependsOn taskName
-- codeQuality.dependsOn taskName
+--- a/buildSrc/src/main/groovy/org/gradle/plugins/classycle/ClassyclePlugin.groovy
++++ b/buildSrc/src/main/groovy/org/gradle/plugins/classycle/ClassyclePlugin.groovy
+@@ -48,7 +48,6 @@
+ } as Action<Classycle>)
+ classycleTask.dependsOn(taskName)
+ project.tasks.getByPath('check').dependsOn(taskName)
+- project.tasks.getByPath('codeQuality').dependsOn(taskName)
}
}
}
diff --git a/debian/patches/disable_aws.diff b/debian/patches/disable_aws.diff
index 4632747..fc83559 100644
--- a/debian/patches/disable_aws.diff
+++ b/debian/patches/disable_aws.diff
@@ -3,7 +3,7 @@ Author: Kai-Chung Yan (殷啟聰)
Last-Update: 2016-11-02
--- a/build.gradle
+++ b/build.gradle
-@@ -175,7 +175,7 @@
+@@ -176,7 +176,7 @@
'platformJvm', 'languageJvm', 'languageJava', 'languageGroovy', 'languageScala',
'platformNative', 'platformPlay', 'idePlay', 'languageNative', 'ideNative', 'testingBase',
'testingNative', 'testingJvm', 'pluginDevelopment', 'pluginUse', 'resourcesHttp',
diff --git a/debian/patches/docs.diff b/debian/patches/docs.diff
index 22cfd90..c87454c 100644
--- a/debian/patches/docs.diff
+++ b/debian/patches/docs.diff
@@ -31,21 +31,21 @@ Last-Update: 2016-10-20
testCompile libraries.groovy
testCompile "org.pegdown:pegdown:1.1.0"
-@@ -118,12 +121,7 @@
- [it.name, it.bytes.encodeBase64().toString()]
- }
+@@ -119,12 +122,7 @@
+ [it.name, it.bytes.encodeBase64().toString()]
+ }
-- def fonts = configurations.fonts.resolvedConfiguration.resolvedArtifacts.collectEntries {
-- def id = it.moduleVersion.id
-- ["${id.group}-${id.name}".toString(), it.file.bytes.encodeBase64().toString()]
-- }
+- 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
- css.inputs.property 'tokens', tokens
- css.filter ReplaceTokens, tokens: tokens
- }
-@@ -171,10 +169,6 @@
+- ext.tokens = images + fonts
++ ext.tokens = images
+ css.inputs.property 'tokens', tokens
+ css.filter ReplaceTokens, tokens: tokens
+ }
+@@ -173,10 +171,6 @@
include '*.xsl'
}
from(cssFiles)
@@ -56,23 +56,22 @@ Last-Update: 2016-10-20
}
task samplesDocbook(type: AssembleSamplesDocTask) {
-@@ -303,8 +297,8 @@
+@@ -305,8 +299,8 @@
classpath = configurations.userGuideTask
}
--def javaApiUrl = "https://docs.oracle.com/javase/6/docs/api"
+-def javaApiUrl = "https://docs.oracle.com/javase/7/docs/api"
-def groovyApiUrl = "http://docs.groovy-lang.org/docs/groovy-${versions.groovy}/html/gapi"
+def javaApiUrl = "file:///usr/share/doc/default-jdk/api/"
+def groovyApiUrl = "file:///usr/share/doc/groovy/api/"
+ def mavenApiUrl = "http://maven.apache.org/ref/${versions.maven}/maven-model/apidocs"
task javadocAll(type: Javadoc) {
- ext.stylesheetFile = file("src/docs/css/javadoc.css")
-@@ -346,8 +340,7 @@
+@@ -349,7 +343,7 @@
include 'org/gradle/testkit/**'
include 'org/gradle/testing/**'
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, mavenApiUrl)
+ options.links(javaApiUrl, groovyApiUrl)
doFirst {
title = "Gradle API $version"
@@ -172,7 +171,7 @@ Last-Update: 2016-10-20
classpath('com.uwyn:jhighlight:1.0') {
--- 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 @@
+@@ -74,8 +74,8 @@
jvmArgs '-Xmx256m'
classpath ClasspathUtil.getClasspathForClass(XslTransformer)
classpath this.classpath
diff --git a/debian/patches/drop_http-builder.patch b/debian/patches/drop_http-builder.patch
index 1c890ef..055bb49 100644
--- a/debian/patches/drop_http-builder.patch
+++ b/debian/patches/drop_http-builder.patch
@@ -23,9 +23,9 @@ Last-Update: 2016-10-28
-import groovyx.net.http.ContentType
-import groovyx.net.http.RESTClient
import org.gradle.api.GradleException
+ import org.gradle.api.tasks.CacheableTask
import org.gradle.api.tasks.Input
- import org.gradle.api.tasks.Optional
-@@ -69,7 +67,7 @@
+@@ -71,7 +69,7 @@
@OutputFile
File scenarioReport
@@ -34,7 +34,7 @@ Last-Update: 2016-10-28
List<String> scheduledBuilds = Lists.newArrayList()
-@@ -137,36 +135,7 @@
+@@ -139,36 +137,7 @@
@TypeChecked(TypeCheckingMode.SKIP)
private void schedule(Scenario scenario, String lastChangeId) {
@@ -72,7 +72,7 @@ Last-Update: 2016-10-28
}
@TypeChecked(TypeCheckingMode.SKIP)
-@@ -195,13 +164,7 @@
+@@ -197,13 +166,7 @@
@TypeChecked(TypeCheckingMode.SKIP)
private String resolveLastChangeId() {
@@ -87,7 +87,7 @@ Last-Update: 2016-10-28
}
@TypeChecked(TypeCheckingMode.SKIP)
-@@ -211,46 +174,12 @@
+@@ -213,46 +176,12 @@
@TypeChecked(TypeCheckingMode.SKIP)
private void join(String jobId) {
@@ -136,12 +136,12 @@ Last-Update: 2016-10-28
}
@TypeChecked(TypeCheckingMode.SKIP)
-@@ -288,10 +217,8 @@
+@@ -290,10 +219,8 @@
}
}
- private RESTClient createClient() {
-- client = new RESTClient("$teamCityUrl/httpAuth/app/rest/")
+- client = new RESTClient("$teamCityUrl/httpAuth/app/rest/9.1")
- client.auth.basic(teamCityUsername, teamCityPassword)
- client
+ private GroovyObject createClient() {
diff --git a/debian/patches/drop_jmh-gradle-plugin.patch b/debian/patches/drop_jmh-gradle-plugin.patch
index 3d4bb75..3cfa272 100644
--- a/debian/patches/drop_jmh-gradle-plugin.patch
+++ b/debian/patches/drop_jmh-gradle-plugin.patch
@@ -11,6 +11,6 @@ Last-Update: 2016-11-02
- apply from: "$rootDir/gradle/jmh.gradle"
-}
-
+ @CacheableTask
class ClasspathManifest extends DefaultTask {
- FileCollection input = project.configurations.runtime
diff --git a/debian/patches/eclipse-aether.diff b/debian/patches/eclipse-aether.diff
index 3aaf1f6..9e06c68 100644
--- a/debian/patches/eclipse-aether.diff
+++ b/debian/patches/eclipse-aether.diff
@@ -5,7 +5,7 @@ Last-Update: 2016-10-20
Forwarded: no
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
-@@ -132,11 +132,11 @@
+@@ -134,11 +134,11 @@
dependency 'org.apache.maven.wagon:wagon-http-shared-2.x:2.x at jar'
//eather:
diff --git a/debian/patches/fix-classpath-annotation.patch b/debian/patches/fix-classpath-annotation.patch
new file mode 100644
index 0000000..e643776
--- /dev/null
+++ b/debian/patches/fix-classpath-annotation.patch
@@ -0,0 +1,15 @@
+Description: Use a fully qualified name for the @Classpath annotation to avoid
+ a compilation failure caused by a confusion with org.gradle.jvm.Classpath (why ???)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/gradle/groovyProject.gradle
++++ b/gradle/groovyProject.gradle
+@@ -79,7 +79,7 @@
+ @CacheableTask
+ class ClasspathManifest extends DefaultTask {
+
+- @Classpath
++ @org.gradle.api.tasks.Classpath
+ FileCollection input = project.configurations.runtime
+
+ @Input
diff --git a/debian/patches/generate_pom.diff b/debian/patches/generate_pom.diff
index 1341ea7..b3842e1 100644
--- a/debian/patches/generate_pom.diff
+++ b/debian/patches/generate_pom.diff
@@ -7,7 +7,7 @@ Last-Updtae: 2016-09-08
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -227,6 +227,7 @@
+@@ -228,6 +228,7 @@
apply from: "$rootDir/gradle/java9.gradle"
check.dependsOn ":docs:checkstyleApi"
check.dependsOn "codeQuality"
diff --git a/debian/patches/groovy-jar.patch b/debian/patches/groovy-jar.patch
index e14a27b..d7e3e68 100644
--- a/debian/patches/groovy-jar.patch
+++ b/debian/patches/groovy-jar.patch
@@ -1,7 +1,7 @@
Description: Tweaks the Groovy classpath detection logic to recognize the groovy jar
in the system Maven repository (/usr/share/maven-repo/org/codehaus/groovy/groovy/debian/groovy-debian.jar)
---- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/GroovyJarFile.java
-+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/GroovyJarFile.java
+--- a/subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/GroovyJarFile.java
++++ b/subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/GroovyJarFile.java
@@ -23,7 +23,7 @@
import java.util.regex.Pattern;
@@ -22,11 +22,11 @@ Description: Tweaks the Groovy classpath detection logic to recognize the groovy
public boolean isGroovyAll() {
--- a/gradle/groovyProject.gradle
+++ b/gradle/groovyProject.gradle
-@@ -97,6 +97,7 @@
- properties.runtime = input.fileCollection {
- (it instanceof ExternalDependency) || (it instanceof FileCollectionDependency)
- }.collect { it.name }.join(',')
+@@ -111,6 +111,7 @@
+ Properties createProperties() {
+ def properties = new Properties()
+ properties.runtime = getRuntime()
+ properties.runtime = properties.runtime.replaceAll('groovy-all-[\\d\\.]+.jar', 'groovy-all.jar');
- properties.projects = input.allDependencies.withType(ProjectDependency).collect {
- it.dependencyProject.archivesBaseName
- }.join(',')
+ properties.projects = getProjects()
+ if (!getOptionalProjects().empty) {
+ properties.optional = getOptionalProjects().join(',')
diff --git a/debian/patches/ivy-2.4.0.patch b/debian/patches/ivy-2.4.0.patch
index 8920b40..db5a1b7 100644
--- a/debian/patches/ivy-2.4.0.patch
+++ b/debian/patches/ivy-2.4.0.patch
@@ -14,7 +14,7 @@ Forwarded: no
--- a/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
+++ b/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
-@@ -1183,7 +1183,7 @@
+@@ -1184,7 +1184,7 @@
buffer = null;
state = State.INFO;
} else if (state == State.EXTRA_INFO) {
diff --git a/debian/patches/maven-3.3-compatibility.patch b/debian/patches/maven-3.3-compatibility.patch
index 91bc00c..76f0f3d 100644
--- a/debian/patches/maven-3.3-compatibility.patch
+++ b/debian/patches/maven-3.3-compatibility.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
-@@ -107,9 +107,15 @@
+@@ -109,9 +109,15 @@
dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
dependency "org.codehaus.plexus:plexus-interpolation:1.14 at jar"
dependency "org.codehaus.plexus:plexus-component-annotations-1.5:1.6 at jar"
@@ -20,15 +20,15 @@ Forwarded: no
//sonatype plexus
dependency "org.sonatype.plexus:plexus-cipher:1.7 at jar"
dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
-@@ -119,6 +125,7 @@
- dependency "org.apache.maven:maven-compat-3.x:3.x at jar"
- dependency "org.apache.maven:maven-model-builder-3.x:3.x at jar"
- dependency "org.apache.maven:maven-model-3.x:3.x at jar"
+@@ -121,6 +127,7 @@
+ dependency "org.apache.maven:maven-compat-3.x:${versions.maven}@jar"
+ dependency "org.apache.maven:maven-model-builder-3.x:${versions.maven}@jar"
+ dependency "org.apache.maven:maven-model-3.x:${versions.maven}@jar"
+ dependency 'org.apache.maven:maven-builder-support-3.x:3.x'
//somewhat core:
- dependency "org.apache.maven:maven-artifact-3.x:3.x at jar"
-@@ -137,6 +144,8 @@
+ dependency "org.apache.maven:maven-artifact-3.x:${versions.maven}@jar"
+@@ -139,6 +146,8 @@
dependency 'org.eclipse.aether:eclipse-aether-spi:1.13.1 at jar'
dependency 'org.eclipse.aether:eclipse-aether-util:1.13.1 at jar'
dependency 'org.eclipse.aether:eclipse-aether-connector-basic:1.13.1 at jar'
diff --git a/debian/patches/nekohtml.diff b/debian/patches/nekohtml.diff
index 371f868..7a7c705 100644
--- a/debian/patches/nekohtml.diff
+++ b/debian/patches/nekohtml.diff
@@ -4,12 +4,12 @@ Last-Update: 2015-07-03
Forwarded: no
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
-@@ -97,6 +97,8 @@
+@@ -99,6 +99,8 @@
jsoup:'org.jsoup:jsoup:1.6.3'
]
+libraries.nekohtml = [libraries.nekohtml, libraries.xerces]
+
- libraries.maven3 = dependencies.module("org.apache.maven:maven-core-3.x:3.x") {
- dependency "org.apache.maven:maven-settings-3.x:3.x at jar"
- dependency "org.apache.maven:maven-settings-builder-3.x:3.x at jar"
+ libraries.maven3 = dependencies.module("org.apache.maven:maven-core-3.x:${versions.maven}") {
+ dependency "org.apache.maven:maven-settings-3.x:${versions.maven}@jar"
+ dependency "org.apache.maven:maven-settings-builder-3.x:${versions.maven}@jar"
diff --git a/debian/patches/remove_timestamps.patch b/debian/patches/remove_timestamps.patch
index 08e7355..7cf8b28 100644
--- a/debian/patches/remove_timestamps.patch
+++ b/debian/patches/remove_timestamps.patch
@@ -15,8 +15,8 @@ Description: Remove timetamps
ext.receiptFile = file("$buildDir/$buildReceiptFileName")
inputs.property "version", { version }
inputs.property "versionBase", { versionBase }
-@@ -115,11 +115,11 @@
- outputs.file receiptFile
+@@ -116,11 +116,11 @@
+ outputs.cacheIf { true }
doLast {
def data = [
- commitId: devBuild ? "HEAD" : determineCommitId.commitId,
@@ -28,4 +28,4 @@ Description: Remove timetamps
+ buildTimestamp: '20121221000000+0000',
]
- receiptFile.parentFile.mkdirs()
+ org.gradle.build.ReproduciblePropertiesWriter.store(data, receiptFile)
diff --git a/debian/patches/series b/debian/patches/series
index 5a12c29..f1eac7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ disable_buildSrc_tests.patch
dependency-management_depends_on_testkit.patch
Groovy_projects_depends_on_localGroovy.patch
drop_jmh-gradle-plugin.patch
+fix-classpath-annotation.patch
diff --git a/debian/patches/upgrade-to-jetty9.patch b/debian/patches/upgrade-to-jetty9.patch
index ed6df88..f94d997 100644
--- a/debian/patches/upgrade-to-jetty9.patch
+++ b/debian/patches/upgrade-to-jetty9.patch
@@ -3,18 +3,18 @@ Author: Michal Srb <msrb at redhat.com>
Forwarded: no
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
-@@ -60,12 +60,12 @@
+@@ -62,12 +62,12 @@
}
// Jetty
-libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211 at jar"
--libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
+-libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.26") {
+libraries.servlet_api = "javax.servlet:servlet-api-3.1"
+libraries.jetty_util = dependencies.module("org.eclipse.jetty:jetty9-util") {
dependency libraries.slf4j_api
dependency libraries.servlet_api
}
--libraries.jetty = dependencies.module("org.mortbay.jetty:jetty:6.1.25") {
+-libraries.jetty = dependencies.module("org.mortbay.jetty:jetty:6.1.26") {
+libraries.jetty = dependencies.module("org.eclipse.jetty:jetty9-server") {
dependency libraries.jetty_util
dependency libraries.servlet_api
@@ -25,14 +25,14 @@ Forwarded: no
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.1.26") {
+ compile module("org.eclipse.jetty:jetty9-plus") {
+ dependency "org.eclipse.jetty:jetty9-security"
+ dependency "org.eclipse.jetty:jetty9-webapp"
+ dependency "org.eclipse.jetty:jetty9-servlet"
+ dependency "org.eclipse.jetty:jetty9-xml"
dependency libraries.jetty
-- module("org.mortbay.jetty:jetty-naming:6.1.25") {
+- module("org.mortbay.jetty:jetty-naming:6.1.26") {
- dependency libraries.jetty
- }
}
@@ -52,7 +52,7 @@ Forwarded: no
dependency libraries.servlet_api
}
-- runtime "org.mortbay.jetty:jetty-annotations:6.1.25 at jar"
+- runtime "org.mortbay.jetty:jetty-annotations:6.1.26 at jar"
- runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
+ runtime "org.eclipse.jetty:jetty9-annotations"
}
@@ -62,7 +62,7 @@ Forwarded: no
+useTestFixtures()
--- a/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/AbstractJettyRunTask.java
+++ b/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/AbstractJettyRunTask.java
-@@ -31,11 +31,11 @@
+@@ -30,11 +30,11 @@
import org.gradle.internal.classpath.DefaultClassPath;
import org.gradle.internal.logging.progress.ProgressLogger;
import org.gradle.internal.logging.progress.ProgressLoggerFactory;
@@ -79,7 +79,7 @@ Forwarded: no
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -115,7 +115,7 @@
+@@ -119,7 +119,7 @@
/**
* List of security realms to set up. Optional.
*/
@@ -88,7 +88,7 @@ Forwarded: no
/**
* A RequestLog implementation to use for the webapp at runtime. Optional.
-@@ -321,7 +321,7 @@
+@@ -325,7 +325,7 @@
/**
* Run a scanner thread on the given list of files and directories, calling stop/start on the given list of LifeCycle objects if any of the watched files change.
*/
@@ -97,7 +97,7 @@ Forwarded: no
// check if scanning is enabled
if (getScanIntervalSeconds() <= 0) {
-@@ -554,11 +554,11 @@
+@@ -558,11 +558,11 @@
}
@Internal
@@ -113,10 +113,10 @@ Forwarded: no
--- a/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/JettyRun.java
+++ b/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/JettyRun.java
-@@ -28,15 +28,15 @@
+@@ -27,15 +27,15 @@
+ import org.gradle.api.tasks.InputFile;
import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.Optional;
- import org.gradle.api.tasks.OrderSensitive;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.ContextHandler;
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 6ff7123..c9576ce 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -10,7 +10,7 @@ Forwarded: not-needed
Last-Update: 2016-10-20
--- a/build.gradle
+++ b/build.gradle
-@@ -213,8 +213,7 @@
+@@ -214,8 +214,7 @@
group = 'org.gradle'
repositories {
@@ -20,7 +20,7 @@ Last-Update: 2016-10-20
}
}
-@@ -222,6 +221,7 @@
+@@ -223,6 +222,7 @@
version = rootProject.version
if (project in groovyProjects) {
@@ -64,7 +64,15 @@ Last-Update: 2016-10-20
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
-@@ -30,17 +30,17 @@
+@@ -25,24 +25,24 @@
+
+ versions.bouncycastle = "1.51"
+
+-versions.maven = "3.0.4"
++versions.maven = "3.x"
+
+ libraries.ant = dependencies.module('org.apache.ant:ant:1.9.6') {
+ dependency 'org.apache.ant:ant-launcher:1.9.6 at jar'
}
libraries.asm = 'org.ow2.asm:asm-all:5.1'
@@ -85,7 +93,7 @@ Last-Update: 2016-10-20
// Logging
libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api:1.7.10')
-@@ -82,12 +82,12 @@
+@@ -84,12 +84,12 @@
libraries += [
dom4j: 'dom4j:dom4j:1.6.1 at jar',
@@ -101,16 +109,16 @@ Last-Update: 2016-10-20
xmlunit: 'xmlunit:xmlunit:1.3',
nekohtml: 'net.sourceforge.nekohtml:nekohtml:1.9.14',
xbean: 'org.apache.xbean:xbean-reflect:3.4 at jar', //required by maven3 classes
-@@ -97,37 +97,37 @@
+@@ -99,37 +99,37 @@
jsoup:'org.jsoup:jsoup:1.6.3'
]
--libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
-- dependency "org.apache.maven:maven-settings:3.0.4 at jar"
-- dependency "org.apache.maven:maven-settings-builder:3.0.4 at jar"
-+libraries.maven3 = dependencies.module("org.apache.maven:maven-core-3.x:3.x") {
-+ dependency "org.apache.maven:maven-settings-3.x:3.x at jar"
-+ dependency "org.apache.maven:maven-settings-builder-3.x:3.x at jar"
+-libraries.maven3 = dependencies.module("org.apache.maven:maven-core:${versions.maven}") {
+- dependency "org.apache.maven:maven-settings:${versions.maven}@jar"
+- dependency "org.apache.maven:maven-settings-builder:${versions.maven}@jar"
++libraries.maven3 = dependencies.module("org.apache.maven:maven-core-3.x:${versions.maven}") {
++ dependency "org.apache.maven:maven-settings-3.x:${versions.maven}@jar"
++ dependency "org.apache.maven:maven-settings-builder-3.x:${versions.maven}@jar"
//plexus:
dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
@@ -126,29 +134,29 @@ Last-Update: 2016-10-20
dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
//core:
-- dependency "org.apache.maven:maven-core:3.0.4 at jar"
-- dependency "org.apache.maven:maven-compat:3.0.4 at jar"
-- dependency "org.apache.maven:maven-model-builder:3.0.4 at jar"
-- dependency "org.apache.maven:maven-model:3.0.4 at jar"
-+ dependency "org.apache.maven:maven-core-3.x:3.x at jar"
-+ dependency "org.apache.maven:maven-compat-3.x:3.x at jar"
-+ dependency "org.apache.maven:maven-model-builder-3.x:3.x at jar"
-+ dependency "org.apache.maven:maven-model-3.x:3.x at jar"
+- dependency "org.apache.maven:maven-core:${versions.maven}@jar"
+- dependency "org.apache.maven:maven-compat:${versions.maven}@jar"
+- dependency "org.apache.maven:maven-model-builder:${versions.maven}@jar"
+- dependency "org.apache.maven:maven-model:${versions.maven}@jar"
++ dependency "org.apache.maven:maven-core-3.x:${versions.maven}@jar"
++ dependency "org.apache.maven:maven-compat-3.x:${versions.maven}@jar"
++ dependency "org.apache.maven:maven-model-builder-3.x:${versions.maven}@jar"
++ dependency "org.apache.maven:maven-model-3.x:${versions.maven}@jar"
//somewhat core:
-- dependency "org.apache.maven:maven-artifact:3.0.4 at jar"
-- dependency "org.apache.maven:maven-repository-metadata:3.0.4 at jar"
-- dependency "org.apache.maven:maven-plugin-api:3.0.4 at jar"
-- dependency "org.apache.maven:maven-aether-provider:3.0.4 at jar"
+- dependency "org.apache.maven:maven-artifact:${versions.maven}@jar"
+- dependency "org.apache.maven:maven-repository-metadata:${versions.maven}@jar"
+- dependency "org.apache.maven:maven-plugin-api:${versions.maven}@jar"
+- dependency "org.apache.maven:maven-aether-provider:${versions.maven}@jar"
-
- dependency 'org.apache.maven.wagon:wagon-file:2.4 at jar'
- dependency 'org.apache.maven.wagon:wagon-http:2.4 at jar'
- dependency 'org.apache.maven.wagon:wagon-provider-api:2.4 at jar'
- dependency 'org.apache.maven.wagon:wagon-http-shared4:2.4 at jar'
-+ dependency "org.apache.maven:maven-artifact-3.x:3.x at jar"
-+ dependency "org.apache.maven:maven-repository-metadata-3.x:3.x at jar"
-+ dependency "org.apache.maven:maven-plugin-api-3.x:3.x at jar"
-+ dependency "org.apache.maven:maven-aether-provider-3.x:3.x at jar"
++ dependency "org.apache.maven:maven-artifact-3.x:${versions.maven}@jar"
++ dependency "org.apache.maven:maven-repository-metadata-3.x:${versions.maven}@jar"
++ dependency "org.apache.maven:maven-plugin-api-3.x:${versions.maven}@jar"
++ dependency "org.apache.maven:maven-aether-provider-3.x:${versions.maven}@jar"
+
+ dependency 'org.apache.maven.wagon:wagon-file-2.x:2.x at jar'
+ dependency 'org.apache.maven.wagon:wagon-http-2.x:2.x at jar'
@@ -157,7 +165,7 @@ Last-Update: 2016-10-20
//eather:
dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
-@@ -158,8 +158,8 @@
+@@ -160,8 +160,8 @@
dependency "org.apache.mina:mina-core:2.0.8"
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git
More information about the pkg-java-commits
mailing list