From 5bb434e01fd38bd31bdf1beaa8f608ad395b44dd Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Wed, 20 Jul 2016 10:16:26 -0400 Subject: Update JavaEWAH to 1.1.6 Use Oxygen M3 Orbit repository which provides the bundles built using the new orbit-recipe based build. CQ: 11658 Change-Id: I7f3dcc966732b32830c75d5daa55383bd028d182 Signed-off-by: Matthias Sohn --- lib/BUCK | 6 ++-- .../org.eclipse.jgit.target/jgit-4.5.target | 40 ++++++++++++++++++++- .../org.eclipse.jgit.target/jgit-4.5.tpd | 1 + .../org.eclipse.jgit.target/jgit-4.6.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.6.tpd | 2 +- .../orbit/S20161021172207-Oxygen.tpd | 42 ++++++++++++++++++++++ org.eclipse.jgit.test/META-INF/MANIFEST.MF | 6 ++-- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- .../internal/storage/file/BitmapIndexImpl.java | 4 +-- pom.xml | 2 +- 10 files changed, 99 insertions(+), 16 deletions(-) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20161021172207-Oxygen.tpd diff --git a/lib/BUCK b/lib/BUCK index 2421b407a2..d89af5d243 100644 --- a/lib/BUCK +++ b/lib/BUCK @@ -9,11 +9,11 @@ maven_jar( maven_jar( name = 'javaewah', - bin_sha1 = 'eceaf316a8faf0e794296ebe158ae110c7d72a5a', - src_sha1 = 'a50d78eb630e05439461f3130b94b3bcd1ea6f03', + bin_sha1 = '94ad16d728b374d65bd897625f3fbb3da223a2b6', + src_sha1 = 'ca2745e91c6a51f8e6809d1579bda36ad83f1f58', group = 'com.googlecode.javaewah', artifact = 'JavaEWAH', - version = '0.7.9', + version = '1.1.6', ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target index 08116ebf18..c1983f9331 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target @@ -1,7 +1,7 @@ - + @@ -60,6 +60,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd index 5cd1037d16..979bc0fcf7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd @@ -2,6 +2,7 @@ target "jgit-4.5" with source configurePhase include "projects/jetty-9.2.13.tpd" include "orbit/R20160221192158-Mars.tpd" +include "orbit/S20161021172207-Oxygen.tpd" location "http://download.eclipse.org/releases/mars/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target index a1f5abf5eb..f535d1b87f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target @@ -1,7 +1,7 @@ - + @@ -39,8 +39,10 @@ - - + + + + @@ -58,7 +60,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd index c784c1fb0e..40d3f0aa78 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd @@ -1,7 +1,7 @@ target "jgit-4.6" with source configurePhase include "projects/jetty-9.2.13.tpd" -include "orbit/R20160520211859-Neon.tpd" +include "orbit/S20161021172207-Oxygen.tpd" location "http://download.eclipse.org/releases/neon/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20161021172207-Oxygen.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20161021172207-Oxygen.tpd new file mode 100644 index 0000000000..31bd98c669 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20161021172207-Oxygen.tpd @@ -0,0 +1,42 @@ +target "S20161021172207-Oxygen" with source configurePhase +// see http://download.eclipse.org/tools/orbit/downloads/ + +location "http://download.eclipse.org/tools/orbit/downloads/drops/S20161021172207/repository/" { + org.apache.ant [1.9.6.v201510161327,1.9.6.v201510161327] + org.apache.ant.source [1.9.6.v201510161327,1.9.6.v201510161327] + org.apache.commons.compress [1.6.0.v201310281400,1.6.0.v201310281400] + org.apache.commons.compress.source [1.6.0.v201310281400,1.6.0.v201310281400] + org.apache.commons.logging [1.1.1.v201101211721,1.1.1.v201101211721] + org.apache.commons.logging.source [1.1.1.v201101211721,1.1.1.v201101211721] + org.apache.httpcomponents.httpcore [4.3.3.v201411290715,4.3.3.v201411290715] + org.apache.httpcomponents.httpcore.source [4.3.3.v201411290715,4.3.3.v201411290715] + org.apache.httpcomponents.httpclient [4.3.6.v201511171540,4.3.6.v201511171540] + org.apache.httpcomponents.httpclient.source [4.3.6.v201511171540,4.3.6.v201511171540] + org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] + org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] + org.kohsuke.args4j [2.0.21.v201301150030,2.0.21.v201301150030] + org.kohsuke.args4j.source [2.0.21.v201301150030,2.0.21.v201301150030] + org.hamcrest.core [1.3.0.v201303031735,1.3.0.v201303031735] + org.hamcrest.core.source [1.3.0.v201303031735,1.3.0.v201303031735] + org.hamcrest.library [1.3.0.v201505072020,1.3.0.v201505072020] + org.hamcrest.library.source [1.3.0.v201505072020,1.3.0.v201505072020] + javaewah [1.1.6.v20160919-1400,1.1.6.v20160919-1400] + javaewah.source [1.1.6.v20160919-1400,1.1.6.v20160919-1400] + org.objenesis [1.0.0.v201505121915,1.0.0.v201505121915] + org.objenesis.source [1.0.0.v201505121915,1.0.0.v201505121915] + org.mockito [1.8.4.v201303031500,1.8.4.v201303031500] + org.mockito.source [1.8.4.v201303031500,1.8.4.v201303031500] + com.google.gson [2.2.4.v201311231704,2.2.4.v201311231704] + com.jcraft.jsch [0.1.53.v201508180515,0.1.53.v201508180515] + com.jcraft.jsch.source [0.1.53.v201508180515,0.1.53.v201508180515] + org.junit [4.12.0.v201504281640,4.12.0.v201504281640] + org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640] + javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] + javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] + org.tukaani.xz [1.3.0.v201308270617,1.3.0.v201308270617] + org.tukaani.xz.source [1.3.0.v201308270617,1.3.0.v201308270617] + org.slf4j.api [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.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200] +} \ No newline at end of file diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 80d9e23adb..34bab8e44e 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", +Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.eclipse.jgit.api;version="[4.6.0,4.7.0)", org.eclipse.jgit.api.errors;version="[4.6.0,4.7.0)", org.eclipse.jgit.attributes;version="[4.6.0,4.7.0)", @@ -49,11 +49,11 @@ Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", org.eclipse.jgit.treewalk.filter;version="[4.6.0,4.7.0)", org.eclipse.jgit.util;version="[4.6.0,4.7.0)", org.eclipse.jgit.util.io;version="[4.6.0,4.7.0)", - org.hamcrest;version="[1.1.0,2.0.0)", org.junit;version="[4.4.0,5.0.0)", org.junit.experimental.theories;version="[4.4.0,5.0.0)", org.junit.rules;version="[4.11.0,5.0.0)", org.junit.runner;version="[4.4.0,5.0.0)", org.junit.runners;version="[4.11.0,5.0.0)", org.slf4j;version="[1.7.2,2.0.0)" -Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)" +Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", + org.hamcrest.library;bundle-version="[1.1.0,2.0.0)" diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 673f082a08..03a90f9b04 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -138,7 +138,7 @@ Export-Package: org.eclipse.jgit.annotations;version="4.6.0", org.ietf.jgss", org.eclipse.jgit.util.io;version="4.6.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", +Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", com.jcraft.jsch;version="[0.1.37,0.2.0)", javax.crypto, javax.net.ssl, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java index f146a540a2..f397ef143d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java @@ -504,8 +504,8 @@ public class BitmapIndexImpl implements BitmapIndex { static final EWAHCompressedBitmap ones(int sizeInBits) { EWAHCompressedBitmap mask = new EWAHCompressedBitmap(); mask.addStreamOfEmptyWords( - true, sizeInBits / EWAHCompressedBitmap.wordinbits); - int remaining = sizeInBits % EWAHCompressedBitmap.wordinbits; + true, sizeInBits / EWAHCompressedBitmap.WORD_IN_BITS); + int remaining = sizeInBits % EWAHCompressedBitmap.WORD_IN_BITS; if (remaining > 0) mask.add((1L << remaining) - 1, remaining); return mask; diff --git a/pom.xml b/pom.xml index d3d28e5458..9aceba18ce 100644 --- a/pom.xml +++ b/pom.xml @@ -193,7 +193,7 @@ 4.2.0.201601211800-r 0.1.53 - 0.7.9 + 1.1.6 4.12 1C 2.0.15 -- cgit v1.2.3