diff options
author | Colby Ranger <cranger@google.com> | 2013-12-06 09:21:17 -0800 |
---|---|---|
committer | Colby Ranger <cranger@google.com> | 2014-01-13 11:47:58 -0800 |
commit | ce5fd525be80d664db5f7263f8a4c961e320940e (patch) | |
tree | e48496a92d8ef9e55a3b5ddc1b145ccc74a07c71 | |
parent | 4ceb25b60268855e944dc03de90dc5de42ebfe41 (diff) | |
download | jgit-ce5fd525be80d664db5f7263f8a4c961e320940e.tar.gz jgit-ce5fd525be80d664db5f7263f8a4c961e320940e.zip |
Upgrade javaewah to version 0.7.9
Package was renamed, so I had to update the imports. Also, I verified
bitmap serialization was still compatible.
Change-Id: I161ad3875b963b56001beab477ef8d072accee4f
17 files changed, 26 insertions, 26 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target index bb8a34c8bc..b0062bdff3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target @@ -30,7 +30,7 @@ <unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> - <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/> + <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20140110212915/repository/"/> <unit id="org.apache.ant.source" version="1.8.4.v201303080030"/> <unit id="org.apache.ant" version="1.8.4.v201303080030"/> <unit id="org.apache.commons.compress" version="1.4.1.v201301140946"/> @@ -41,8 +41,8 @@ <unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/> <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/> <unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/> - <unit id="javaewah" version="0.5.6.v201307211000"/> - <unit id="javaewah.source" version="0.5.6.v201307211000"/> + <unit id="javaewah" version="0.7.9.v201401101600"/> + <unit id="javaewah.source" version="0.7.9.v201401101600"/> <unit id="org.objenesis" version="1.0.0.v201105211943"/> <unit id="org.objenesis.source" version="1.0.0.v201105211943"/> <unit id="org.mockito" version="1.8.4.v201303031500"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target index f361e42307..abf9e7cdd9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target @@ -30,7 +30,7 @@ <unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> - <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20131024145017/repository/"/> + <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20140110212915/repository/"/> <unit id="org.apache.ant.source" version="1.9.2.v201307241445"/> <unit id="org.apache.ant" version="1.9.2.v201307241445"/> <unit id="org.apache.commons.compress" version="1.4.1.v201301140946"/> @@ -41,8 +41,8 @@ <unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/> <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/> <unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/> - <unit id="javaewah" version="0.5.6.v201307211000"/> - <unit id="javaewah.source" version="0.5.6.v201307211000"/> + <unit id="javaewah" version="0.7.9.v201401101600"/> + <unit id="javaewah.source" version="0.7.9.v201401101600"/> <unit id="org.objenesis" version="1.0.0.v201105211943"/> <unit id="org.objenesis.source" version="1.0.0.v201105211943"/> <unit id="org.mockito" version="1.8.4.v201303031500"/> diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 962d1b2dab..3f21ab01c8 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: J2SE-1.5 -Import-Package: javaewah;version="[0.5.6,1.0.0)", +Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", org.eclipse.jgit.api;version="[3.3.0,3.4.0)", org.eclipse.jgit.api.errors;version="[3.3.0,3.4.0)", org.eclipse.jgit.awtui;version="[3.3.0,3.4.0)", diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/InflatingBitSetTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/InflatingBitSetTest.java index f4f66c8f29..465c61b845 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/InflatingBitSetTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/InflatingBitSetTest.java @@ -46,7 +46,7 @@ package org.eclipse.jgit.internal.storage.file; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.EWAHCompressedBitmap; import org.eclipse.jgit.internal.storage.file.InflatingBitSet; import org.junit.Test; diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/StoredBitmapTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/StoredBitmapTest.java index dc4c25e051..0adf3e476c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/StoredBitmapTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/StoredBitmapTest.java @@ -45,7 +45,7 @@ package org.eclipse.jgit.internal.storage.file; import static org.junit.Assert.*; -import javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.EWAHCompressedBitmap; import org.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap; import org.eclipse.jgit.lib.ObjectId; diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index ca05821ae2..05a94c5697 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -122,7 +122,7 @@ Export-Package: org.eclipse.jgit.api;version="3.3.0"; Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" -Import-Package: javaewah;version="[0.5.6,1.0.0)", +Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", javax.crypto, javax.net.ssl, org.xml.sax, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java index b6214baae3..3c101e621a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java @@ -43,7 +43,7 @@ package org.eclipse.jgit.internal.storage.file; -import javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.EWAHCompressedBitmap; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.ObjectIdOwnerMap; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java index d0ab32f425..ddb5ff0cac 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java @@ -45,7 +45,7 @@ package org.eclipse.jgit.internal.storage.file; import java.util.Arrays; -import javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.EWAHCompressedBitmap; /** * A random access BitSet to supports efficient conversions to 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 6ada2ec215..0c3c7361a9 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 @@ -47,8 +47,8 @@ import java.text.MessageFormat; import java.util.Iterator; import java.util.NoSuchElementException; -import javaewah.EWAHCompressedBitmap; -import javaewah.IntIterator; +import com.googlecode.javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.IntIterator; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.AnyObjectId; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InflatingBitSet.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InflatingBitSet.java index 7d8e12469a..bca89cf9fb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InflatingBitSet.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InflatingBitSet.java @@ -43,8 +43,8 @@ package org.eclipse.jgit.internal.storage.file; -import javaewah.EWAHCompressedBitmap; -import javaewah.IntIterator; +import com.googlecode.javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.IntIterator; /** * A wrapper around the EWAHCompressedBitmap optimized for the contains @@ -164,4 +164,4 @@ final class InflatingBitSet { final EWAHCompressedBitmap getBitmap() { return bitmap; } -}
\ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java index 129da22f57..ae4de84a07 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java @@ -49,7 +49,7 @@ import java.io.IOException; import java.io.InputStream; import java.text.MessageFormat; -import javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.EWAHCompressedBitmap; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.internal.JGitText; @@ -193,4 +193,4 @@ public abstract class PackBitmapIndex { * pack that this index was generated from. */ public abstract int getObjectCount(); -}
\ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java index 5d31b181b1..05cd100953 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java @@ -50,7 +50,7 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.EWAHCompressedBitmap; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.file.BitmapIndexImpl.CompressedBitmap; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java index d3e1990a92..6b96b07ed1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java @@ -47,8 +47,8 @@ import java.util.Collections; import java.util.Iterator; import java.util.NoSuchElementException; -import javaewah.EWAHCompressedBitmap; -import javaewah.IntIterator; +import com.googlecode.javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.IntIterator; import org.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap; import org.eclipse.jgit.lib.AnyObjectId; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java index 1d927d332f..c79a5cb71c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java @@ -49,7 +49,7 @@ import java.io.InputStream; import java.text.MessageFormat; import java.util.Arrays; -import javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.EWAHCompressedBitmap; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.AnyObjectId; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java index a9a742a0a5..8325e2ebd1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java @@ -50,7 +50,7 @@ import java.io.OutputStream; import java.security.DigestOutputStream; import java.text.MessageFormat; -import javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.EWAHCompressedBitmap; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder.StoredEntry; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java index 4eabdb57e4..fca90636da 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java @@ -55,7 +55,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import javaewah.EWAHCompressedBitmap; +import com.googlecode.javaewah.EWAHCompressedBitmap; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; @@ -177,7 +177,7 @@ <jgit-last-release-version>3.0.0.201306101825-r</jgit-last-release-version> <jsch-version>0.1.46</jsch-version> - <javaewah-version>0.5.6</javaewah-version> + <javaewah-version>0.7.9</javaewah-version> <junit-version>4.11</junit-version> <!-- TODO: update Maven dependency for args4j to 2.0.21 as soon as available on Maven Central --> <args4j-version>2.0.12</args4j-version> |