[gradle-1.12] 170/211: Bring back symlinks

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Wed Jul 1 14:18:47 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 82c7d4bbed63513126755ab6d524ab2a66c25a69
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Sun Jun 14 18:40:04 2015 +0800

    Bring back symlinks
---
 debian/changelog                                   |  3 --
 debian/control                                     |  7 +--
 debian/gradle.links                                |  5 +-
 debian/libgradle-core-java.jlibs                   | 11 ++--
 debian/libgradle-core-java.links                   | 40 +++++++++++++++
 ...java.install => libgradle-plugins-java.install} |  0
 debian/libgradle-plugins-java.jlibs                |  6 +--
 debian/libgradle-plugins-java.links                | 49 ++++++++++++++++++
 debian/patches/use_local_artifacts.diff            | 58 +++++++++++-----------
 9 files changed, 134 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f8fde2..7df6a51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,18 +4,15 @@ gradle (1.12+dfsg-1) UNRELEASED; urgency=low
   * Move jars between packages
     - gradle-cli.jar from gradle to libgradle-core-java
     - gradle-open-api.jar from gradle to libgradle-core-java
-    - gradle-plugins.jar from libgradle-plugins-java to libgradle-core-java
     - gradle-messaging.jar from gradle to libgradle-core-java
     - gradle-native.jar from gradle to libgradle-core-java
     - gradle-tooling-api.jar from gradle to libgradle-core-java
-    - gradle-wrapper.jar from libgradle-core-java to libgradle-plugins-java
   * Drop multiple patches under debian/patches/:
     - 13_fix_javadocs_links.diff: Already merged into docs.diff
     - 23_replace_jna-posix_with_jnr-posix.diff: Future Gradle no longer use jnr
     - 24_pegdown.diff: Pegdown is already in Debian
     - 27_maven.diff: Already merged into use_local_artifacts.diff
     - 28_findbugs.diff: Findbugs is already in Debian
-    - 30_envyjs.diff: Simpleframework is already in Debian
     - 31_hamcrest_12.diff: This patch is for tests codes, hence not needed
     - 90_respect_user_java_home.diff: No longer needed in Gradle 1.12
   * Multiple new patches under debian/patches/
diff --git a/debian/control b/debian/control
index 436716a..8ffef49 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,6 @@ Package: gradle
 Architecture: all
 Depends: default-jre-headless (>= 1:1.6),
          groovy (>= 1.8),
-         junit4,
          libcommons-io-java,
          libdom4j-java,
          libgradle-core-java (>= ${binary:Version}),
@@ -126,11 +125,10 @@ Depends: ant,
          libmaven-ant-tasks-java,
          libnative-platform-java (>= 0.10),
          libnekohtml-java,
+         libreflectasm-java,
          libslf4j-java,
          libxbean-java,
-         libxerces2-java,
          maven (>= 3),
-         testng,
          ${misc:Depends}
 Breaks: libgradle-wrapper-java (<< 1.3~)
 Replaces: libgradle-wrapper-java (<< 1.3~),
@@ -153,6 +151,7 @@ Depends: ant-optional,
          bnd (>= 2.1.0),
          findbugs,
          groovy,
+         junit4,
          libantlr-java,
          libatinject-jsr330-api-java,
          libbcpg-java,
@@ -170,6 +169,8 @@ Depends: ant-optional,
          libservlet2.5-java,
          libslf4j-java,
          libtomcat7-java,
+         libxerces2-java,
+         testng,
          ${misc:Depends}
 Breaks: libgradle-announce-java (<< 1.3~),
         libgradle-antlr-java (<< 1.3~),
