[gradle-1.12] 164/211: Delete unused patches
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Jul 1 14:18:46 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 7e47abd57b04a0ac9cb65c4274db9ce36bea8493
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Fri Jun 12 20:54:23 2015 +0800
Delete unused patches
---
debian/patches/01_use_debian_jars.diff | 367 ---------------------
debian/patches/13_fix_javadocs_links.diff | 31 --
.../23_replace_jna-posix_with_jnr-posix.diff | 119 -------
debian/patches/24_pegdown.diff | 101 ------
debian/patches/27_maven.diff | 15 -
debian/patches/28_findbugs.diff | 66 ----
debian/patches/30_envjs.diff | 25 --
debian/patches/31_hamcrest_12.diff | 36 --
debian/patches/90_respect_user_java_home.diff | 20 --
debian/patches/build_comparison_css.diff | 16 -
10 files changed, 796 deletions(-)
diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff
deleted file mode 100644
index c2798ba..0000000
--- a/debian/patches/01_use_debian_jars.diff
+++ /dev/null
@@ -1,367 +0,0 @@
-Description: Build Gradle using libraries available in Debian
-Author: Miguel Landaeta <miguel at miguel.cc>
-Author: Damien Raude-Morvan <drazzib at debian.org
-Forwarded: not-needed
-Last-Update: 2012-08-18
-
---- a/build.gradle
-+++ b/build.gradle
-@@ -17,6 +17,7 @@
- import org.gradle.build.Install
- import org.gradle.build.BuildTypes
- import org.gradle.build.TestReportAggregator
-+import org.apache.ivy.plugins.resolver.FileSystemResolver
-
- defaultTasks 'assemble'
- apply plugin: 'java-base'
-@@ -107,7 +108,11 @@
- group = 'org.gradle'
-
- repositories {
-- maven { url 'http://repo.gradle.org/gradle/libs' }
-+ add(new FileSystemResolver()) {
-+ name = 'repo'
-+ addArtifactPattern "/usr/share/java/[module].[ext]"
-+ addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
-+ }
- }
- }
-
-@@ -193,4 +198,4 @@
- installDirPropertyName = 'gradle_installPath'
- }
-
--apply from: "gradle/intTestImage.gradle"
-\ No newline at end of file
-+apply from: "gradle/intTestImage.gradle"
---- a/buildSrc/build.gradle
-+++ b/buildSrc/build.gradle
-@@ -13,6 +13,7 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-+import org.apache.ivy.plugins.resolver.FileSystemResolver
-
- apply plugin: 'groovy'
- apply plugin: 'checkstyle'
-@@ -21,17 +22,23 @@
- apply plugin: 'eclipse'
-
- repositories {
-- maven { url 'http://repo.gradle.org/gradle/libs' }
-- mavenCentral()
-+ //maven { url 'http://repo.gradle.org/gradle/libs' }
-+ //mavenCentral()
-+ //maven { url '/usr/share/maven-repo/' }
-+ add(new FileSystemResolver()) {
-+ name = 'repo'
-+ addArtifactPattern "/usr/share/java/[module].[ext]"
-+ addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
-+ }
- }
-
- dependencies {
- compile gradleApi()
-- compile 'com.google.guava:guava:11.0.2 at jar'
-+ compile 'com.google.guava:guava:debian at jar'
- compile 'commons-lang:commons-lang:2.6 at jar'
- groovy localGroovy()
-- testCompile 'junit:junit:4.11 at jar'
-- testCompile 'org.spockframework:spock-core:0.7-groovy-1.8 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
-+ testCompile 'junit:junit4:4.x at jar'
-+ testCompile 'org.spockframework:spock-core:0.7-groovy-1.8 at jar', 'cglib:cglib3-nodep:3.x', 'org.objenesis:objenesis:1.2'
-
- compile "org.pegdown:pegdown:1.1.0"
- compile "org.jsoup:jsoup:1.6.3"
---- a/gradle/dependencies.gradle
-+++ b/gradle/dependencies.gradle
-@@ -25,16 +25,16 @@
- dependency 'org.apache.ant:ant-launcher:1.8.4 at jar'
- }
-
--libraries.asm = 'org.ow2.asm:asm-all:4.0 at jar'
-+libraries.asm = 'asm:asm4-all:4.1 at jar'
- libraries.commons_cli = 'commons-cli:commons-cli:1.2 at jar'
- libraries.commons_io = dependencies.module(versions.commons_io)
- libraries.commons_lang = 'commons-lang:commons-lang:2.6 at jar'
--libraries.commons_collections = 'commons-collections:commons-collections:3.2.1 at jar'
-+libraries.commons_collections = 'commons-collections:commons-collections3:3.2.1 at jar'
- libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
- dependency "com.jcraft:jsch:0.1.46"
- }
--libraries.jcip = "net.jcip:jcip-annotations:1.0 at jar"
--libraries.inject = dependencies.module('javax.inject:javax.inject:1')
-+libraries.jcip = "net.jcip:jcip:debian"
-+libraries.inject = dependencies.module('javax.inject:atinject-jsr330-api:1.0')
-
- // Logging
- libraries.slf4j_api = 'org.slf4j:slf4j-api:1.7.2 at jar'
-@@ -54,7 +54,7 @@
- }
-
- // Jetty
--libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211 at jar"
-+libraries.servlet_api = "javax.servlet:servlet-api:2.5 at jar"
- libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
- dependency libraries.slf4j_api
- dependency libraries.servlet_api
-@@ -83,11 +83,13 @@
- jsr305: 'com.google.code.findbugs:jsr305:1.3.9 at jar',
- groovy: 'org.codehaus.groovy:groovy-all:1.8.6 at jar',
- jaxen: 'jaxen:jaxen:1.1 at jar',
-- jcip: "net.jcip:jcip-annotations:1.0 at jar",
-+ jcip: "net.jcip:jcip:debian",
- jna: 'net.java.dev.jna:jna:3.2.7 at jar',
-- junit: 'junit:junit:4.11 at jar',
-+ junit: 'junit:junit4:4.x at jar',
- xmlunit: 'xmlunit:xmlunit:1.3',
-- nekohtml: 'net.sourceforge.nekohtml:nekohtml:1.9.14',
-+ nekohtml: dependencies.module('net.sourceforge.nekohtml:nekohtml:1.9.14') {
-+ dependency "xerces:xercesImpl:debian at jar"
-+ },
- xbean: 'org.apache.xbean:xbean-reflect:3.4 at jar', //required by maven3 classes
- nativePlatform: 'net.rubygrapefruit:native-platform:0.3-rc-2',
- xerces: "xerces:xercesImpl:2.9.1",
-@@ -95,33 +97,33 @@
- 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"
-
- //plexus:
-- dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
-+ dependency "org.codehaus.plexus:plexus-utils2:debian at jar"
- dependency "org.codehaus.plexus:plexus-interpolation:1.14 at jar"
-- dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5 at jar"
-- dependency "org.codehaus.plexus:plexus-container-default:1.5.5 at jar"
-- dependency "org.codehaus.plexus:plexus-classworlds:2.4 at jar"
-+ dependency "org.codehaus.plexus:plexus-component-annotations-1.5:debian at jar"
-+ dependency "org.codehaus.plexus:plexus-container-default-1.5:debian at jar"
-+ dependency "org.codehaus.plexus:plexus-classworlds2:2.4 at jar"
-
- //sonatype plexus
- dependency "org.sonatype.plexus:plexus-cipher:1.7 at jar"
- 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-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-model-builder-3.x:3.x at jar"
-+ dependency "org.apache.maven:maven-model-3.x:3.x at jar"
-
- //somewhat core:
-- dependency "org.apache.maven:maven-artifact:3.0.4 at jar"
-- dependency "org.apache.maven:maven-compat: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.wagon:wagon-provider-api:2.2 at jar"
-+ dependency "org.apache.maven:maven-artifact-3.x:3.x at jar"
-+ dependency "org.apache.maven:maven-compat-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.wagon:wagon-provider-api-2.x:2.x at jar"
-
- //eather:
- dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
-@@ -134,14 +136,14 @@
- 'org.spockframework:spock-core:0.7-groovy-1.8 at jar',
- libraries.groovy,
- libraries.objenesis,
-- 'cglib:cglib-nodep:2.2.2'
-+ 'cglib:cglib3-nodep:3.x'
- ]
- libraries.jmock = [
-- 'org.jmock:jmock:2.5.1',
-+ 'org.jmock:jmock2:2.5.1',
- 'org.hamcrest:hamcrest-core:1.3',
- 'org.hamcrest:hamcrest-library:1.3',
-- dependencies.create('org.jmock:jmock-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
-- 'org.jmock:jmock-legacy:2.5.1',
-+ dependencies.create('org.jmock:jmock2-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
-+ 'org.jmock:jmock2-legacy:2.5.1',
- libraries.objenesis,
-- 'cglib:cglib-nodep:2.2'
-+ 'cglib:cglib3-nodep:3.x'
- ]
---- a/subprojects/core/core.gradle
-+++ b/subprojects/core/core.gradle
-@@ -60,7 +60,7 @@
-
- integTestCompile project(":internalIntegTesting")
-
-- reports 'css3-pie:css3-pie:1.0beta3'
-+ //reports 'css3-pie:css3-pie:1.0beta3'
- }
-
- useTestFixtures()
---- a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
-+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
-@@ -223,15 +223,18 @@
- }
-
- private File findExternalJar(String name) {
-- Pattern pattern = Pattern.compile(Pattern.quote(name) + "-\\d.+\\.jar");
-+ Pattern patternVersion = Pattern.compile(Pattern.quote(name) + "-\\d.+\\.jar");
-+ Pattern pattern = Pattern.compile(Pattern.quote(name) + ".jar");
- for (File file : classpath) {
-- if (pattern.matcher(file.getName()).matches()) {
-+ if (patternVersion.matcher(file.getName()).matches()
-+ || pattern.matcher(file.getName()).matches()) {
- return file;
- }
- }
- for (File libDir : libDirs) {
- for (File file : libDir.listFiles()) {
-- if (pattern.matcher(file.getName()).matches()) {
-+ if (patternVersion.matcher(file.getName()).matches()
-+ || pattern.matcher(file.getName()).matches()) {
- return file;
- }
- }
---- a/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java
-+++ b/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java
-@@ -35,7 +35,7 @@
- HtmlReportRenderer renderer = new HtmlReportRenderer();
- renderer.requireResource(getClass().getResource("/org/gradle/reporting/base-style.css"));
- renderer.requireResource(getClass().getResource("/org/gradle/reporting/report.js"));
-- renderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc"));
-+ //renderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc"));
- renderer.requireResource(getClass().getResource("style.css"));
- renderer.renderer(new ProfilePageRenderer()).writeTo(buildProfile, file);
- }
---- a/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css
-+++ b/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css
-@@ -68,7 +68,7 @@
- margin-right: 25px;
- border: solid 1px #d4d4d4;
- background-color: #f0f0f0;
-- behavior: url(css3-pie-1.0beta3.htc);
-+ /*behavior: url(css3-pie-1.0beta3.htc);*/
- }
-
- ul.tabLinks li:hover {
---- a/subprojects/javascript/javascript.gradle
-+++ b/subprojects/javascript/javascript.gradle
-@@ -17,7 +17,7 @@
- dependencies {
- groovy libraries.groovy
-
-- compile "org.mozilla:rhino:1.7R3"
-+ compile "org.mozilla:js:1.7R3"
- compile "com.google.code.gson:gson:2.2.1" // used by JsHint
- compile "org.simpleframework:simple:4.1.21" // used by http package in envjs
- compile project(':core'), project(":plugins")
---- a/subprojects/jetty/jetty.gradle
-+++ b/subprojects/jetty/jetty.gradle
-@@ -23,22 +23,22 @@
- compile libraries.jetty
- compile libraries.jetty_util
- compile libraries.servlet_api
-- compile module("org.mortbay.jetty:jetty-plus:6.1.25") {
-+ compile module("org.mortbay.jetty:jetty-plus:6.x") {
- dependency libraries.jetty
-- module("org.mortbay.jetty:jetty-naming:6.1.25") {
-+ module("org.mortbay.jetty:jetty-naming:6.x") {
- dependency libraries.jetty
- }
- }
-
-- runtime module("org.mortbay.jetty:jsp-2.1:6.1.14") {
-- dependency "org.eclipse.jdt:core:3.1.1 at jar"
-- dependency "org.mortbay.jetty:jsp-api-2.1:6.1.14 at jar"
-+ runtime module("org.mortbay.jetty:jsp-api:2.1") {
-+ dependency "org.eclipse.jdt:eclipse-ecj:3.1.1 at jar"
-+ dependency "org.mortbay.jetty:jsp-api-2.1:6.x at jar"
- dependency libraries.jetty_util
- dependency libraries.servlet_api
- }
-
-- runtime "org.mortbay.jetty:jetty-annotations:6.1.25 at jar"
-- runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
-+ runtime "org.mortbay.jetty:jetty-annotations:6.x at jar"
-+ //runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
- }
-
--useTestFixtures()
-\ No newline at end of file
-+useTestFixtures()
---- a/subprojects/maven/maven.gradle
-+++ b/subprojects/maven/maven.gradle
-@@ -26,7 +26,7 @@
- compile libraries.maven_ant_tasks
- 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.5:debian at jar"
-
- integTestCompile project(":ear")
- }
---- 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:bndlib:1.50.0')
-+ compile module('biz.aQute:bndlib:debian')
- }
-
- useTestFixtures()
---- a/subprojects/plugins/plugins.gradle
-+++ b/subprojects/plugins/plugins.gradle
-@@ -38,7 +38,7 @@
- compile libraries.commons_lang
- compile libraries.junit
- compile libraries.slf4j_api
-- compile 'org.testng:testng:6.3.1'
-+ compile 'org.testng:testng:5.11 at jar'
-
- provided files(jvm.toolsJar) // for SunJavaCompiler
-
---- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java
-+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java
-@@ -37,7 +37,7 @@
- public DefaultTestReport() {
- htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/report.js"));
- htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/base-style.css"));
-- htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc"));
-+ //htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc"));
- htmlRenderer.requireResource(getClass().getResource("style.css"));
- }
-
---- a/subprojects/plugins/src/main/resources/org/gradle/api/internal/tasks/testing/junit/report/style.css
-+++ b/subprojects/plugins/src/main/resources/org/gradle/api/internal/tasks/testing/junit/report/style.css
-@@ -41,7 +41,7 @@
- border: solid 2px #d0d0d0;
- -moz-border-radius: 10px;
- border-radius: 10px;
-- behavior: url(css3-pie-1.0beta3.htc);
-+ /*behavior: url(css3-pie-1.0beta3.htc);*/
- }
-
- #successRate {
---- a/subprojects/signing/signing.gradle
-+++ b/subprojects/signing/signing.gradle
-@@ -21,9 +21,9 @@
- compile project(":plugins")
- compile project(":maven")
-
-- compile module("org.bouncycastle:bcpg-jdk15:1.46") {
-- dependency "org.bouncycastle:bcprov-jdk15:1.46 at jar"
-+ compile module("org.bouncycastle:bcpg:debian") {
-+ dependency "org.bouncycastle:bcprov:debian at jar"
- }
- }
-
--useTestFixtures()
-\ No newline at end of file
-+useTestFixtures()
diff --git a/debian/patches/13_fix_javadocs_links.diff b/debian/patches/13_fix_javadocs_links.diff
deleted file mode 100644
index f256271..0000000
--- a/debian/patches/13_fix_javadocs_links.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Link javadocs with local -doc packages
-Author: Miguel Landaeta <miguel at miguel.cc>
-Author: Damien Raude-Morvan <drazzib at debian.org
-Forwarded: not-needed
-Last-Update: 2012-08-18
-
---- a/subprojects/docs/docs.gradle
-+++ b/subprojects/docs/docs.gradle
-@@ -291,8 +291,10 @@
- classpath = configurations.userGuideTask
- }
-
--def javaApiUrl = "http://docs.oracle.com/javase/1.5.0/docs/api/"
--def groovyApiUrl = "http://groovy.codehaus.org/gapi/"
-+//def javaApiUrl = "http://docs.oracle.com/javase/1.5.0/docs/api/"
-+def javaApiUrl = "file:///usr/share/doc/default-jdk-doc/api"
-+//def groovyApiUrl = "http://groovy.codehaus.org/gapi/"
-+def groovyApiUrl = "file:///usr/share/doc/groovy-doc/gapi/"
-
- task javadocAll(type: Javadoc) {
- ext.stylesheetFile = file("src/docs/css/javadoc.css")
-@@ -319,8 +321,7 @@
- include 'org/gradle/testing/jacoco/**'
- include 'org/gradle/buildinit/**'
- exclude '**/internal/**'
-- options.links(javaApiUrl, groovyApiUrl, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs",
-- "http://maven.apache.org/ref/2.2.1/maven-model/apidocs")
-+ options.links(javaApiUrl, groovyApiUrl, "file:///usr/share/doc/libmaven2-core-java/api")
- doFirst {
- title = "Gradle API $version"
- }
diff --git a/debian/patches/23_replace_jna-posix_with_jnr-posix.diff b/debian/patches/23_replace_jna-posix_with_jnr-posix.diff
deleted file mode 100644
index b883128..0000000
--- a/debian/patches/23_replace_jna-posix_with_jnr-posix.diff
+++ /dev/null
@@ -1,119 +0,0 @@
-Description: Replace jna-posix library with jnr-posix
- jna-posix is not longer supported and was replaced with jnr-posix.
-Bug-vendor: http://issues.gradle.org/browse/GRADLE-2422
-Author: Miguel Landaeta <miguel at miguel.cc>
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: no
-Last-Update: 2012-08-18
-
---- a/subprojects/native/native.gradle
-+++ b/subprojects/native/native.gradle
-@@ -9,10 +9,13 @@
- compile libraries.slf4j_api
- compile libraries.jna
- compile libraries.nativePlatform
-- compile module('org.jruby.ext.posix:jna-posix:1.0.3') {
-+ compile module('org.jruby.ext.posix:jnr-posix:debian') {
- dependency libraries.jna
- }
-- compile module('org.fusesource.jansi:jansi:1.2.1') {
-+ compile 'org.jruby.extras:constantine:debian'
-+ compile 'org.jruby.extras:jaffl:debian'
-+ compile 'org.jruby.extras:jffi:debian'
-+ compile module('org.fusesource.jansi:jansi:debian') {
- dependency libraries.jna
- }
- compile libraries.guava
---- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
-+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
-@@ -23,8 +23,6 @@
- import org.gradle.internal.os.OperatingSystem;
- import org.gradle.internal.service.DefaultServiceRegistry;
- import org.gradle.internal.service.ServiceRegistry;
--import org.jruby.ext.posix.BaseNativePOSIX;
--import org.jruby.ext.posix.JavaPOSIX;
- import org.jruby.ext.posix.POSIX;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
-@@ -61,7 +59,7 @@
- if (libC != null && (operatingSystem.isLinux() || operatingSystem.isMacOsX())) {
- FilePathEncoder filePathEncoder = createEncoder(libC);
- serviceRegistry.add(Chmod.class, new LibcChmod(libC, filePathEncoder));
-- serviceRegistry.add(Stat.class, new LibCStat(libC, operatingSystem, (BaseNativePOSIX) PosixUtil.current(), filePathEncoder));
-+ serviceRegistry.add(Stat.class, new LibCStat(libC, operatingSystem, PosixUtil.current(), filePathEncoder));
- return;
- }
-
-@@ -95,7 +93,7 @@
-
- private static Stat createStat() {
- POSIX posix = PosixUtil.current();
-- if (posix instanceof JavaPOSIX) {
-+ if (posix.getClass().toString().equals("org.jruby.ext.posix.JavaPOSIX")) {
- return new FallbackStat();
- } else {
- return new PosixStat(posix);
---- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java
-+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java
-@@ -18,9 +18,8 @@
-
- import org.gradle.internal.nativeplatform.jna.LibC;
- import org.gradle.internal.os.OperatingSystem;
--import org.jruby.ext.posix.BaseNativePOSIX;
- import org.jruby.ext.posix.FileStat;
--import org.jruby.ext.posix.Linux64FileStat;
-+import org.jruby.ext.posix.POSIX;
-
- import java.io.File;
- import java.io.IOException;
-@@ -29,9 +28,9 @@
- private final LibC libc;
- private final FilePathEncoder encoder;
- private final OperatingSystem operatingSystem;
-- private final BaseNativePOSIX nativePOSIX;
-+ private final POSIX nativePOSIX;
-
-- public LibCStat(LibC libc, OperatingSystem operatingSystem, BaseNativePOSIX nativePOSIX, FilePathEncoder encoder) {
-+ public LibCStat(LibC libc, OperatingSystem operatingSystem, POSIX nativePOSIX, FilePathEncoder encoder) {
- this.libc = libc;
- this.operatingSystem = operatingSystem;
- this.nativePOSIX = nativePOSIX;
-@@ -39,17 +38,7 @@
- }
-
- public int getUnixMode(File f) throws IOException {
-- FileStat stat = nativePOSIX.allocateStat();
-- initPlatformSpecificStat(stat, encoder.encode(f));
-+ FileStat stat = nativePOSIX.stat(new String(encoder.encode(f)));
- return stat.mode() & 0777;
- }
--
-- private void initPlatformSpecificStat(FileStat stat, byte[] encodedFilePath) {
-- if (operatingSystem.isMacOsX()) {
-- libc.stat(encodedFilePath, stat);
-- } else {
-- final int statVersion = stat instanceof Linux64FileStat ? 3 : 0;
-- libc.__xstat64(statVersion, encodedFilePath, stat);
-- }
-- }
- }
---- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java
-+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java
-@@ -20,6 +20,8 @@
- import org.jruby.ext.posix.POSIXFactory;
- import org.jruby.ext.posix.POSIXHandler;
-
-+import com.kenai.constantine.platform.Errno;
-+
- import java.io.File;
- import java.io.InputStream;
- import java.io.PrintStream;
-@@ -32,7 +34,7 @@
- }
-
- private static class POSIXHandlerImpl implements POSIXHandler {
-- public void error(POSIX.ERRORS error, String message) {
-+ public void error(Errno error, String message) {
- throw new UnsupportedOperationException(error + " - " + message);
- }
-
diff --git a/debian/patches/24_pegdown.diff b/debian/patches/24_pegdown.diff
deleted file mode 100644
index b92a445..0000000
--- a/debian/patches/24_pegdown.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-Description: Disable release notes and PegDown
- org.pegdown is not available in Debian yet, so
- disable release notes inclusion during build
- and remove PegDownProcessor.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Bug-Debian: http://bugs.debian.org/685874
-Forwarded: not-needed
-Last-Update: 2012-08-18
-
---- a/buildSrc/build.gradle
-+++ b/buildSrc/build.gradle
-@@ -40,7 +40,6 @@
- testCompile 'junit:junit4:4.x at jar'
- testCompile 'org.spockframework:spock-core:0.7-groovy-1.8 at jar', 'cglib:cglib3-nodep:3.x', 'org.objenesis:objenesis:1.2'
-
-- compile "org.pegdown:pegdown:1.1.0"
- compile "org.jsoup:jsoup:1.6.3"
-
- //below dependency was deployed to the repo.gradle.org
---- a/buildSrc/src/main/groovy/org/gradle/plugins/pegdown/PegDown.groovy
-+++ b/buildSrc/src/main/groovy/org/gradle/plugins/pegdown/PegDown.groovy
-@@ -21,9 +21,9 @@
- import org.gradle.api.tasks.SourceTask
- import org.gradle.api.tasks.OutputFile
- import org.gradle.api.tasks.TaskAction
--import org.pegdown.Extensions
-+//import org.pegdown.Extensions
- import org.gradle.api.InvalidUserDataException
--import org.pegdown.PegDownProcessor
-+//import org.pegdown.PegDownProcessor
-
- class PegDown extends SourceTask {
-
-@@ -50,11 +50,12 @@
-
- @TaskAction
- void process() {
-- int optionsValue = getCalculatedOptions()
-+ /*int optionsValue = getCalculatedOptions()
- PegDownProcessor processor = new PegDownProcessor(optionsValue)
- String markdown = getSource().singleFile.getText(getInputEncoding())
- String html = processor.markdownToHtml(markdown)
-- getDestination().write(html, getOutputEncoding())
-+ getDestination().write(html, getOutputEncoding())*/
-+ throw new UnsupportedOperationException("PegDown");
- }
-
- int getCalculatedOptions() {
-@@ -63,11 +64,11 @@
-
- protected int toOptionValue(String optionName) {
- String upName = val.toUpperCase()
-- try {
-+ /*try {
- Extensions."$upName"
- } catch (MissingPropertyException e) {
- throw new InvalidUserDataException("$optionName is not a valid PegDown extension name")
-- }
-+ }*/
- }
-
- void options(String... options) {
---- a/subprojects/docs/docs.gradle
-+++ b/subprojects/docs/docs.gradle
-@@ -25,7 +25,6 @@
- import org.apache.tools.ant.filters.ReplaceTokens
-
- apply plugin: 'base'
--apply plugin: 'pegdown'
- apply plugin: 'jsoup'
- apply plugin: 'javascript-base'
-
-@@ -362,9 +361,9 @@
- group = 'documentation'
- }
-
--import org.gradle.plugins.pegdown.PegDown
-+//import org.gradle.plugins.pegdown.PegDown
-
--task editReleaseNotes() {
-+/*task editReleaseNotes() {
- group = "release notes"
- doLast {
- Class.forName("java.awt.Desktop").newInstance().edit(file("src/docs/release/notes.md"))
-@@ -398,14 +397,14 @@
- systemProperty "org.gradle.docs.releasenotes.source", releaseNotesMarkdown.source.singleFile
- systemProperty "org.gradle.docs.releasenotes.rendered", new File(releaseNotes.destinationDir, releaseNotes.fileName)
-
--}
-+}*/
-
- if (project.hasProperty('noDocsTests')) {
- gradle.startParameter.excludedTaskNames << test.path
- }
-
- task docs {
-- dependsOn javadocAll, groovydocAll, userguide, distDocs, samplesDocs, dslHtml, releaseNotes
-+ dependsOn javadocAll, groovydocAll, userguide, distDocs, samplesDocs, dslHtml
- description = 'Generates all documentation'
- group = 'documentation'
- }
diff --git a/debian/patches/27_maven.diff b/debian/patches/27_maven.diff
deleted file mode 100644
index fff07b4..0000000
--- a/debian/patches/27_maven.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-08-18
-
---- a/subprojects/core-impl/core-impl.gradle
-+++ b/subprojects/core-impl/core-impl.gradle
-@@ -58,7 +58,7 @@
- //I'm removing the components.xml file from the sec-dispatcher jar.
- //This file contains only single component so I think we can remove it.
- task.doLast {
-- def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher-1.3.jar"
-+ def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher.jar"
- def plexusSecNoComps = "$plexusSec-noComps"
- ant {
- zip(destfile: plexusSecNoComps, update: true) {
diff --git a/debian/patches/28_findbugs.diff b/debian/patches/28_findbugs.diff
deleted file mode 100644
index ec69d56..0000000
--- a/debian/patches/28_findbugs.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Disable findbugs build.
- com.google.code.findbugs is not available in Debian yet, so
- disable findbugs build in code-quality plugin.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-08-18
-
---- a/subprojects/code-quality/code-quality.gradle
-+++ b/subprojects/code-quality/code-quality.gradle
-@@ -26,8 +26,8 @@
-
- // minimal dependencies to make our code compile
- // we don't ship these dependencies because findbugs plugin will download them (and more) at runtime
-- provided "com.google.code.findbugs:findbugs:2.0.1 at jar"
-- provided "com.google.code.findbugs:bcel:2.0.1 at jar"
-+ //provided "com.google.code.findbugs:findbugs:2.0.1 at jar"
-+ //provided "com.google.code.findbugs:bcel:2.0.1 at jar"
- provided "dom4j:dom4j:1.6.1 at jar"
- provided "jaxen:jaxen:1.1.1 at jar"
- }
---- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsExecuter.java
-+++ b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsExecuter.java
-@@ -16,10 +16,12 @@
-
- package org.gradle.api.plugins.quality.internal.findbugs;
-
-+/*
- import edu.umd.cs.findbugs.FindBugs;
- import edu.umd.cs.findbugs.FindBugs2;
- import edu.umd.cs.findbugs.IFindBugsEngine;
- import edu.umd.cs.findbugs.TextUICommandLine;
-+*/
-
- import java.io.IOException;
- import java.io.Serializable;
-@@ -36,7 +38,7 @@
- final List<String> args = spec.getArguments();
- String[] strArray = new String[args.size()];
- args.toArray(strArray);
--
-+/*
- Thread.currentThread().setContextClassLoader(FindBugs2.class.getClassLoader());
- FindBugs2 findBugs2 = new FindBugs2();
- TextUICommandLine commandLine = new TextUICommandLine();
-@@ -44,15 +46,19 @@
- findBugs2.execute();
-
- return createFindbugsResult(findBugs2);
-+*/
-+ return null;
- } finally {
- Thread.currentThread().setContextClassLoader(contextClassLoader);
- }
- }
-
-+/*
- FindBugsResult createFindbugsResult(IFindBugsEngine findBugs) {
- int bugCount = findBugs.getBugCount();
- int missingClassCount = findBugs.getMissingClassCount();
- int errorCount = findBugs.getErrorCount();
- return new FindBugsResult(bugCount, missingClassCount, errorCount);
- }
--}
-\ No newline at end of file
-+*/
-+}
diff --git a/debian/patches/30_envjs.diff b/debian/patches/30_envjs.diff
deleted file mode 100644
index 877e58c..0000000
--- a/debian/patches/30_envjs.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Disable envjs build.
- org.simpleframework is not available in Debian yet, so
- disable envjs build in javascript plugin.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-08-18
-
---- a/subprojects/javascript/javascript.gradle
-+++ b/subprojects/javascript/javascript.gradle
-@@ -19,7 +19,7 @@
-
- compile "org.mozilla:js:1.7R3"
- compile "com.google.code.gson:gson:2.2.1" // used by JsHint
-- compile "org.simpleframework:simple:4.1.21" // used by http package in envjs
-+ //compile "org.simpleframework:simple:4.1.21" // used by http package in envjs
- compile project(':core'), project(":plugins")
- compile libraries.inject
-
-@@ -27,4 +27,6 @@
- compile project(':coreImpl')
- }
-
-+sourceSets.main.groovy.excludes = ['**/org/gradle/plugins/javascript/envjs/**']
-+
- useTestFixtures()
diff --git a/debian/patches/31_hamcrest_12.diff b/debian/patches/31_hamcrest_12.diff
deleted file mode 100644
index 21df9db..0000000
--- a/debian/patches/31_hamcrest_12.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Small fixes for Hamcrest 1.2 compat
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-09-03
-
---- a/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java
-+++ b/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java
-@@ -273,16 +273,16 @@
- }
-
- @Factory
-- public static Matcher<Task> dependsOn(Matcher<? extends Iterable<String>> matcher) {
-+ public static Matcher<Task> dependsOn(Matcher matcher) {
- return dependsOn(matcher, false);
- }
-
- @Factory
-- public static Matcher<Task> dependsOnPaths(Matcher<? extends Iterable<String>> matcher) {
-+ public static Matcher<Task> dependsOnPaths(Matcher matcher) {
- return dependsOn(matcher, true);
- }
-
-- private static Matcher<Task> dependsOn(final Matcher<? extends Iterable<String>> matcher, final boolean matchOnPaths) {
-+ private static Matcher<Task> dependsOn(final Matcher matcher, final boolean matchOnPaths) {
- return new BaseMatcher<Task>() {
- public boolean matches(Object o) {
- Task task = (Task) o;
-@@ -312,7 +312,7 @@
- }
-
- @Factory
-- public static <T extends Buildable> Matcher<T> builtBy(final Matcher<? extends Iterable<String>> matcher) {
-+ public static <T extends Buildable> Matcher<T> builtBy(final Matcher matcher) {
- return new BaseMatcher<T>() {
- public boolean matches(Object o) {
- Buildable task = (Buildable) o;
diff --git a/debian/patches/90_respect_user_java_home.diff b/debian/patches/90_respect_user_java_home.diff
deleted file mode 100644
index f01aff9..0000000
--- a/debian/patches/90_respect_user_java_home.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Respect JAVA_HOME if users already set it
-Author: Miguel Landaeta <nomadium at debian.org>
-Bug-Debian: http://bugs.debian.org/719814
-Forwarded: no
-Last-Update: 2014-05-13
-
---- a/build/distributions/bin/gradle-1.5/bin/gradle 2014-05-13 16:54:18.370234000 -0300
-+++ b/build/distributions/bin/gradle-1.5/bin/gradle 2014-05-13 17:04:16.766234000 -0300
-@@ -67,6 +67,11 @@
-
- CLASSPATH=$APP_HOME/lib/gradle-launcher-1.5.jar
-
-+# Only set JAVA_HOME if the user hasn't set anything about it
-+if [ -z "$JAVA_HOME" ] ; then
-+ export JAVA_HOME=/usr/lib/jvm/default-java
-+fi
-+
- # Determine the Java command to use to start the JVM.
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
diff --git a/debian/patches/build_comparison_css.diff b/debian/patches/build_comparison_css.diff
deleted file mode 100644
index 81ea949..0000000
--- a/debian/patches/build_comparison_css.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/subprojects/build-comparison/build-comparison.gradle
-+++ b/subprojects/build-comparison/build-comparison.gradle
-@@ -29,11 +29,13 @@
- testCompile libraries.jsoup
- }
-
-+/*
- processResources {
- into "org/gradle/api/plugins/buildcomparison/render/internal/html", {
- from { project(":docs").css }
- include "base.css"
- }
- }
-+*/
-
- useTestFixtures()
--
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