Browse Source

Add com.jcraft.jzlib 1.1.1

com.jcraft.jsch requires com.jcraft.jzlib to provide optional zlib
packet compression support. Add this library so that jgit can handle
packet compression.

CQ: 15292
Bug: 529129
Change-Id: I0297bd0488753547a5f5d47dbf0db508a79dd265
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-4.11
Matthias Sohn 7 years ago
parent
commit
cdc88247b9
  1. 6
      WORKSPACE
  2. 9
      lib/BUILD
  3. 7
      org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
  4. 4
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
  5. 4
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
  6. 4
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
  7. 4
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
  8. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20170919201930-Oxygen.tpd
  9. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20170912163609-Photon.tpd
  10. 1
      org.eclipse.jgit/BUILD
  11. 5
      org.eclipse.jgit/pom.xml
  12. 7
      pom.xml

6
WORKSPACE

@ -15,6 +15,12 @@ maven_jar(
sha1 = "658b682d5c817b27ae795637dfec047c63d29935", sha1 = "658b682d5c817b27ae795637dfec047c63d29935",
) )
maven_jar(
name = "jzlib",
artifact = "com.jcraft:jzlib:1.1.1",
sha1 = "a1551373315ffc2f96130a0e5704f74e151777ba",
)
maven_jar( maven_jar(
name = "javaewah", name = "javaewah",
artifact = "com.googlecode.javaewah:JavaEWAH:1.1.6", artifact = "com.googlecode.javaewah:JavaEWAH:1.1.6",

9
lib/BUILD

@ -113,6 +113,15 @@ java_library(
exports = ["@jsch//jar"], exports = ["@jsch//jar"],
) )
java_library(
name = "jzlib",
visibility = [
"//org.eclipse.jgit:__pkg__",
"//org.eclipse.jgit.test:__pkg__",
],
exports = ["@jzlib//jar"],
)
java_library( java_library(
name = "junit", name = "junit",
testonly = 1, testonly = 1,

7
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml

@ -79,4 +79,11 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="com.jcraft.jzlib"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
<target name="jgit-4.5" sequenceNumber="1512295767"> <target name="jgit-4.5" sequenceNumber="1514936019">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/> <unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/>
@ -62,6 +62,8 @@
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/> <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/> <unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository"/>
</location> </location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
<target name="jgit-4.6" sequenceNumber="1512295762"> <target name="jgit-4.6" sequenceNumber="1514936006">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/> <unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/>
@ -62,6 +62,8 @@
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/> <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/> <unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository"/>
</location> </location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
<target name="jgit-4.7" sequenceNumber="1512295741"> <target name="jgit-4.7" sequenceNumber="1514935983">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/> <unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/>
@ -62,6 +62,8 @@
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/> <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/> <unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository"/>
</location> </location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
<target name="jgit-4.8" sequenceNumber="1512295246"> <target name="jgit-4.8" sequenceNumber="1514935978">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/> <unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/>
@ -62,6 +62,8 @@
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/> <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/> <unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20170912163609/repository"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20170912163609/repository"/>
</location> </location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20170919201930-Oxygen.tpd

@ -41,4 +41,6 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2017091920193
org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250] org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200] org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200] org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305]
com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305]
} }

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20170912163609-Photon.tpd

@ -41,4 +41,6 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/S2017091216360
org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250] org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200] org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200] org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305]
com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305]
} }

1
org.eclipse.jgit/BUILD

@ -20,6 +20,7 @@ java_library(
":insecure_cipher_factory", ":insecure_cipher_factory",
"//lib:javaewah", "//lib:javaewah",
"//lib:jsch", "//lib:jsch",
"//lib:jzlib",
"//lib:slf4j-api", "//lib:slf4j-api",
], ],
) )

5
org.eclipse.jgit/pom.xml

@ -74,6 +74,11 @@
<artifactId>jsch</artifactId> <artifactId>jsch</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jzlib</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.googlecode.javaewah</groupId> <groupId>com.googlecode.javaewah</groupId>
<artifactId>JavaEWAH</artifactId> <artifactId>JavaEWAH</artifactId>

7
pom.xml

@ -193,6 +193,7 @@
<jgit-last-release-version>4.9.2.201712150930-r</jgit-last-release-version> <jgit-last-release-version>4.9.2.201712150930-r</jgit-last-release-version>
<jsch-version>0.1.54</jsch-version> <jsch-version>0.1.54</jsch-version>
<jzlib-version>1.1.1</jzlib-version>
<javaewah-version>1.1.6</javaewah-version> <javaewah-version>1.1.6</javaewah-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
<test-fork-count>1C</test-fork-count> <test-fork-count>1C</test-fork-count>
@ -623,6 +624,12 @@
<version>${jsch-version}</version> <version>${jsch-version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jzlib</artifactId>
<version>${jzlib-version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.googlecode.javaewah</groupId> <groupId>com.googlecode.javaewah</groupId>
<artifactId>JavaEWAH</artifactId> <artifactId>JavaEWAH</artifactId>

Loading…
Cancel
Save