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
This commit is contained in:
parent
4ceb25b602
commit
ce5fd525be
|
@ -30,7 +30,7 @@
|
||||||
<unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/>
|
<unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
|
<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.source" version="1.8.4.v201303080030"/>
|
||||||
<unit id="org.apache.ant" 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"/>
|
<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.kohsuke.args4j.source" version="2.0.21.v201301150030"/>
|
||||||
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
|
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
|
||||||
<unit id="org.hamcrest.core.source" 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" version="0.7.9.v201401101600"/>
|
||||||
<unit id="javaewah.source" version="0.5.6.v201307211000"/>
|
<unit id="javaewah.source" version="0.7.9.v201401101600"/>
|
||||||
<unit id="org.objenesis" version="1.0.0.v201105211943"/>
|
<unit id="org.objenesis" version="1.0.0.v201105211943"/>
|
||||||
<unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
|
<unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
|
||||||
<unit id="org.mockito" version="1.8.4.v201303031500"/>
|
<unit id="org.mockito" version="1.8.4.v201303031500"/>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
<unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/>
|
<unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
|
<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.source" version="1.9.2.v201307241445"/>
|
||||||
<unit id="org.apache.ant" 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"/>
|
<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.kohsuke.args4j.source" version="2.0.21.v201301150030"/>
|
||||||
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
|
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
|
||||||
<unit id="org.hamcrest.core.source" 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" version="0.7.9.v201401101600"/>
|
||||||
<unit id="javaewah.source" version="0.5.6.v201307211000"/>
|
<unit id="javaewah.source" version="0.7.9.v201401101600"/>
|
||||||
<unit id="org.objenesis" version="1.0.0.v201105211943"/>
|
<unit id="org.objenesis" version="1.0.0.v201105211943"/>
|
||||||
<unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
|
<unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
|
||||||
<unit id="org.mockito" version="1.8.4.v201303031500"/>
|
<unit id="org.mockito" version="1.8.4.v201303031500"/>
|
||||||
|
|
|
@ -7,7 +7,7 @@ Bundle-Localization: plugin
|
||||||
Bundle-Vendor: %provider_name
|
Bundle-Vendor: %provider_name
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
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;version="[3.3.0,3.4.0)",
|
||||||
org.eclipse.jgit.api.errors;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)",
|
org.eclipse.jgit.awtui;version="[3.3.0,3.4.0)",
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
import static org.junit.Assert.assertFalse;
|
import static org.junit.Assert.assertFalse;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
import javaewah.EWAHCompressedBitmap;
|
import com.googlecode.javaewah.EWAHCompressedBitmap;
|
||||||
|
|
||||||
import org.eclipse.jgit.internal.storage.file.InflatingBitSet;
|
import org.eclipse.jgit.internal.storage.file.InflatingBitSet;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
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.internal.storage.file.BasePackBitmapIndex.StoredBitmap;
|
||||||
import org.eclipse.jgit.lib.ObjectId;
|
import org.eclipse.jgit.lib.ObjectId;
|
||||||
|
|
|
@ -122,7 +122,7 @@ Export-Package: org.eclipse.jgit.api;version="3.3.0";
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||||
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
|
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.crypto,
|
||||||
javax.net.ssl,
|
javax.net.ssl,
|
||||||
org.xml.sax,
|
org.xml.sax,
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
|
|
||||||
package org.eclipse.jgit.internal.storage.file;
|
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.AnyObjectId;
|
||||||
import org.eclipse.jgit.lib.ObjectIdOwnerMap;
|
import org.eclipse.jgit.lib.ObjectIdOwnerMap;
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
import javaewah.EWAHCompressedBitmap;
|
import com.googlecode.javaewah.EWAHCompressedBitmap;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A random access BitSet to supports efficient conversions to
|
* A random access BitSet to supports efficient conversions to
|
||||||
|
|
|
@ -47,8 +47,8 @@
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.NoSuchElementException;
|
import java.util.NoSuchElementException;
|
||||||
|
|
||||||
import javaewah.EWAHCompressedBitmap;
|
import com.googlecode.javaewah.EWAHCompressedBitmap;
|
||||||
import javaewah.IntIterator;
|
import com.googlecode.javaewah.IntIterator;
|
||||||
|
|
||||||
import org.eclipse.jgit.internal.JGitText;
|
import org.eclipse.jgit.internal.JGitText;
|
||||||
import org.eclipse.jgit.lib.AnyObjectId;
|
import org.eclipse.jgit.lib.AnyObjectId;
|
||||||
|
|
|
@ -43,8 +43,8 @@
|
||||||
|
|
||||||
package org.eclipse.jgit.internal.storage.file;
|
package org.eclipse.jgit.internal.storage.file;
|
||||||
|
|
||||||
import javaewah.EWAHCompressedBitmap;
|
import com.googlecode.javaewah.EWAHCompressedBitmap;
|
||||||
import javaewah.IntIterator;
|
import com.googlecode.javaewah.IntIterator;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A wrapper around the EWAHCompressedBitmap optimized for the contains
|
* A wrapper around the EWAHCompressedBitmap optimized for the contains
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.text.MessageFormat;
|
import java.text.MessageFormat;
|
||||||
|
|
||||||
import javaewah.EWAHCompressedBitmap;
|
import com.googlecode.javaewah.EWAHCompressedBitmap;
|
||||||
|
|
||||||
import org.eclipse.jgit.errors.CorruptObjectException;
|
import org.eclipse.jgit.errors.CorruptObjectException;
|
||||||
import org.eclipse.jgit.internal.JGitText;
|
import org.eclipse.jgit.internal.JGitText;
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.NoSuchElementException;
|
import java.util.NoSuchElementException;
|
||||||
|
|
||||||
import javaewah.EWAHCompressedBitmap;
|
import com.googlecode.javaewah.EWAHCompressedBitmap;
|
||||||
|
|
||||||
import org.eclipse.jgit.internal.JGitText;
|
import org.eclipse.jgit.internal.JGitText;
|
||||||
import org.eclipse.jgit.internal.storage.file.BitmapIndexImpl.CompressedBitmap;
|
import org.eclipse.jgit.internal.storage.file.BitmapIndexImpl.CompressedBitmap;
|
||||||
|
|
|
@ -47,8 +47,8 @@
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.NoSuchElementException;
|
import java.util.NoSuchElementException;
|
||||||
|
|
||||||
import javaewah.EWAHCompressedBitmap;
|
import com.googlecode.javaewah.EWAHCompressedBitmap;
|
||||||
import javaewah.IntIterator;
|
import com.googlecode.javaewah.IntIterator;
|
||||||
|
|
||||||
import org.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap;
|
import org.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap;
|
||||||
import org.eclipse.jgit.lib.AnyObjectId;
|
import org.eclipse.jgit.lib.AnyObjectId;
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
import java.text.MessageFormat;
|
import java.text.MessageFormat;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
import javaewah.EWAHCompressedBitmap;
|
import com.googlecode.javaewah.EWAHCompressedBitmap;
|
||||||
|
|
||||||
import org.eclipse.jgit.internal.JGitText;
|
import org.eclipse.jgit.internal.JGitText;
|
||||||
import org.eclipse.jgit.lib.AnyObjectId;
|
import org.eclipse.jgit.lib.AnyObjectId;
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
import java.security.DigestOutputStream;
|
import java.security.DigestOutputStream;
|
||||||
import java.text.MessageFormat;
|
import java.text.MessageFormat;
|
||||||
|
|
||||||
import javaewah.EWAHCompressedBitmap;
|
import com.googlecode.javaewah.EWAHCompressedBitmap;
|
||||||
|
|
||||||
import org.eclipse.jgit.internal.JGitText;
|
import org.eclipse.jgit.internal.JGitText;
|
||||||
import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder.StoredEntry;
|
import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder.StoredEntry;
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import javaewah.EWAHCompressedBitmap;
|
import com.googlecode.javaewah.EWAHCompressedBitmap;
|
||||||
|
|
||||||
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
|
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
|
||||||
import org.eclipse.jgit.errors.MissingObjectException;
|
import org.eclipse.jgit.errors.MissingObjectException;
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -177,7 +177,7 @@
|
||||||
|
|
||||||
<jgit-last-release-version>3.0.0.201306101825-r</jgit-last-release-version>
|
<jgit-last-release-version>3.0.0.201306101825-r</jgit-last-release-version>
|
||||||
<jsch-version>0.1.46</jsch-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>
|
<junit-version>4.11</junit-version>
|
||||||
<!-- TODO: update Maven dependency for args4j to 2.0.21 as soon as available on Maven Central -->
|
<!-- TODO: update Maven dependency for args4j to 2.0.21 as soon as available on Maven Central -->
|
||||||
<args4j-version>2.0.12</args4j-version>
|
<args4j-version>2.0.12</args4j-version>
|
||||||
|
|
Loading…
Reference in New Issue