[gradle] 05/05: Refresh patches
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Thu Jul 2 14:20:56 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.
commit b5bd294d8773a1831ee24f9cda3bdb2a2e9d6500
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Thu Jul 2 22:19:03 2015 +0800
Refresh patches
---
debian/changelog | 13 +
debian/control | 5 -
debian/patches/03_plexus.diff | 17 --
debian/patches/11_fix_jni_path.diff | 30 ---
debian/patches/26_disable_commitid.diff | 4 +-
debian/patches/30_envjs.diff | 2 +-
debian/patches/33_scala_zinc.diff | 40 ++--
debian/patches/34_disable_code_quality.diff | 9 +-
debian/patches/35_ivy_23.diff | 54 -----
debian/patches/36_java8_compatibility.diff | 25 --
debian/patches/37_replace_internal_testng_api.diff | 21 --
debian/patches/38_use_jdk7_nio_file_api.diff | 32 ---
.../39_ignore_test_processor_assertion.diff | 13 -
debian/patches/bintray_api.diff | 43 ----
debian/patches/bintray_dependencies.diff | 24 --
debian/patches/build_init.diff | 6 +-
debian/patches/disable_buildSrc_tests.diff | 10 +-
debian/patches/disable_distributions.diff | 6 +-
debian/patches/disable_release_notes.diff | 19 +-
debian/patches/disable_sonar.diff | 53 ++--
debian/patches/disable_tests.diff | 72 +++---
debian/patches/docs.diff | 117 ++++-----
debian/patches/remove_test_dependencies.diff | 135 +++++------
debian/patches/search_system_jar.diff | 13 +-
debian/patches/series | 11 -
debian/patches/use_local_artifacts.diff | 266 +++++++++++----------
26 files changed, 373 insertions(+), 667 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 89d48ca..d0db850 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,19 @@ gradle (2.4-1) UNRELEASED; urgency=low
* d/watch: Watch services.gradle.org
* d/copyright: Add Files-Excluded for uscan
* d/rules: Simplify get-orig-source target
+ * Drop multiple patches under d/patches/:
+ - 03_plexus.diff
+ - 11_fix_jni_path.diff
+ - 35_ivy_23.diff
+ - 36_java8_compatibility.diff
+ - 37_replace_internal_testng_api.diff
+ - 38_use_jdk7_nio_file_api.diff
+ - 39_ignore_test_processor_assertion.diff
+ - bintray_api.diff
+ - bintray_dependencies.diff
+ - diagnostics_jquery.diff
+ - disable_css3pie.diff
+
-- Kai-Chung Yan <seamlikok at gmail.com> Sun, 28 Jun 2015 19:28:30 +0800
gradle (1.12-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 47357e8..5a63bd4 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Build-Depends: ant,
libantlr-java,
libasm4-java (>= 5),
libatinject-jsr330-api-java,
- libbintray-client-java (>= 0.8.1),
libbcpg-java,
libclassycle-java,
libcommons-cli-java,
@@ -51,7 +50,6 @@ Build-Depends: ant,
libjs-jquery,
libkryo-java,
liblogback-java,
- libmaven-ant-tasks-java,
libmaven2-core-java-doc,
libnative-platform-java (>= 0.10),
libnekohtml-java,
@@ -108,7 +106,6 @@ Depends: ant,
ivy,
libasm4-java (>= 5),
libatinject-jsr330-api-java,
- libbintray-client-java (>= 0.8.1),
libcommons-collections3-java,
libcommons-io-java,
libcommons-lang-java (>= 2.6),
@@ -124,7 +121,6 @@ Depends: ant,
libjsch-java,
libkryo-java,
liblogback-java,
- libmaven-ant-tasks-java,
libnative-platform-java (>= 0.10),
libnekohtml-java,
libreflectasm-java,
@@ -163,7 +159,6 @@ Depends: ant-optional,
libjetty-java,
libjetty-extra-java,
libjs-jquery,
- libmaven-ant-tasks-java,
libobjenesis-java,
libplexus-containers1.5-java,
libpolyglot-maven-java,
diff --git a/debian/patches/03_plexus.diff b/debian/patches/03_plexus.diff
deleted file mode 100644
index 35fe469..0000000
--- a/debian/patches/03_plexus.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Plexus compatibility
-Author: Miguel Landaeta <miguel at miguel.cc>
-Author: Damien Raude-Morvan <drazzib at debian.org
-Forwarded: no
-Last-Update: 2012-08-18
-
---- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java
-+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java
-@@ -95,4 +95,8 @@
- public String getName() {
- return logger.getName();
- }
-+
-+ public void setThreshold(int level) {
-+ throw new UnsupportedOperationException("setThreshold");
-+ }
- }
diff --git a/debian/patches/11_fix_jni_path.diff b/debian/patches/11_fix_jni_path.diff
deleted file mode 100644
index cdeb28f..0000000
--- a/debian/patches/11_fix_jni_path.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Try to search jnidispatch.so library first in /usr/lib/jni
- instead of storageDir. If found in /usr/lib/jni, set
- jna.boot.library.path.
-Author: Miguel Landaeta <miguel at miguel.cc>
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: no
-Last-Update: 2013-01-12
-
---- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java
-+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java
-@@ -36,9 +36,17 @@
- */
- public void configure(File storageDir) {
- String nativePrefix = OperatingSystem.current().getNativePrefix();
-- File tmpDir = new File(storageDir, String.format("jna/%s", nativePrefix));
-- tmpDir.mkdirs();
-+ File tmpDir = new File(storageDir, "jni/");
- String jnaLibName = OperatingSystem.current().isMacOsX() ? "libjnidispatch.jnilib" : System.mapLibraryName("jnidispatch");
-+
-+ // Try to load /usr/lib/jni/jnidispatch.so first before storageDir
-+ File usrDir = new File("/usr/lib/jni/");
-+ File usrLibFile = new File(usrDir, jnaLibName);
-+ if (usrLibFile.isFile()) {
-+ System.setProperty("jna.boot.library.path", usrDir.getAbsolutePath());
-+ return;
-+ }
-+
- File libFile = new File(tmpDir, jnaLibName);
- if (!libFile.exists()) {
- String resourceName = "/com/sun/jna/" + nativePrefix + "/" + jnaLibName;
diff --git a/debian/patches/26_disable_commitid.diff b/debian/patches/26_disable_commitid.diff
index dfe376e..0ba10d3 100644
--- a/debian/patches/26_disable_commitid.diff
+++ b/debian/patches/26_disable_commitid.diff
@@ -25,8 +25,8 @@ Last-Update: 2012-08-18
ext.receiptFile = file("$buildDir/$buildReceiptFileName")
outputs.file receiptFile
outputs.upToDateWhen { false }
-@@ -112,7 +112,7 @@
- hostName = "unknown"
+@@ -122,7 +122,7 @@
+ }
}
def data = [
- commitId: determineCommitId.commitId,
diff --git a/debian/patches/30_envjs.diff b/debian/patches/30_envjs.diff
index 0968f7a..a1ccf6f 100644
--- a/debian/patches/30_envjs.diff
+++ b/debian/patches/30_envjs.diff
@@ -16,7 +16,7 @@ Last-Update: 2012-08-18
compile libraries.inject
@@ -27,4 +26,6 @@
- compile project(':coreImpl')
+ compile project(':dependencyManagement')
}
+sourceSets.main.groovy.excludes = ["org/gradle/plugins/javascript/envjs/**"]
diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff
index b5df0fd..ea75bac 100644
--- a/debian/patches/33_scala_zinc.diff
+++ b/debian/patches/33_scala_zinc.diff
@@ -2,23 +2,28 @@ Description: No Zinc Compiler (https://github.com/typesafehub/zinc) in Debian.
Zinc depends on SBT compiler and SBT is not yet in Debian
See SBT ITP : http://bugs.debian.org/639910
Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2015-06-03
+ Kai-Chung Yan <seamlikok at gmail.com>
+Last-Update: 2015-07-02
Forwarded: not-needed
---- a/subprojects/scala/scala.gradle
-+++ b/subprojects/scala/scala.gradle
-@@ -23,14 +23,20 @@
+--- a/subprojects/language-scala/language-scala.gradle
++++ b/subprojects/language-scala/language-scala.gradle
+@@ -5,8 +5,6 @@
+ compile project(":platformJvm")
+ compile project(":languageJava")
compile project(":languageJvm")
- compile project(":plugins")
-
-- // keep in sync with ScalaBasePlugin code
+- // keep in sync with ScalaLanguagePlugin code
- provided("com.typesafe.zinc:zinc:0.3.0")
--
- testCompile libraries.slf4j_api
-
- integTestRuntime project(":ide")
+
+ testCompile libraries.groovy
}
-
-+// Disable Zinc compiler
+@@ -14,4 +12,12 @@
+ strictCompile()
+ useTestFixtures()
+ useTestFixtures(project: ":languageJvm", sourceSet: 'testFixtures')
+-useTestFixtures(project: ":platformBase")
+\ No newline at end of file
++useTestFixtures(project: ":platformBase")
++
+sourceSets {
+ main {
+ groovy {
@@ -26,13 +31,10 @@ Forwarded: not-needed
+ }
+ }
+}
-+
- useTestFixtures(project: ":plugins") // includes core test fixtures
-
- configure([integTest, daemonIntegTest]) {
+\ 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
-@@ -149,15 +149,7 @@
+@@ -120,15 +120,7 @@
private void configureCompileDefaults() {
project.tasks.withType(ScalaCompile.class) { ScalaCompile compile ->
compile.conventionMapping.scalaClasspath = { scalaRuntime.inferScalaClasspath(compile.classpath) }
@@ -40,7 +42,7 @@ Forwarded: not-needed
- def config = project.configurations[ZINC_CONFIGURATION_NAME]
- if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) {
- project.dependencies {
-- zinc("com.typesafe.zinc:zinc:$DEFAULT_ZINC_VERSION")
+- zinc("com.typesafe.zinc:zinc:$DefaultScalaToolProvider.DEFAULT_ZINC_VERSION")
- }
- }
- config
diff --git a/debian/patches/34_disable_code_quality.diff b/debian/patches/34_disable_code_quality.diff
index 228f9cd..dfe939b 100644
--- a/debian/patches/34_disable_code_quality.diff
+++ b/debian/patches/34_disable_code_quality.diff
@@ -8,21 +8,18 @@ Last-Update: 2013-08-11
Forwarded: not-needed
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
-@@ -15,8 +15,8 @@
+@@ -15,8 +15,6 @@
*/
apply plugin: 'groovy'
-apply plugin: 'checkstyle'
-apply plugin: 'codenarc'
-+//apply plugin: 'checkstyle'
-+//apply plugin: 'codenarc'
apply plugin: 'idea'
apply plugin: 'eclipse'
-@@ -42,5 +42,5 @@
- compile "com.googlecode.jarjar:jarjar:[1.2.1, )"
+@@ -43,5 +41,4 @@
}
apply from: '../gradle/compile.gradle'
+ apply from: '../gradle/taskOrdering.gradle'
-apply from: '../gradle/codeQuality.gradle'
-+//apply from: '../gradle/codeQuality.gradle'
apply from: '../gradle/classycle.gradle'
diff --git a/debian/patches/35_ivy_23.diff b/debian/patches/35_ivy_23.diff
deleted file mode 100644
index 7332479..0000000
--- a/debian/patches/35_ivy_23.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Fix compilation errors with Ivy API
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Last-Update: 2015-06-08
---- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NoOpRepositoryCacheManager.java
-+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NoOpRepositoryCacheManager.java
-@@ -73,4 +73,15 @@
-
- public void saveResolvedRevision(ModuleRevisionId dynamicMrid, String revision) {
- }
-+
-+ @Override
-+ public org.apache.ivy.core.report.ArtifactDownloadReport downloadRepositoryResource(org.apache.ivy.plugins.repository.Resource resource,
-+ String name,
-+ String type,
-+ String extension,
-+ org.apache.ivy.core.cache.CacheResourceOptions options,
-+ org.apache.ivy.plugins.repository.Repository repository) {
-+ return null;
-+ }
-+
- }
---- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManager.java
-+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManager.java
-@@ -158,4 +158,13 @@
- return new ResolvedModuleRevision(resolver, resolver, md, madr);
- }
-
-+ @Override
-+ public org.apache.ivy.core.report.ArtifactDownloadReport downloadRepositoryResource(org.apache.ivy.plugins.repository.Resource resource,
-+ String name,
-+ String type,
-+ String extension,
-+ org.apache.ivy.core.cache.CacheResourceOptions options,
-+ org.apache.ivy.plugins.repository.Repository repository) {
-+ return null;
-+ }
- }
---- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/LocalFileRepositoryCacheManager.java
-+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/LocalFileRepositoryCacheManager.java
-@@ -85,4 +85,14 @@
- ModuleDescriptor descriptor = parseModuleDescriptor(resolver, moduleArtifact, options, file, resolvedResource.getResource());
- return new ResolvedModuleRevision(resolver, resolver, descriptor, report);
- }
-+
-+ @Override
-+ public org.apache.ivy.core.report.ArtifactDownloadReport downloadRepositoryResource(org.apache.ivy.plugins.repository.Resource resource,
-+ String name,
-+ String type,
-+ String extension,
-+ org.apache.ivy.core.cache.CacheResourceOptions options,
-+ org.apache.ivy.plugins.repository.Repository repository) {
-+ return null;
-+ }
- }
diff --git a/debian/patches/36_java8_compatibility.diff b/debian/patches/36_java8_compatibility.diff
deleted file mode 100644
index d64a5a6..0000000
--- a/debian/patches/36_java8_compatibility.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fixes the compilation errors with Java 8
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
-Last-Update: 2015-05-24
---- a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java
-+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java
-@@ -335,7 +335,7 @@
- return;
- }
-
-- Annotation optional = annotationTarget.getAnnotation(Optional.class);
-+ Annotation optional = annotationTarget.getAnnotation(org.gradle.api.tasks.Optional.class);
- if (optional == null) {
- propertyInfo.setNotNullValidator(notNullValidator);
- }
---- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java
-+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java
-@@ -22,6 +22,7 @@
- import org.gradle.api.internal.project.IsolatedAntBuilder;
- import org.gradle.api.logging.LogLevel;
- import org.gradle.api.tasks.*;
-+import org.gradle.api.tasks.Optional;
-
- import java.io.File;
- import java.io.Serializable;
diff --git a/debian/patches/37_replace_internal_testng_api.diff b/debian/patches/37_replace_internal_testng_api.diff
deleted file mode 100644
index 15734ca..0000000
--- a/debian/patches/37_replace_internal_testng_api.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Import the Sets class from Guava instead of testng (the class has been removed from testng 6.9.0)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Bug: https://github.com/gradle/gradle/pull/470
---- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/ProjectDependencyArtifactIdExtractorHack.java
-+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/ProjectDependencyArtifactIdExtractorHack.java
-@@ -17,6 +17,7 @@
- package org.gradle.api.publication.maven.internal.ant;
-
- import com.google.common.collect.Lists;
-+import com.google.common.collect.Sets;
- import org.apache.maven.project.MavenProject;
- import org.gradle.api.Nullable;
- import org.gradle.api.Project;
-@@ -26,7 +27,6 @@
- import org.gradle.api.artifacts.repositories.ArtifactRepository;
- import org.gradle.api.plugins.BasePluginConvention;
- import org.gradle.api.tasks.Upload;
--import org.testng.internal.annotations.Sets;
-
- import java.util.Collection;
- import java.util.Set;
diff --git a/debian/patches/38_use_jdk7_nio_file_api.diff b/debian/patches/38_use_jdk7_nio_file_api.diff
deleted file mode 100644
index f6ddd7a..0000000
--- a/debian/patches/38_use_jdk7_nio_file_api.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Use the JDK 7 API for the chmod/stat operations until jnr-posix
-is fixed in sid
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
-Last-Update: 2015-06-08
---- 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
-@@ -52,22 +52,14 @@
- LibC libC = loadLibC();
- Symlink symlink = symlink(libC);
-
-- // Use libc backed implementations on Linux, if libc available
-- POSIX posix = PosixUtil.current();
-- if ((libC != null && (operatingSystem.isLinux())) && posix instanceof BaseNativePOSIX) {
-- FilePathEncoder filePathEncoder = new DefaultFilePathEncoder(libC);
-- Chmod chmod = new LibcChmod(libC, filePathEncoder);
-- Stat stat = new LibCStat(libC, operatingSystem, (BaseNativePOSIX) posix, filePathEncoder);
-- return new GenericFileSystem(chmod, stat, symlink);
-- }
--
- // Use java 7 APIs, if available
-- if (JavaVersion.current().isJava7()) {
-+ if (true) {
- String jdkFilePermissionclass = "org.gradle.internal.nativeplatform.filesystem.jdk7.PosixJdk7FilePermissionHandler";
- try {
- Object handler = FileSystemServices.class.getClassLoader().loadClass(jdkFilePermissionclass).newInstance();
- return new GenericFileSystem((Chmod) handler, (Stat) handler, symlink);
- } catch (ClassNotFoundException e) {
-+e.printStackTrace();
- LOGGER.warn(String.format("Unable to load %s. Continuing with fallback.", jdkFilePermissionclass));
- } catch (Exception e) {
- throw UncheckedException.throwAsUncheckedException(e);
diff --git a/debian/patches/39_ignore_test_processor_assertion.diff b/debian/patches/39_ignore_test_processor_assertion.diff
deleted file mode 100644
index 2204c7e..0000000
--- a/debian/patches/39_ignore_test_processor_assertion.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Remove a failing assertion in JUnitTestEventAdapter (classloader issue?)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/JUnitTestEventAdapter.java
-+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/JUnitTestEventAdapter.java
-@@ -42,7 +42,6 @@
-
- public JUnitTestEventAdapter(TestResultProcessor resultProcessor, TimeProvider timeProvider,
- IdGenerator<?> idGenerator) {
-- assert resultProcessor instanceof ThreadSafe;
- this.resultProcessor = resultProcessor;
- this.timeProvider = timeProvider;
- this.idGenerator = idGenerator;
diff --git a/debian/patches/bintray_api.diff b/debian/patches/bintray_api.diff
deleted file mode 100644
index 280bdbf..0000000
--- a/debian/patches/bintray_api.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Gradle 1.12 uses bintray-client-java 0.1.0 but the API usage
- has been changed a lot in 0.8.1. This patch adapts the API
- usage of bintray-client-java 0.8.1.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-06-08
---- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterPluginMapper.java
-+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterPluginMapper.java
-@@ -66,13 +66,19 @@
- }
-
- Bintray bintrayClient = createBintrayClient();
-- List<Pkg> results = bintrayClient.
-- subject(GRADLE_PLUGINS_ORG).
-- repository(GRADLE_PLUGINS_REPO).
-- searchForPackage().
-- byAttributeName(PLUGIN_ID_ATTRIBUTE_NAME).
-- equals(pluginId).
-- search();
-+ List<Pkg> results;
-+ try {
-+ results = bintrayClient.
-+ subject(GRADLE_PLUGINS_ORG).
-+ repository(GRADLE_PLUGINS_REPO).
-+ searchForPackage().
-+ byAttributeName(PLUGIN_ID_ATTRIBUTE_NAME).
-+ equalsVal(pluginId).
-+ searchPackage();
-+ }
-+ catch (java.io.IOException e) {
-+ results = new java.util.ArrayList<Pkg>();
-+ }
-
- String systemId;
-
-@@ -99,7 +105,7 @@
- private Bintray createBintrayClient() {
- String override = System.getProperty(BINTRAY_API_OVERRIDE_URL_PROPERTY);
- if (override == null) {
-- return BintrayClient.create();
-+ return BintrayClient.create(BintrayClient.BINTRAY_API_URL, null, null);
- } else {
- return BintrayClient.create(override, null, null);
- }
diff --git a/debian/patches/bintray_dependencies.diff b/debian/patches/bintray_dependencies.diff
deleted file mode 100644
index 014e314..0000000
--- a/debian/patches/bintray_dependencies.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: In the latest bintray-client-java, bintray-client-java-impl has
- been renamed to bintray-client-java-service.
- Gradle also uses APIs not only in bintray-client-java-services.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-06-08
---- a/subprojects/core/core.gradle
-+++ b/subprojects/core/core.gradle
-@@ -48,7 +48,7 @@
-
- runtime project(":docs")
-
-- compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-impl', version: '0.1.0') {
-+ compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-service') {
- exclude module:'groovy-all'
- exclude module:'groovy'
- exclude group: 'org.slf4j'
-@@ -57,6 +57,7 @@
- exclude module: 'httpclient'
- exclude module: 'nekohtml'
- }
-+ compile "com.jfrog.bintray.client:bintray-client-java-api"
- compile libraries.commons_httpclient // Needed by bintray client
-
- runtime libraries.log4j_to_slf4j
diff --git a/debian/patches/build_init.diff b/debian/patches/build_init.diff
index 042d92e..68e3786 100644
--- a/debian/patches/build_init.diff
+++ b/debian/patches/build_init.diff
@@ -10,11 +10,11 @@ Last-Update: 2015-06-09
-dependencies {
- components {
-- eachComponent { ComponentMetadataDetails details ->
+- all { ComponentMetadataDetails details ->
- def version = details.id.version
- if(version.matches("(\\d\\.?)+")){
- details.status = "release"
-- }else{
+- } else {
- details.status = "integration"
- }
- details.statusScheme = ["integration", "release"]
@@ -25,7 +25,7 @@ Last-Update: 2015-06-09
task generateTemplateVersionFile(type: GenerateVersionProperties) {
outputFile = new File(generatedResourcesDir, "org/gradle/buildinit/tasks/templates/library-versions.properties")
}
-@@ -77,7 +63,7 @@
+@@ -80,7 +66,7 @@
def templateVersionConfiguration = project.configurations.detachedConfiguration(libDependencies as Dependency[])
templateVersionConfiguration.transitive = false
ResolutionResult resolutionResult = templateVersionConfiguration.incoming.resolutionResult
diff --git a/debian/patches/disable_buildSrc_tests.diff b/debian/patches/disable_buildSrc_tests.diff
index a360f05..f1f5c71 100644
--- a/debian/patches/disable_buildSrc_tests.diff
+++ b/debian/patches/disable_buildSrc_tests.diff
@@ -4,18 +4,18 @@ Author: Kai-Chung Yan <seamlikok at gmail.com>
Last-Update: 2015-06-03
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
-@@ -30,8 +30,6 @@
+@@ -28,8 +28,6 @@
compile 'com.google.guava:guava:[14.0.1, )@jar'
compile 'commons-lang:commons-lang:2.6 at jar'
compile 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:junit:4.12 at jar'
+- testCompile 'org.spockframework:spock-core:0.7-groovy-2.0 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
compile "org.pegdown:pegdown:1.1.0"
compile "org.jsoup:jsoup:1.6.3"
-@@ -44,3 +42,15 @@
+@@ -42,3 +40,15 @@
apply from: '../gradle/compile.gradle'
- //apply from: '../gradle/codeQuality.gradle'
+ apply from: '../gradle/taskOrdering.gradle'
apply from: '../gradle/classycle.gradle'
+
+// Disable buildSrc tests
diff --git a/debian/patches/disable_distributions.diff b/debian/patches/disable_distributions.diff
index 59459c2..6507b1b 100644
--- a/debian/patches/disable_distributions.diff
+++ b/debian/patches/disable_distributions.diff
@@ -15,8 +15,8 @@ Last-Update: 2015-05-28
include 'core'
--- a/build.gradle
+++ b/build.gradle
-@@ -185,8 +185,9 @@
- projects = subprojects
+@@ -197,8 +197,9 @@
+ }
}
-evaluationDependsOn ":distributions"
@@ -26,7 +26,7 @@ Last-Update: 2015-05-28
task install(type: Install) {
description = 'Installs the minimal distribution into directory $gradle_installPath'
group = 'build'
-@@ -200,6 +201,6 @@
+@@ -212,6 +213,6 @@
with project(":distributions").allDistImage
installDirPropertyName = 'gradle_installPath'
}
diff --git a/debian/patches/disable_release_notes.diff b/debian/patches/disable_release_notes.diff
index 5505e45..f61980e 100644
--- a/debian/patches/disable_release_notes.diff
+++ b/debian/patches/disable_release_notes.diff
@@ -1,10 +1,10 @@
Description: libpegdown-java_1.4.2-1 and libparboiled-java_1.1.6-1 do not
work well, so we need disable the release notes compilation.
Author: Kai-Chung Yan
-Last-Update: 2015-06-12
+Last-Update: 2015-07-02
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
-@@ -82,7 +82,7 @@
+@@ -83,7 +83,7 @@
builtBy 'distDocs'
}
outputs.docs = files(docsDir) {
@@ -13,7 +13,7 @@ Last-Update: 2015-06-12
}
tasks.withType(Docbook2Xhtml) {
-@@ -369,48 +369,10 @@
+@@ -390,31 +390,6 @@
group = 'documentation'
}
@@ -39,15 +39,14 @@ Last-Update: 2015-06-12
- from releaseNotesMarkdown
- jsoup.plugins "src/transforms/release-notes.gradle"
- filter(ReplaceTokens, tokens: [version: project.version.toString(), versionBase: rootProject.versionBase])
+- ext.entryPoint = file("$docsDir/$fileName")
-}
-
--task viewReleaseNotes(dependsOn: releaseNotes) {
-- group = "release notes"
-- doLast {
-- Class.forName("java.awt.Desktop").newInstance().browse(new File(releaseNotes.destinationDir, releaseNotes.fileName).toURI())
-- }
--}
--
+ tasks.addRule("view«Doc Task Name» - Opens entry point") { String taskName ->
+ if (taskName.startsWith("view")) {
+ def realTaskName = (taskName - "view")
+@@ -433,15 +408,8 @@
+
sourceSets.main.output.dir generatedResourcesDir, builtBy: defaultImports
-test {
diff --git a/debian/patches/disable_sonar.diff b/debian/patches/disable_sonar.diff
index 62c41f6..01a95c0 100644
--- a/debian/patches/disable_sonar.diff
+++ b/debian/patches/disable_sonar.diff
@@ -1,42 +1,30 @@
Description: Disable Sonar features since it is not available in Debian yet
Author: Miguel Landaeta <miguel at miguel.cc>
-Author: Damien Raude-Morvan <drazzib at debian.org
+ Damien Raude-Morvan <drazzib at debian.org>
Forwarded: not-needed
-Last-Update: 2012-08-18
+Last-Update: 2015-07-02
--- a/build.gradle
+++ b/build.gradle
-@@ -92,7 +92,7 @@
- publishedProjects = [project(':core'), project(':toolingApi'), project(':wrapper'), project(':baseServices'), project(':messaging')]
+@@ -90,7 +90,7 @@
+ publicGroovyProjects = groovyProjects - internalProjects
pluginProjects = [
'plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven',
-- 'ide', 'announce', 'scala', 'sonar', 'signing', 'cpp', 'ear', 'javascript', 'buildComparison',
-+ 'ide', 'announce', 'scala', 'signing', 'cpp', 'ear', 'javascript', 'buildComparison',
- 'diagnostics', 'reporting', 'publish', 'ivy', 'jacoco', 'buildInit', 'languageJvm', 'languageBase'
- ].collect {
- project(it)
+- 'ide', 'announce', 'scala', 'sonar', 'signing', 'ear', 'javascript', 'buildComparison',
++ 'ide', 'announce', 'scala', 'signing', 'ear', 'javascript', 'buildComparison',
+ 'diagnostics', 'reporting', 'publish', 'ivy', 'jacoco', 'buildInit', 'platformBase',
+ 'platformJvm', 'languageJvm', 'languageJava', 'languageGroovy', 'languageScala',
+ 'platformNative', 'platformPlay', 'languageNative', 'ideNative', 'testingNative',
--- a/settings.gradle
+++ b/settings.gradle
-@@ -36,7 +36,6 @@
- include 'openApi'
+@@ -41,7 +41,6 @@
include 'toolingApi'
+ include 'toolingApiBuilders'
include 'docs'
-include 'sonar'
include 'signing'
- include 'cpp'
include 'ear'
---- a/subprojects/docs/src/docs/dsl/dsl.xml
-+++ b/subprojects/docs/src/docs/dsl/dsl.xml
-@@ -364,9 +364,6 @@
- <td>org.gradle.plugins.signing.Sign</td>
- </tr>
- <tr>
-- <td>org.gradle.api.plugins.sonar.SonarAnalyze</td>
-- </tr>
-- <tr>
- <td>org.gradle.api.tasks.Sync</td>
- </tr>
- <tr>
+ include 'native'
--- a/subprojects/docs/src/docs/userguide/sonarPlugin.xml
+++ b/subprojects/docs/src/docs/userguide/sonarPlugin.xml
@@ -223,9 +223,8 @@
@@ -53,7 +41,7 @@ Last-Update: 2012-08-18
+</chapter>
--- a/subprojects/docs/src/docs/userguide/userguide.xml
+++ b/subprojects/docs/src/docs/userguide/userguide.xml
-@@ -61,8 +61,6 @@
+@@ -60,8 +60,6 @@
<xi:include href='jdependPlugin.xml'/>
<xi:include href='pmdPlugin.xml'/>
<xi:include href='jacocoPlugin.xml'/>
@@ -62,3 +50,18 @@ Last-Update: 2012-08-18
<xi:include href='osgi.xml'/>
<xi:include href='eclipsePlugin.xml'/>
<xi:include href='ideaPlugin.xml'/>
+--- a/subprojects/docs/src/docs/dsl/dsl.xml
++++ b/subprojects/docs/src/docs/dsl/dsl.xml
+@@ -391,12 +391,6 @@
+ <td>org.gradle.plugins.signing.Sign</td>
+ </tr>
+ <tr>
+- <td>org.gradle.api.plugins.sonar.SonarAnalyze</td>
+- </tr>
+- <tr>
+- <td>org.gradle.sonar.runner.tasks.SonarRunner</td>
+- </tr>
+- <tr>
+ <td>org.gradle.api.tasks.Sync</td>
+ </tr>
+ <tr>
diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index 9abb26a..7d231ae 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -1,18 +1,18 @@
Description: Disable tests
Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-05-28
+Last-Update: 2015-07-02
--- a/build.gradle
+++ b/build.gradle
-@@ -108,8 +108,6 @@
- apply from: "gradle/eclipse.gradle"
+@@ -120,8 +120,6 @@
apply from: "gradle/classycle.gradle"
+ apply from: "gradle/strictCompile.gradle"
apply from: "gradle/noDependencyResolutionDuringConfiguration.gradle"
-apply from: "gradle/testSetup.gradle"
-apply from: "gradle/testGroupings.gradle"
+ apply from: "gradle/taskOrdering.gradle"
+ apply from: "gradle/fix-GRADLE-2492.gradle"
- allprojects {
- group = 'org.gradle'
-@@ -201,6 +199,4 @@
+@@ -213,6 +211,4 @@
with project(":distributions").allDistImage
installDirPropertyName = 'gradle_installPath'
}
@@ -24,7 +24,7 @@ Last-Update: 2015-05-28
\ No newline at end of file
--- a/gradle/groovyProject.gradle
+++ b/gradle/groovyProject.gradle
-@@ -65,13 +65,16 @@
+@@ -67,13 +67,16 @@
def compileConfiguration = sourceSet == "main" ? "compile" : "${sourceSet}Compile"
def runtimeConfiguration = sourceSet == "main" ? "runtime" : "${sourceSet}Runtime"
@@ -41,7 +41,7 @@ Last-Update: 2015-05-28
if (file("src/testFixtures").exists()) {
apply from: "$rootDir/gradle/testFixtures.gradle"
}
-@@ -80,6 +83,8 @@
+@@ -82,6 +85,8 @@
apply from: "$rootDir/gradle/integTest.gradle"
}
@@ -63,7 +63,7 @@ Last-Update: 2015-05-28
ext {
--- a/subprojects/launcher/launcher.gradle
+++ b/subprojects/launcher/launcher.gradle
-@@ -67,11 +67,4 @@
+@@ -77,11 +77,4 @@
}
}
@@ -78,24 +78,25 @@ Last-Update: 2015-05-28
\ No newline at end of file
--- a/subprojects/tooling-api/tooling-api.gradle
+++ b/subprojects/tooling-api/tooling-api.gradle
-@@ -21,13 +21,17 @@
-
+@@ -23,18 +23,6 @@
useTestFixtures()
+ useTestFixtures(project: ':launcher', sourceSet: "integTest")
-+/*
- integTestTasks.all {
- dependsOn({ rootProject.getTasksByName('publishLocalArchives', true) }, ':distributions:binZip')
- }
-+*/
-
-+/*
- daemonIntegTest {
- enabled = false //tooling integ tests use daemon anyway, don't rerun
- }
-+*/
-
+-integTestTasks.all {
+- dependsOn({ rootProject.getTasksByName('publishLocalArchives', true) }, ':distributions:binZip')
+-
+- if (isCiServer) {
+- maxParallelForks = Math.min(2, rootProject.maxParallelForks)
+- }
+-}
+-
+-daemonIntegTest {
+- enabled = false //tooling integ tests use daemon anyway, don't rerun
+-}
+-
task jarjarJar(type: JarJarJar) {
appendix = "fat"
+ dependsOn jar
--- a/subprojects/wrapper/wrapper.gradle
+++ b/subprojects/wrapper/wrapper.gradle
@@ -35,9 +35,11 @@
@@ -112,31 +113,30 @@ Last-Update: 2015-05-28
useClassycle()
--- a/subprojects/scala/scala.gradle
+++ b/subprojects/scala/scala.gradle
-@@ -39,6 +39,8 @@
-
- useTestFixtures(project: ":plugins") // includes core test fixtures
-
-+/*
- configure([integTest, daemonIntegTest]) {
- jvmArgs "-XX:MaxPermSize=1g" // AntInProcessScalaCompilerIntegrationTest needs lots of permgen
+@@ -28,8 +28,4 @@
+ integTestRuntime project(":ide")
}
-+*/
+
+-useTestFixtures(project: ":plugins") // includes core test fixtures
+-
+-configure([integTest, daemonIntegTest]) {
+- jvmArgs "-XX:MaxPermSize=1500m" // AntInProcessScalaCompilerIntegrationTest needs lots of permgen
+-}
++useTestFixtures(project: ":plugins") // includes core test fixtures
\ No newline at end of file
--- a/settings.gradle
+++ b/settings.gradle
-@@ -36,15 +36,11 @@
- include 'openApi'
+@@ -41,13 +41,10 @@
include 'toolingApi'
+ include 'toolingApiBuilders'
include 'docs'
-include 'integTest'
include 'sonar'
include 'signing'
- include 'cpp'
include 'ear'
include 'native'
-include 'internalTesting'
-include 'internalIntegTesting'
--include 'performance'
+ include 'performance'
include 'javascript'
include 'buildComparison'
- include 'reporting'
diff --git a/debian/patches/docs.diff b/debian/patches/docs.diff
index b4b1555..b3defe0 100644
--- a/debian/patches/docs.diff
+++ b/debian/patches/docs.diff
@@ -1,78 +1,28 @@
-Description: Fix build of documentation to build everything
- using docbook-xsl, xalan2 and xhtmlrenderer from Debian
+Description: Fix build of documentation to build everything using docbook-xsl,
+ xalan2 and xhtmlrenderer from Debian
Author: Miguel Landaeta <miguel at miguel.cc>
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Author: Kai-Chung Yan <seamlikok at gmail.com>
+ Damien Raude-Morvan <drazzib at debian.org>
+ Kai-Chung Yan <seamlikok at gmail.com>
Forwarded: not-needed
-Last-Update: 2015-06-16
+Last-Update: 2015-07-02
---- 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 @@
- jvmArgs '-Xmx256m'
- classpath ClasspathUtil.getClasspathForClass(XslTransformer)
- classpath this.classpath
-- classpath new File(stylesheetsDir, 'extensions/xalan27.jar')
-- systemProperty 'xslthl.config', new File("$stylesheetsDir/highlighting/xslthl-config.xml").toURI()
-+ classpath new File('/usr/share/java/xalan2.jar')
-+ systemProperty 'xslthl.config', new File("/usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting/xslthl-config.xml").toURI()
- systemProperty 'org.apache.xerces.xni.parser.XMLParserConfiguration', 'org.apache.xerces.parsers.XIncludeParserConfiguration'
- }
- }
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
-@@ -39,26 +39,18 @@
- fonts
- }
-
-+repositories {
-+ maven { url "/usr/share/maven-repo/" }
-+ flatDir { dirs "/usr/share/javascript/jquery/" }
-+}
-+
- dependencies {
-- userGuideTask 'xalan:xalan:2.7.1', libraries.xerces
-- userGuideTask module('xhtmlrenderer:xhtmlrenderer:R8rc1') {
-+ userGuideTask 'xalan:xalan2', libraries.xerces
-+ userGuideTask module('xhtmlrenderer:core-renderer:R8rc1') {
- dependency 'itext:itext:2.0.8 at jar'
- }
-- userGuideTask 'xslthl:xslthl:2.0.1 at jar'
--
-- userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
-+ userGuideTask 'net.sf.:xslthl:[2.0.1, )@jar'
- jquery "jquery:jquery.min:1.8.0 at js"
-- jqueryTipTip "com.drewwilson.code:jquery.tipTip:1.3:minified at js"
--
-- fonts \
-- "lato:regular:6:v0SdcGFAl2aezM9Vq_aFTQ at ttf",
-- "lato:regular-italic:6:LqowQDslGv4DmUBAfWa2Vw at ttf",
-- "lato:bold:6:DvlFBScY1r-FMtZSYIYoYw at ttf",
-- "lato:bold-italic:6:HkF_qI1x_noxlxhrhMQYEKCWcynf_cDxXwCLxiixG1c at ttf",
-- "ubuntumono:regular:3:ViZhet7Ak-LRXZMXzuAfkZ0EAVxt0G0biEntp43Qt6E at ttf",
-- "ubuntumono:regular-italic:3:KAKuHXAHZOeECOWAHsRKA-LrC4Du4e_yfTJ8Ol60xk0 at ttf",
-- "ubuntumono:bold:3:ceqTZGKHipo8pJj4molytp_TkvowlIOtbR7ePgFOpF4 at ttf",
-- "ubuntumono:bold-italic:3:n_d8tv_JOIiYyMXR4eaV9WsGzsqhEorxQDpu60nfWEc at ttf"
-
- groovydocGroovy libraries.groovy
-
-@@ -124,12 +116,12 @@
+@@ -117,12 +117,7 @@
[it.name, it.bytes.encodeBase64().toString()]
}
-
+
- def fonts = configurations.fonts.resolvedConfiguration.resolvedArtifacts.collectEntries {
-+ /*def fonts = configurations.fonts.resolvedConfiguration.resolvedArtifacts.collectEntries {
- def id = it.moduleVersion.id
- ["${id.group}-${id.name}".toString(), it.file.bytes.encodeBase64().toString()]
+- 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
}
-@@ -174,10 +166,6 @@
+@@ -169,10 +164,6 @@
include '*.xsl'
}
from(cssFiles)
@@ -81,22 +31,22 @@ Last-Update: 2015-06-16
- eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') }
- }
}
-
+
task samplesDocbook(type: AssembleSamplesDocTask) {
-@@ -291,8 +279,8 @@
+@@ -292,8 +283,8 @@
classpath = configurations.userGuideTask
}
-
--def javaApiUrl = "http://docs.oracle.com/javase/1.5.0/docs/api/"
--def groovyApiUrl = "http://groovy.codehaus.org/gapi/"
+
+-def javaApiUrl = "https://docs.oracle.com/javase/6/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 groovyApiUrl = "file:///usr/share/doc/groovy2/api/"
+
task javadocAll(type: Javadoc) {
ext.stylesheetFile = file("src/docs/css/javadoc.css")
-@@ -319,8 +307,7 @@
- include 'org/gradle/testing/jacoco/**'
- include 'org/gradle/buildinit/**'
+@@ -331,8 +322,7 @@
+ include 'org/gradle/tooling/**'
+ include 'org/gradle/model/**'
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")
@@ -113,7 +63,7 @@ Last-Update: 2015-06-16
- <xsl:import href="html/chunkfast.xsl"/>
+ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunkfast.xsl"/>
<xsl:import href="userGuideHtmlCommon.xsl"/>
-
+
<xsl:output method="html" doctype-system="http://www.w3.org/TR/html4/strict.dtd"
@@ -209,4 +209,4 @@
<dt><xsl:apply-templates select="$segtitles[$segnum=position()]" mode="segtitle-in-seg"/>:</dt>
@@ -131,7 +81,7 @@ Last-Update: 2015-06-16
- <xsl:import href="html/docbook.xsl"/>
+ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl"/>
<xsl:import href="userGuideHtmlCommon.xsl"/>
-
+
<xsl:param name="section.autolabel">0</xsl:param>
@@ -36,4 +36,4 @@
<xi:include href="userguide.css" parse="text"/>
@@ -149,12 +99,12 @@ Last-Update: 2015-06-16
- <xsl:import href="html/chunkfast.xsl"/>
+ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunkfast.xsl"/>
<xsl:import href="userGuideHtmlCommon.xsl"/>
-
+
<xsl:param name="root.filename">userguide</xsl:param>
@@ -84,4 +84,4 @@
</div>
</xsl:template>
-
+
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
@@ -168,7 +118,7 @@ Last-Update: 2015-06-16
- <xsl:import href="html/highlight.xsl"/>
+ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting/common.xsl"/>
+ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/highlight.xsl"/>
-
+
<xsl:output method="html"
encoding="UTF-8"
--- a/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl
@@ -180,7 +130,7 @@ Last-Update: 2015-06-16
- <xsl:import href="xhtml/docbook.xsl"/>
+ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/docbook.xsl"/>
<xsl:import href="userGuideHtmlCommon.xsl"/>
-
+
<xsl:output method="xml"
@@ -59,4 +59,4 @@
<xsl:apply-templates select=".." mode="title.markup"/>
@@ -212,3 +162,16 @@ Last-Update: 2015-06-16
}
dependencies {
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 @@
+ jvmArgs '-Xmx256m'
+ classpath ClasspathUtil.getClasspathForClass(XslTransformer)
+ classpath this.classpath
+- classpath new File(stylesheetsDir, 'extensions/xalan27.jar')
+- systemProperty 'xslthl.config', new File("$stylesheetsDir/highlighting/xslthl-config.xml").toURI()
++ classpath new File("/usr/share/java/xalan2.jar")
++ systemProperty 'xslthl.config', new File("/usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting/xslthl-config.xml").toURI()
+ systemProperty 'org.apache.xerces.xni.parser.XMLParserConfiguration', 'org.apache.xerces.parsers.XIncludeParserConfiguration'
+ }
+ }
diff --git a/debian/patches/remove_test_dependencies.diff b/debian/patches/remove_test_dependencies.diff
index 0bc34b2..c0a3805 100644
--- a/debian/patches/remove_test_dependencies.diff
+++ b/debian/patches/remove_test_dependencies.diff
@@ -2,7 +2,7 @@ Description: Lots of subproject build scripts has test dependencies and they
are of no use, hence remove them. This patch only modifies build
scripts of subprojects.
Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-05-28
+Last-Update: 2015-07-02
--- a/subprojects/announce/announce.gradle
+++ b/subprojects/announce/announce.gradle
@@ -17,7 +17,7 @@
@@ -12,7 +12,7 @@ Last-Update: 2015-05-28
- integTestRuntime project(':plugins')
+ //integTestRuntime project(':plugins')
}
-
+
useTestFixtures()
--- a/subprojects/build-init/build-init.gradle
+++ b/subprojects/build-init/build-init.gradle
@@ -25,124 +25,106 @@ Last-Update: 2015-05-28
+ //integTestRuntime project(':maven')
+ //integTestRuntime project(':scala')
}
-
+
task generateTemplateVersionFile(type: GenerateVersionProperties) {
--- a/subprojects/core/core.gradle
+++ b/subprojects/core/core.gradle
-@@ -68,13 +68,6 @@
-
+@@ -56,16 +56,6 @@
+
testRuntime libraries.xerces
testRuntime project(":diagnostics")
-
- testFixturesCompile project(":internalTesting")
-- testFixturesRuntime project(':coreImpl')
+- testFixturesCompile libraries.ivy
+-
+- testFixturesRuntime project(':dependencyManagement')
+- testFixturesRuntime project(':pluginUse')
-
- integTestCompile project(":internalIntegTesting")
-
-- reports 'css3-pie:css3-pie:1.0beta3'
- }
-
- useTestFixtures()
---- a/subprojects/core-impl/core-impl.gradle
-+++ b/subprojects/core-impl/core-impl.gradle
-@@ -28,7 +28,7 @@
- testCompile libraries.groovy
-
- //this dependency is necessary to run IvySFtpResolverIntegrationTest on ibm jdk
-- integTestRuntime "org.bouncycastle:bcprov-jdk15:1.46 at jar"
-+ //integTestRuntime "org.bouncycastle:bcprov-jdk15:1.46 at jar"
- }
-
- task jarJarMaven3(type: JarJar) {
---- a/subprojects/cpp/cpp.gradle
-+++ b/subprojects/cpp/cpp.gradle
-@@ -20,7 +20,7 @@
- compile project(":plugins")
- compile project(":ide")
- compile libraries.commons_io
-- integTestRuntime project(":maven")
-+ //integTestRuntime project(":maven")
+- integTestRuntime project(":plugins")
}
-
+
useTestFixtures()
--- a/subprojects/ivy/ivy.gradle
+++ b/subprojects/ivy/ivy.gradle
-@@ -23,7 +23,7 @@
- compile project(':coreImpl')
-
+@@ -23,10 +23,6 @@
+ compile project(':dependencyManagement')
+
testCompile libraries.groovy
- integTestCompile project(":ear")
-+ //integTestCompile project(":ear")
+- integTestRuntime project(":resourcesS3")
+- integTestRuntime project(":resourcesSftp")
+- testFixturesCompile project(":internalIntegTesting")
}
-
+
useTestFixtures()
--- a/subprojects/maven/maven.gradle
+++ b/subprojects/maven/maven.gradle
-@@ -30,7 +30,7 @@
-
+@@ -29,12 +29,6 @@
+ compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
+
testCompile libraries.xmlunit
-
+-
- integTestCompile project(":ear")
-+ //integTestCompile project(":ear")
+- integTestRuntime project(":resourcesS3")
+- integTestRuntime project(":resourcesSftp")
+-
+- testFixturesCompile project(":internalIntegTesting")
}
-
+
useTestFixtures()
--- a/subprojects/open-api/open-api.gradle
+++ b/subprojects/open-api/open-api.gradle
-@@ -1,8 +1,8 @@
- dependencies {
- testCompile libraries.groovy
-
+@@ -1,7 +1 @@
+-dependencies {
+- integTestCompile libraries.groovy
- integTestCompile libraries.slf4j_api
- integTestCompile libraries.commons_lang
-+ //integTestCompile libraries.slf4j_api
-+ //integTestCompile libraries.commons_lang
- }
-
+-}
+-
useTestFixtures()
--- a/subprojects/publish/publish.gradle
+++ b/subprojects/publish/publish.gradle
@@ -20,8 +20,8 @@
-
+
testCompile libraries.groovy
-
+
- integTestRuntime project(":ivy")
- integTestRuntime project(":maven")
+ //integTestRuntime project(":ivy")
+ //integTestRuntime project(":maven")
}
-
+
useTestFixtures()
--- a/subprojects/reporting/reporting.gradle
+++ b/subprojects/reporting/reporting.gradle
-@@ -4,8 +4,8 @@
+@@ -14,8 +14,6 @@
compile 'com.googlecode.jatl:jatl'
-
+
testCompile libraries.jsoup
- integTestRuntime project(':codeQuality')
- integTestRuntime project(':jacoco')
-+ //integTestRuntime project(':codeQuality')
-+ //integTestRuntime project(':jacoco')
+
+ reports "jquery:jquery.min:1.11.0 at js"
}
-
- useTestFixtures()
-\ No newline at end of file
--- a/subprojects/scala/scala.gradle
+++ b/subprojects/scala/scala.gradle
@@ -25,7 +25,7 @@
-
+
testCompile libraries.slf4j_api
-
+
- integTestRuntime project(":ide")
+ //integTestRuntime project(":ide")
}
-
- // Disable Zinc compiler
+
+ useTestFixtures(project: ":plugins") // includes core test fixtures
+\ No newline at end of file
--- a/subprojects/sonar/sonar.gradle
+++ b/subprojects/sonar/sonar.gradle
-@@ -25,10 +25,10 @@
- // Sonar Runner plugin
- compile "org.codehaus.sonar-plugins:sonar-runner:2.0"
+@@ -29,10 +29,10 @@
+ compile libraries.groovy
+
// version number is part of module name, to allow for multiple versions on same class path
- integTestRuntime "org.gradle.sonar:sonar-server-3.2:3.2 at war"
- integTestRuntime "org.gradle.sonar:sonar-test-server-home-dir-3.2:3.2 at zip"
@@ -152,41 +134,36 @@ Last-Update: 2015-05-28
+ //integTestRuntime "org.gradle.sonar:sonar-test-server-home-dir-3.2:3.2 at zip"
+ //integTestRuntime "org.gradle.sonar:sonar-test-server:3.4 at war"
+ //integTestRuntime "org.gradle.sonar:sonar-test-server-home-dir:3.4.0.1 at zip"
-
+
// Sonar plugin
compile libraries.guava
--- a/subprojects/tooling-api/tooling-api.gradle
+++ b/subprojects/tooling-api/tooling-api.gradle
-@@ -8,15 +8,15 @@
+@@ -8,16 +8,7 @@
compile project(':baseServices')
publishCompile libraries.slf4j_api
-
+
- testFixturesCompile project(':baseServicesGroovy')
-+ //testFixturesCompile project(':baseServicesGroovy')
testCompile libraries.groovy
-
- // lots of integTest errors otherwise
+-
+- // lots of integTest errors otherwise
- integTestRuntime project(':ide')
- integTestRuntime project(':buildInit')
- integTestRuntime project(':buildComparison')
- integTestRuntime project(":ivy")
- integTestRuntime project(":maven")
-+ //integTestRuntime project(':ide')
-+ //integTestRuntime project(':buildInit')
-+ //integTestRuntime project(':buildComparison')
-+ //integTestRuntime project(":ivy")
-+ //integTestRuntime project(":maven")
+- integTestRuntime project(":toolingApiBuilders")
}
-
+
useTestFixtures()
--- a/subprojects/wrapper/wrapper.gradle
+++ b/subprojects/wrapper/wrapper.gradle
@@ -19,7 +19,7 @@
testCompile libraries.groovy
testCompile libraries.ant
-
+
- integTestRuntime rootProject.configurations.testRuntime.allDependencies
+ //integTestRuntime rootProject.configurations.testRuntime.allDependencies
}
-
+
task buildReceiptResource(type: Copy, dependsOn: rootProject.createBuildReceipt) {
diff --git a/debian/patches/search_system_jar.diff b/debian/patches/search_system_jar.diff
index 25de6f8..87e563d 100644
--- a/debian/patches/search_system_jar.diff
+++ b/debian/patches/search_system_jar.diff
@@ -5,17 +5,20 @@ Description: Gradle searches its own directory for Java libraries ignoring
may be possible to remove. Maintaining so many symlinks is too
error prone.
Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-06-14
+Last-Update: 2015-07-02
--- 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
-@@ -68,22 +68,12 @@
+@@ -74,6 +74,7 @@
+
if (distDir != null) {
- libDirs.add(new File(distDir, "lib"));
- libDirs.add(new File(distDir, "lib/plugins"));
-+ libDirs.add(new File("/usr/share/java"));
+ libDirs.addAll(findLibDirs(distDir));
++ libDirs.add(new File("/usr/share/java/"));
}
}
+@@ -91,18 +92,7 @@
+ }
+
private static File findDistDir() {
- File codeSource = ClasspathUtil.getClasspathForClass(DefaultModuleRegistry.class);
- if (codeSource.isFile()) {
diff --git a/debian/patches/series b/debian/patches/series
index c054848..ee3ecaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,26 +2,15 @@ use_local_artifacts.diff
34_disable_code_quality.diff
disable_buildSrc_tests.diff
fix_DocGenerationException.diff
-03_plexus.diff
-11_fix_jni_path.diff
30_envjs.diff
-35_ivy_23.diff
-36_java8_compatibility.diff
-37_replace_internal_testng_api.diff
-38_use_jdk7_nio_file_api.diff
-39_ignore_test_processor_assertion.diff
build_init.diff
33_scala_zinc.diff
disable_distributions.diff
disable_tests.diff
remove_test_dependencies.diff
-bintray_dependencies.diff
jetty.diff
-bintray_api.diff
docs.diff
disable_sonar.diff
disable_release_notes.diff
search_system_jar.diff
26_disable_commitid.diff
-disable_css3pie.diff
-diagnostics_jquery.diff
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 25d5b88..d606d93 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -1,51 +1,30 @@
Description: Use local jar files to build Gradle. The core point is using
"flatDir" as the only artifacts repository and make all
dependencies versionless by removing the version number of some
- of the dependency declarations.
+ of the dependency declarations. Typical Gradle projects do not
+ need to remove the versions but Gradle is an exception because
+ it dynamically loads libraries using its own mechanism and
+ maintains classpaths.
Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-06-16
+Last-Update: 2015-07-02
--- a/build.gradle
+++ b/build.gradle
-@@ -115,7 +115,7 @@
+@@ -129,7 +129,7 @@
group = 'org.gradle'
repositories {
-- maven { url 'http://repo.gradle.org/gradle/libs' }
+- maven { url 'https://repo.gradle.org/gradle/libs' }
+ flatDir { dirs "/usr/share/java/" }
}
}
---- a/subprojects/docs/docs.gradle
-+++ b/subprojects/docs/docs.gradle
-@@ -30,21 +30,6 @@
- apply plugin: 'jsoup'
- apply plugin: 'javascript-base'
-
--repositories {
-- javaScript.googleApis()
--
-- ivy {
-- name "Google Fonts"
-- url "http://themes.googleusercontent.com/static/fonts/"
-- layout 'pattern', {
-- artifact '[organisation]/v[revision](/[classifier])(.[ext])'
-- ivy '[organisation]/v[revision]/ivy(.[ext])'
-- }
-- }
--
-- maven { url 'http://repo.gradle.org/gradle/gradle-build-internal' }
--}
--
- configurations {
- groovydocGroovy {}
- userGuideStyleSheets
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -21,13 +21,13 @@
apply plugin: 'eclipse'
repositories {
-- maven { url 'http://repo.gradle.org/gradle/libs' }
+- maven { url 'https://repo.gradle.org/gradle/libs' }
- mavenCentral()
+ maven { url "/usr/share/maven-repo/" }
+ flatDir { dirs "/usr/share/java/" }
@@ -57,7 +36,7 @@ Last-Update: 2015-06-16
+ compile 'com.google.guava:guava:[14.0.1, )@jar'
compile 'commons-lang:commons-lang:2.6 at jar'
compile localGroovy()
- testCompile 'junit:junit:4.11 at jar'
+ testCompile 'junit:junit:4.12 at jar'
@@ -39,7 +39,7 @@
//below dependency was deployed to the repo.gradle.org
//it's built from sources at: https://github.com/szczepiq/jarjar
@@ -66,33 +45,34 @@ Last-Update: 2015-06-16
+ compile "com.googlecode.jarjar:jarjar:[1.2.1, )"
}
apply from: '../gradle/compile.gradle'
- apply from: '../gradle/codeQuality.gradle'
+ apply from: '../gradle/taskOrdering.gradle'
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
-@@ -25,16 +25,16 @@
- dependency 'org.apache.ant:ant-launcher:1.9.3 at jar'
+@@ -29,17 +29,17 @@
+ dependency 'org.apache.ant:ant-launcher:1.9.4 at jar'
}
--libraries.asm = 'org.ow2.asm:asm-all:5.0_BETA at jar'
+-libraries.asm = 'org.ow2.asm:asm-all:5.0.3'
-libraries.commons_cli = 'commons-cli:commons-cli:1.2 at jar'
-+libraries.asm = 'org.ow2.asm:asm4-all at jar'
-+libraries.commons_cli = 'commons-cli:commons-cli at jar'
++libraries.asm = 'org.ow2.asm:asm4-all'
++libraries.commons_cli = 'commons-cli:commons-cli'
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_lang = 'commons-lang:commons-lang at jar'
-+libraries.commons_collections = 'commons-collections:commons-collections3 at jar'
+-libraries.jsch = "com.jcraft:jsch:0.1.51"
++libraries.commons_lang = 'commons-lang:commons-lang'
++libraries.commons_collections = 'commons-collections:commons-collections'
++libraries.jsch = "com.jcraft:jsch"
libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
-- dependency "com.jcraft:jsch:0.1.51"
-+ dependency "com.jcraft:jsch"
+ dependency libraries.jsch
}
libraries.jcip = "net.jcip:jcip-annotations:1.0 at jar"
-libraries.inject = dependencies.module('javax.inject:javax.inject:1')
+libraries.inject = dependencies.module('javax.inject:atinject-jsr330-api')
// Logging
- libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api:1.7.5')
-@@ -54,7 +54,7 @@
+ libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api:1.7.10')
+@@ -59,7 +59,7 @@
}
// Jetty
@@ -101,34 +81,30 @@ Last-Update: 2015-06-16
libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
dependency libraries.slf4j_api
dependency libraries.servlet_api
-@@ -68,36 +68,36 @@
+@@ -73,7 +73,7 @@
dependency "org.apache.httpcomponents:httpcore:4.2.2 at jar"
dependency libraries.jcl_to_slf4j
dependency "commons-codec:commons-codec:1.6 at jar"
- dependency "org.samba.jcifs:jcifs:1.3.17 at jar"
-+ dependency "org.samba.jcifs:jcifs at jar"
- }
-
--libraries.maven_ant_tasks = dependencies.module("org.apache.maven:maven-ant-tasks:2.1.3") {
-+libraries.maven_ant_tasks = dependencies.module("org.apache.maven:maven-ant-tasks") {
- libraries.ant
++ dependency "org.samba.jcifs:jcifs"
}
+ libraries.maven_publish = [
+@@ -93,26 +93,26 @@
+ 'org.apache.maven.wagon:wagon-provider-api:1.0-beta-6 at jar',
+ ]
libraries += [
- ant_antlr: 'org.apache.ant:ant-antlr:1.9.3 at jar',
-- antlr: 'antlr:antlr:2.7.7 at jar',
- dom4j: 'dom4j:dom4j:1.6.1 at jar',
-- guava: 'com.google.guava:guava-jdk5:14.0.1 at jar',
-+ antlr: 'antlr:antlr at jar',
-+ dom4j: 'dom4j:dom4j at jar',
-+ guava: 'com.google.guava:guava at jar',
+- guava: 'com.google.guava:guava-jdk5:17.0 at jar',
++ dom4j: 'dom4j:dom4j',
++ guava: 'com.google.guava:guava',
jsr305: 'com.google.code.findbugs:jsr305:1.3.9 at jar',
- groovy: 'org.codehaus.groovy:groovy-all:1.8.6 at jar',
+ groovy: "org.codehaus.groovy:groovy-all:${versions.groovy}",
jaxen: 'jaxen:jaxen:1.1 at jar',
- jcip: "net.jcip:jcip-annotations:1.0 at jar",
-+ jcip: "net.jcip:jcip-annotations at jar",
++ jcip: "net.jcip:jcip-annotations",
jna: 'net.java.dev.jna:jna:3.2.7 at jar',
-- junit: 'junit:junit:4.11 at jar',
+- junit: 'junit:junit:4.12 at jar',
+ junit: 'junit:junit4',
xmlunit: 'xmlunit:xmlunit:1.3',
nekohtml: 'net.sourceforge.nekohtml:nekohtml:1.9.14',
@@ -144,22 +120,22 @@ Last-Update: 2015-06-16
-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:maven3-core") {
-+ dependency "org.apache.maven:maven3-settings at jar"
-+ dependency "org.apache.maven:maven3-settings-builder at jar"
++libraries.maven3 = dependencies.module("org.apache.maven:maven-core") {
++ dependency "org.apache.maven:maven-settings"
++ dependency "org.apache.maven:maven-settings-builder"
//plexus:
dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
-@@ -111,27 +111,27 @@
+@@ -126,27 +126,27 @@
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:maven3-core at jar"
-+ dependency "org.apache.maven:maven3-model-builder at jar"
-+ dependency "org.apache.maven:maven3-model at jar"
++ dependency "org.apache.maven:maven3-core"
++ dependency "org.apache.maven:maven3-model-builder"
++ dependency "org.apache.maven:maven3-model"
//somewhat core:
- dependency "org.apache.maven:maven-artifact:3.0.4 at jar"
@@ -167,11 +143,11 @@ Last-Update: 2015-06-16
- 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:maven3-artifact at jar"
-+ dependency "org.apache.maven:maven3-compat at jar"
-+ dependency "org.apache.maven:maven3-repository-metadata at jar"
-+ dependency "org.apache.maven:maven3-plugin-api at jar"
-+ dependency "org.apache.maven:maven3-aether-provider at jar"
++ dependency "org.apache.maven:maven3-artifact"
++ dependency "org.apache.maven:maven3-compat"
++ dependency "org.apache.maven:maven3-repository-metadata"
++ dependency "org.apache.maven:maven3-plugin-api"
++ dependency "org.apache.maven:maven3-aether-provider"
dependency 'org.apache.maven.wagon:wagon-http:2.4 at jar'
dependency 'org.apache.maven.wagon:wagon-provider-api:2.4 at jar'
@@ -184,41 +160,32 @@ Last-Update: 2015-06-16
- dependency "org.sonatype.aether:aether-spi:1.13.1 at jar"
- dependency "org.sonatype.aether:aether-util:1.13.1 at jar"
- dependency 'org.sonatype.aether:aether-connector-wagon:1.13.1 at jar'
-+ dependency "org.sonatype.aether:aether-api at jar"
-+ dependency "org.sonatype.aether:aether-impl at jar"
-+ dependency "org.sonatype.aether:aether-spi at jar"
-+ dependency "org.sonatype.aether:aether-util at jar"
-+ dependency 'org.sonatype.aether:aether-connector-wagon at jar'
++ dependency "org.sonatype.aether:aether-api"
++ dependency "org.sonatype.aether:aether-impl"
++ dependency "org.sonatype.aether:aether-spi"
++ dependency "org.sonatype.aether:aether-util"
++ dependency 'org.sonatype.aether:aether-connector-wagon'
}
libraries.spock = [
-@@ -149,4 +149,4 @@
+@@ -164,14 +164,14 @@
libraries.objenesis,
'cglib:cglib-nodep:2.2'
]
-libraries.gson = "com.google.code.gson:gson:2.2.4"
-\ No newline at end of file
+libraries.gson = "com.google.code.gson:gson"
-\ No newline at end of file
---- a/subprojects/core-impl/core-impl.gradle
-+++ b/subprojects/core-impl/core-impl.gradle
-@@ -16,6 +16,7 @@
- compile libraries.slf4j_api
- compile libraries.maven_ant_tasks
- compile libraries.nekohtml
-+ compile libraries.xerces
- runtime libraries.xbean //maven3 classes dependency
-
- compile fileTree("$buildDir/libs/jarjar") {
-@@ -63,7 +64,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) {
+ libraries.sshd = dependencies.module("org.apache.sshd:sshd-core:0.13.0") {
+ dependency libraries.slf4j_api
+ dependency "org.apache.mina:mina-core:2.0.8"
+ }
+
+-libraries.bouncycastle_provider = "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}@jar"
+-libraries.bouncycastle_pgp = dependencies.module("org.bouncycastle:bcpg-jdk15on:${versions.bouncycastle}") {
++libraries.bouncycastle_provider = "org.bouncycastle:bcprov"
++libraries.bouncycastle_pgp = dependencies.module("org.bouncycastle:bcpg") {
+ dependency libraries.bouncycastle_provider
+ }
+
--- a/subprojects/jetty/jetty.gradle
+++ b/subprojects/jetty/jetty.gradle
@@ -31,14 +31,12 @@
@@ -239,39 +206,26 @@ Last-Update: 2015-06-16
\ No newline at end of file
--- a/subprojects/code-quality/code-quality.gradle
+++ b/subprojects/code-quality/code-quality.gradle
-@@ -27,7 +27,7 @@
+@@ -26,7 +26,7 @@
+
// 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 "org.apache.bcel:findbugs-bcel at jar"
- provided "dom4j:dom4j:1.6.1 at jar"
- provided "jaxen:jaxen:1.1.1 at jar"
- }
+- provided "com.google.code.findbugs:findbugs:2.0.1 at jar"
++ provided "corg.apache.bcel:findbugs-bcel"
+ provided libraries.dom4j
+ testRuntime "com.google.code.findbugs:bcel:2.0.1 at jar"
+ testRuntime libraries.jaxen
--- a/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
+++ b/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
-@@ -66,7 +66,7 @@
- classpath = classpath.plus(moduleRegistry.getExternalModule("logback-classic").getClasspath());
- classpath = classpath.plus(moduleRegistry.getExternalModule("logback-core").getClasspath());
+@@ -64,7 +64,7 @@
+ classpath = classpath.plus(moduleRegistry.getModule("gradle-messaging").getImplementationClasspath());
+ classpath = classpath.plus(moduleRegistry.getExternalModule("slf4j-api").getClasspath());
classpath = classpath.plus(moduleRegistry.getExternalModule("jul-to-slf4j").getClasspath());
- classpath = classpath.plus(moduleRegistry.getExternalModule("guava-jdk5").getClasspath());
+ classpath = classpath.plus(moduleRegistry.getExternalModule("guava").getClasspath());
return classpath;
}
if (name.equals("WORKER_MAIN")) {
---- a/subprojects/signing/signing.gradle
-+++ b/subprojects/signing/signing.gradle
-@@ -21,8 +21,8 @@
- 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") {
-+ dependency "org.bouncycastle:bcprov at jar"
- }
- }
-
--- a/subprojects/javascript/javascript.gradle
+++ b/subprojects/javascript/javascript.gradle
@@ -17,7 +17,7 @@
@@ -307,7 +261,14 @@ Last-Update: 2015-06-16
useTestFixtures()
--- a/subprojects/reporting/reporting.gradle
+++ b/subprojects/reporting/reporting.gradle
-@@ -1,7 +1,7 @@
+@@ -5,13 +5,13 @@
+ }
+
+ repositories {
+- javaScript.googleApis()
++ flatDir { dirs "/usr/share/javascript/jquery/" }
+ }
+
dependencies {
compile libraries.groovy
compile project(':core')
@@ -316,3 +277,66 @@ Last-Update: 2015-06-16
testCompile libraries.jsoup
integTestRuntime project(':codeQuality')
+--- a/subprojects/antlr/antlr.gradle
++++ b/subprojects/antlr/antlr.gradle
+@@ -19,7 +19,7 @@
+ compile project(':core')
+ compile project(':plugins')
+
+- provided "antlr:antlr:2.7.7 at jar"
++ provided "antlr:antlr"
+
+ compile libraries.slf4j_api
+ }
+--- a/subprojects/docs/docs.gradle
++++ b/subprojects/docs/docs.gradle
+@@ -31,18 +31,8 @@
+ apply plugin: 'javascript-base'
+
+ repositories {
+- javaScript.googleApis()
+-
+- ivy {
+- name "Google Fonts"
+- url "http://themes.googleusercontent.com/static/fonts/"
+- layout 'pattern', {
+- artifact '[organisation]/v[revision](/[classifier])(.[ext])'
+- ivy '[organisation]/v[revision]/ivy(.[ext])'
+- }
+- }
+-
+- maven { url 'https://repo.gradle.org/gradle/gradle-build-internal' }
++ maven { url "file:///usr/share/maven-repo/" }
++ flatDir { dirs "/usr/share/javascript/jquery/" }
+ }
+
+ configurations {
+@@ -55,26 +45,14 @@
+ }
+
+ dependencies {
+- userGuideTask 'xalan:xalan:2.7.1', libraries.xerces
+- userGuideTask module('xhtmlrenderer:xhtmlrenderer:R8rc1') {
++ userGuideTask 'xalan:xalan2:2.7.1', libraries.xerces
++ userGuideTask module('xhtmlrenderer:core-renderer:R8rc1') {
+ dependency 'itext:itext:2.0.8 at jar'
+ }
+ userGuideTask 'xslthl:xslthl:2.0.1 at jar'
+-
+- userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
+ jquery "jquery:jquery.min:1.8.0 at js"
+ jqueryTipTip "com.drewwilson.code:jquery.tipTip:1.3:minified at js"
+
+- fonts \
+- "lato:regular:6:v0SdcGFAl2aezM9Vq_aFTQ at ttf",
+- "lato:regular-italic:6:LqowQDslGv4DmUBAfWa2Vw at ttf",
+- "lato:bold:6:DvlFBScY1r-FMtZSYIYoYw at ttf",
+- "lato:bold-italic:6:HkF_qI1x_noxlxhrhMQYEKCWcynf_cDxXwCLxiixG1c at ttf",
+- "ubuntumono:regular:3:ViZhet7Ak-LRXZMXzuAfkZ0EAVxt0G0biEntp43Qt6E at ttf",
+- "ubuntumono:regular-italic:3:KAKuHXAHZOeECOWAHsRKA-LrC4Du4e_yfTJ8Ol60xk0 at ttf",
+- "ubuntumono:bold:3:ceqTZGKHipo8pJj4molytp_TkvowlIOtbR7ePgFOpF4 at ttf",
+- "ubuntumono:bold-italic:3:n_d8tv_JOIiYyMXR4eaV9WsGzsqhEorxQDpu60nfWEc at ttf"
+-
+ groovydocGroovy libraries.groovy
+
+ testCompile libraries.groovy
--
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