diff --git a/debian/gradle.links b/debian/gradle.links
index e3a9ac3..f41f5fb 100644
--- a/debian/gradle.links
+++ b/debian/gradle.links
@@ -1,2 +1,3 @@
-/usr/share/gradle/bin/gradle     /usr/bin/gradle
-/usr/share/java/gradle-launcher.jar     /usr/share/gradle/lib/gradle-launcher-1.12.jar
\ No newline at end of file
+usr/share/gradle/bin/gradle                 usr/bin/gradle
+usr/share/java/gradle-launcher-1.12.jar     usr/share/gradle/lib/gradle-launcher-1.12.jar
+usr/share/java/gradle-ui-1.12.jar           usr/share/gradle/lib/gradle-ui-1.12.jar
\ No newline at end of file
diff --git a/debian/libgradle-core-java.jlibs b/debian/libgradle-core-java.jlibs
index 9d30ac8..4910f51 100644
--- a/debian/libgradle-core-java.jlibs
+++ b/debian/libgradle-core-java.jlibs
@@ -1,9 +1,10 @@
+subprojects/base-services-groovy/build/libs/*.jar
+subprojects/base-services/build/libs/*.jar
 subprojects/cli/build/libs/*.jar
 subprojects/core/build/libs/*.jar
-subprojects/core-impl/build/libs/*.jar
-subprojects/base-services/build/libs/*.jar
-subprojects/base-services-groovy/build/libs/*.jar
 subprojects/messaging/build/libs/*.jar
 subprojects/native/build/libs/*.jar
-subprojects/plugins/build/libs/*.jar
-subprojects/tooling-api/build/libs/*.jar
\ No newline at end of file
+subprojects/open-api/build/libs/*.jar
+subprojects/resources/build/libs/*.jar
+subprojects/tooling-api/build/libs/*.jar
+subprojects/wrapper/build/libs/*.jar
\ No newline at end of file
diff --git a/debian/libgradle-core-java.links b/debian/libgradle-core-java.links
new file mode 100644
index 0000000..f4e8287
--- /dev/null
+++ b/debian/libgradle-core-java.links
@@ -0,0 +1,40 @@
+usr/share/java/ant-launcher.jar                         usr/share/gradle/lib/ant-launcher.jar
+usr/share/java/ant.jar                                  usr/share/gradle/lib/ant.jar
+usr/share/java/asm.jar                                  usr/share/gradle/lib/asm.jar
+usr/share/java/asm4-all.jar                             usr/share/gradle/lib/asm4-all.jar
+usr/share/java/atinject-jsr330-api.jar                  usr/share/gradle/lib/atinject-jsr330-api.jar
+usr/share/java/bintray-client-java-api.jar              usr/share/gradle/lib/bintray-client-java-api.jar
+usr/share/java/bintray-client-java-service.jar          usr/share/gradle/lib/bintray-client-java-service.jar
+usr/share/java/commons-cli.jar                          usr/share/gradle/lib/plugins/commons-cli.jar
+usr/share/java/commons-collections3.jar                 usr/share/gradle/lib/commons-collections3.jar
+usr/share/java/commons-io.jar                           usr/share/gradle/lib/commons-io.jar
+usr/share/java/commons-lang.jar                         usr/share/gradle/lib/commons-lang.jar
+usr/share/java/gradle-base-services-1.12.jar            usr/share/gradle/lib/gradle-base-services-1.12.jar
+usr/share/java/gradle-base-services-groovy-1.12.jar     usr/share/gralde/lib/gradle-base-services-groovy-1.12.jar
+usr/share/java/gradle-cli-1.12.jar                      usr/share/gradle/lib/gradle-cli-1.12.jar
+usr/share/java/gradle-core-1.12.jar                     usr/share/gradle/lib/gradle-core-1.12.jar
+usr/share/java/gradle-messaging-1.12.jar                usr/share/gradle/lib/gradle-messaging-1.12.jar
+usr/share/java/gradle-native-1.12.jar                   usr/share/gradle/lib/gradle-native-1.12.jar
+usr/share/java/gradle-open-api-1.12.jar                 usr/share/gradle/lib/gradle-open-api-1.12.jar
+usr/share/java/gradle-resources-1.12.jar                usr/share/gradle/lib/gradle-resources-1.12.jar
+usr/share/java/gradle-tooling-api-1.12.jar              usr/share/gradle/lib/gradle-tooling-api-1.12.jar
+usr/share/java/gradle-wrapper-1.12.jar                  usr/share/gradle/lib/gradle-wrapper-1.12.jar
+usr/share/java/groovy-all.jar                           usr/share/gradle/lib/groovy-all.jar
+usr/share/java/guava.jar                                usr/share/gradle/lib/guava.jar
+usr/share/java/httpclient.jar                           usr/share/gradle/lib/plugins/httpclient.jar
+usr/share/java/httpcore.jar                             usr/share/gradle/lib/plugins/httpcore.jar
+usr/share/java/ivy.jar                                  usr/share/gradle/lib/ivy.jar
+usr/share/java/jansi.jar                                usr/share/gradle/lib/jansi.jar
+usr/share/java/jarjar.jar                               usr/share/gradle/lib/jarjar.jar
+usr/share/java/jcifs.jar                                usr/share/gradle/lib/jcifs.jar
+usr/share/java/jcip-annotations.jar                     usr/share/gradle/lib/jcip-annotations.jar
+usr/share/java/jcl-over-slf4j.jar                       usr/share/gradle/lib/jcl-over-slf4j.jar
+usr/share/java/jna.jar                                  usr/share/gradle/lib/jna.jar
+usr/share/java/jna-posix.jar                            usr/share/gradle/lib/jna-posix.jar
+usr/share/java/jsch.jar                                 usr/share/gradle/lib/jsch.jar
+usr/share/java/kryo.jar                                 usr/share/gradle/lib/kryo.jar
+usr/share/java/log4j-over-slf4j.jar                     usr/share/gradle/lib/log4j-over-slf4j.jar
+usr/share/java/logback-classic.jar                      usr/share/gradle/lib/logback-classic.jar
+usr/share/java/logback-core.jar                         usr/share/gradle/lib/logback-core.jar
+usr/share/java/native-platform.jar                      usr/share/gradle/lib/native-platform.jar
+usr/share/java/slf4j-api.jar                            usr/share/gradle/lib/slf4j-api.jar
\ No newline at end of file
diff --git a/debian/libgradle-core-java.install b/debian/libgradle-plugins-java.install
similarity index 100%
rename from debian/libgradle-core-java.install
rename to debian/libgradle-plugins-java.install
diff --git a/debian/libgradle-plugins-java.jlibs b/debian/libgradle-plugins-java.jlibs
index 6ba58e0..875b272 100644
--- a/debian/libgradle-plugins-java.jlibs
+++ b/debian/libgradle-plugins-java.jlibs
@@ -3,6 +3,7 @@ subprojects/antlr/build/libs/*.jar
 subprojects/build-comparison/build/libs/*.jar
 subprojects/build-init/build/libs/*.jar
 subprojects/code-quality/build/libs/*.jar
+subprojects/core-impl/build/libs/*.jar
 subprojects/cpp/build/libs/*.jar
 subprojects/diagnostics/build/libs/*.jar
 subprojects/ear/build/libs/*.jar
@@ -15,9 +16,8 @@ subprojects/language-base/build/libs/*.jar
 subprojects/language-jvm/build/libs/*.jar
 subprojects/maven/build/libs/*.jar
 subprojects/osgi/build/libs/*.jar
+subprojects/plugins/build/libs/*.jar
 subprojects/publish/build/libs/*.jar
 subprojects/reporting/build/libs/*.jar
-subprojects/resources/build/libs/*.jar
 subprojects/scala/build/libs/*.jar
-subprojects/signing/build/libs/*.jar
-subprojects/wrapper/build/libs/*.jar
\ No newline at end of file
+subprojects/signing/build/libs/*.jar
\ No newline at end of file
diff --git a/debian/libgradle-plugins-java.links b/debian/libgradle-plugins-java.links
new file mode 100644
index 0000000..2266d4e
--- /dev/null
+++ b/debian/libgradle-plugins-java.links
@@ -0,0 +1,49 @@
+usr/share/java/ant-antlr.jar                     usr/share/gradle/lib/plugins/ant-antlr.jar
+usr/share/java/antlr.jar                         usr/share/gradle/lib/plugins/antlr.jar
+usr/share/java/bcpg.jar                          usr/share/gradle/lib/plugins/bcpg.jar
+usr/share/java/bcprov.jar                        usr/share/gradle/lib/plugins/bcprov.jar
+usr/share/java/bndlib.jar                        usr/share/gradle/lib/plugins/bndlib.jar
+usr/share/java/commons-cli.jar                   usr/share/gradle/lib/plugins/commons-cli.jar
+usr/share/java/dom4j.jar                         usr/share/gradle/lib/dom4j.jar
+usr/share/java/gradle-announce-1.12.jar          usr/share/gradle/lib/plugins/gradle-announce-1.12.jar
+usr/share/java/gradle-antlr-1.12.jar             usr/share/gradle/lib/plugins/gradle-antlr-1.12.jar
+usr/share/java/gradle-build-comparison-1.12.jar  usr/share/gradle/lib/plugins/gradle-build-comparison-1.12.jar
+usr/share/java/gradle-build-init-1.12.jar        usr/share/gradle/lib/plugins/gradle-build-init-1.12.jar
+usr/share/java/gradle-code-quality-1.12.jar      usr/share/gradle/lib/plugins/gradle-code-quality-1.12.jar
+usr/share/java/gradle-core-impl-1.12.jar         usr/share/gradle/lib/plugins/gradle-core-impl-1.12.jar
+usr/share/java/gradle-cpp-1.12.jar               usr/share/gradle/lib/plugins/gradle-cpp-1.12.jar
+usr/share/java/gradle-diagnostics-1.12.jar       usr/share/gradle/lib/plugins/gradle-diagnostics-1.12.jar
+usr/share/java/gradle-ear-1.12.jar               usr/share/gradle/lib/plugins/gradle-ear-1.12.jar
+usr/share/java/gradle-ide-1.12.jar               usr/share/gradle/lib/plugins/gradle-ide-1.12.jar
+usr/share/java/gradle-ivy-1.12.jar               usr/share/gradle/lib/plugins/gradle-ivy-1.12.jar
+usr/share/java/gradle-jacoco-1.12.jar            usr/share/gradle/lib/plugins/gradle-jacoco-1.12.jar
+usr/share/java/gradle-javascript-1.12.jar        usr/share/gradle/lib/plugins/gradle-javascript-1.12.jar
+usr/share/java/gradle-jetty-1.12.jar             usr/share/gradle/lib/plugins/gradle-jetty-1.12.jar
+usr/share/java/gradle-language-base-1.12.jar     usr/share/gradle/lib/plugins/gradle-language-base-1.12.jar
+usr/share/java/gradle-language-jvm-1.12.jar      usr/share/gradle/lib/plugins/gradle-language-jvm-1.12.jar
+usr/share/java/gradle-maven-1.12.jar             usr/share/gradle/lib/plugins/gradle-maven-1.12.jar
+usr/share/java/gradle-osgi-1.12.jar              usr/share/gradle/lib/plugins/gradle-osgi-1.12.jar
+usr/share/java/gradle-plugins-1.12.jar           usr/share/gradle/lib/plugins/gradle-plugins-1.12.jar
+usr/share/java/gradle-publish-1.12.jar           usr/share/gradle/lib/plugins/gradle-publish-1.12.jar
+usr/share/java/gradle-reporting-1.12.jar         usr/share/gradle/lib/plugins/gradle-reporting-1.12.jar
+usr/share/java/gradle-scala-1.12.jar             usr/share/gradle/lib/plugins/gradle-scala-1.12.jar
+usr/share/java/gradle-signing-1.12.jar           usr/share/gradle/lib/plugins/gradle-signing-1.12.jar
+usr/share/java/gson.jar                          usr/share/gradle/lib/plugins/gson.jar
+usr/share/java/jatl.jar                          usr/share/gradle/lib/plugins/jatl.jar
+usr/share/java/jetty-annotations.jar             usr/share/gradle/lib/plugins/jetty-annotations.jar
+usr/share/java/jetty-naming.jar                  usr/share/gradle/lib/plugins/jetty-naming.jar
+usr/share/java/jetty-plus.jar                    usr/share/gradle/lib/plugins/jetty-plus.jar
+usr/share/java/jetty-util.jar                    usr/share/gradle/lib/plugins/jetty-util.jar
+usr/share/java/jetty.jar                         usr/share/gradle/lib/plugins/jetty.jar
+usr/share/java/js.jar                            usr/share/gradle/lib/plugins/js.jar
+usr/share/java/jsp-api-2.1.jar                   usr/share/gradle/lib/plugins/jsp-api-2.1.jar
+usr/share/java/junit4.jar                        usr/share/gradle/lib/plugins/junit4.jar
+usr/share/java/maven-ant-tasks.jar               usr/share/gradle/lib/plugins/maven-ant-tasks.jar
+usr/share/java/nekohtml.jar                      usr/share/gradle/lib/plugins/nekohtml.jar
+usr/share/java/plexus-component-annotations.jar  usr/share/gradle/lib/plugins/plexus-component-annotations.jar
+usr/share/java/pmaven-common.jar                 usr/share/gradle/lib/plugins/pmaven-common.jar
+usr/share/java/pmaven-groovy.jar                 usr/share/gradle/lib/plugins/pmaven-groovy.jar
+usr/share/java/servlet-api-2.5.jar               usr/share/gradle/lib/plugins/servlet-api-2.5.jar
+usr/share/java/testng.jar                        usr/share/gradle/lib/plugins/testng.jar
+usr/share/java/tomcat-jasper.jar                 usr/share/gradle/lib/plugins/tomcat-jasper.jar
+usr/share/java/xercesImpl.jar                    usr/share/gradle/lib/plugins/xercesImpl.jar
\ No newline at end of file
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 8ee41f5..f454db8 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -12,19 +12,19 @@ Last-Update: 2015-06-14
 +++ b/build.gradle
 @@ -115,7 +115,7 @@
      group = 'org.gradle'
- 
+
      repositories {
 -        maven { url 'http://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()
 -
@@ -47,13 +47,13 @@ Last-Update: 2015-06-14
 +++ b/buildSrc/build.gradle
 @@ -21,13 +21,12 @@
  apply plugin: 'eclipse'
- 
+
  repositories {
 -    maven { url 'http://repo.gradle.org/gradle/libs' }
 -    mavenCentral()
 +    flatDir { dirs "/usr/share/java" }
  }
- 
+
  dependencies {
      compile gradleApi()
 -    compile 'com.google.guava:guava-jdk5:14.0.1 at jar'
@@ -66,7 +66,7 @@ Last-Update: 2015-06-14
 @@ -25,16 +25,16 @@
      dependency 'org.apache.ant:ant-launcher:1.9.3 at jar'
  }
- 
+
 -libraries.asm =  'org.ow2.asm:asm-all:5.0_BETA at jar'
 -libraries.commons_cli = 'commons-cli:commons-cli:1.2 at jar'
 +libraries.asm =  'org.ow2.asm:asm4-all at jar'
@@ -83,12 +83,12 @@ Last-Update: 2015-06-14
  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 @@
  }
- 
+
  // Jetty
 -libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211 at jar"
 +libraries.servlet_api = "org.mortbay.jetty:servlet-api-2.5 at jar"
@@ -102,12 +102,12 @@ Last-Update: 2015-06-14
 -    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
  }
- 
+
  libraries += [
          ant_antlr: 'org.apache.ant:ant-antlr:1.9.3 at jar',
 -        antlr: 'antlr:antlr:2.7.7 at jar',
@@ -131,23 +131,23 @@ Last-Update: 2015-06-14
 -        nativePlatform: 'net.rubygrapefruit:native-platform:0.10',
 -        xerces: "xerces:xercesImpl:2.9.1",
 +        nativePlatform: 'net.rubygrapefruit:native-platform',
-+        xerces: ["xerces:xercesImpl", "xerces:xmlParserAPIs"],
++        xerces: "xerces:xercesImpl",
          objenesis: 'org.objenesis:objenesis:1.2 at jar',
          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:maven3-core") {
 +    dependency "org.apache.maven:maven3-settings at jar"
 +    dependency "org.apache.maven:maven3-settings-builder at jar"
- 
+
      //plexus:
      dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
 @@ -111,27 +111,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"
@@ -155,7 +155,7 @@ Last-Update: 2015-06-14
 +    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"
- 
+
      //somewhat core:
 -    dependency "org.apache.maven:maven-artifact:3.0.4 at jar"
 -    dependency "org.apache.maven:maven-compat:3.0.4 at jar"
@@ -167,12 +167,12 @@ Last-Update: 2015-06-14
 +    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.wagon:wagon-http:2.4 at jar'
      dependency 'org.apache.maven.wagon:wagon-provider-api:2.4 at jar'
 -    dependency 'org.apache.maven.wagon:wagon-http-shared4:2.4 at jar'
 +    dependency 'org.apache.maven.wagon:wagon-http-shared:2.4 at jar'
- 
+
      //eather:
 -    dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
 -    dependency "org.sonatype.aether:aether-impl:1.13.1 at jar"
@@ -185,7 +185,7 @@ Last-Update: 2015-06-14
 +    dependency "org.sonatype.aether:aether-util at jar"
 +    dependency 'org.sonatype.aether:aether-connector-wagon at jar'
  }
- 
+
  libraries.spock = [
 @@ -149,4 +149,4 @@
      libraries.objenesis,
@@ -203,7 +203,7 @@ Last-Update: 2015-06-14
      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.
@@ -218,18 +218,18 @@ Last-Update: 2015-06-14
 +++ b/subprojects/jetty/jetty.gradle
 @@ -31,14 +31,12 @@
      }
- 
+
      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"
          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"
  }
- 
+
  useTestFixtures()
 \ No newline at end of file
 --- a/subprojects/code-quality/code-quality.gradle
@@ -259,20 +259,20 @@ Last-Update: 2015-06-14
 @@ -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 @@
  dependencies {
      compile libraries.groovy
- 
+
 -    compile "org.mozilla:rhino:1.7R3"
 +    compile "rhino:js"
      compile libraries.gson // used by JsHint
@@ -288,17 +288,17 @@ Last-Update: 2015-06-14
 +    publishCompile 'com.esotericsoftware.kryo:kryo'
      testCompile libraries.groovy
  }
- 
+
 --- a/subprojects/osgi/osgi.gradle
 +++ b/subprojects/osgi/osgi.gradle
 @@ -21,7 +21,7 @@
      compile project(':plugins')
      compile libraries.slf4j_api
- 
+
 -    compile module('biz.aQute.bnd:bndlib:2.1.0')
 +    compile module('biz.aQute.bnd:bndlib')
  }
- 
+
  useTestFixtures()
 --- a/subprojects/reporting/reporting.gradle
 +++ b/subprojects/reporting/reporting.gradle
@@ -308,6 +308,6 @@ Last-Update: 2015-06-14
      compile project(':core')
 -    compile 'com.googlecode.jatl:jatl:0.2.2'
 +    compile 'com.googlecode.jatl:jatl'
- 
+
      testCompile libraries.jsoup
      integTestRuntime project(':codeQuality')

-- 
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