Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2063 from gianm/update-java-util 

Update java-util.
This commit is contained in:
Fangjin Yang 2015-12-08 17:30:25 -08:00
parent b0ab363022 f6f7bec2b6
commit d41ed55c1c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/namespace-lookup/src/test/java/io/druid/server/namespace/cache/NamespaceExtractionCacheManagerExecutorsTest.java vendored
View File

@ -85,10 +85,12 @@ public class NamespaceExtractionCacheManagerExecutorsTest
private final AtomicLong numRuns = new AtomicLong(0L); private final AtomicLong numRuns = new AtomicLong(0L);
@Before @Before
public void setUp() throws IOException public void setUp() throws Exception
{ {
final Path tmpDir = temporaryFolder.newFolder().toPath(); final Path tmpDir = temporaryFolder.newFolder().toPath();
lifecycle = new Lifecycle(); lifecycle = new Lifecycle();
// Lifecycle stop is used to shut down executors. Start does nothing, so it's ok to call it here.
lifecycle.start();
final URIExtractionNamespaceFunctionFactory factory = new URIExtractionNamespaceFunctionFactory( final URIExtractionNamespaceFunctionFactory factory = new URIExtractionNamespaceFunctionFactory(
ImmutableMap.<String, SearchableVersionedDataFinder>of("file", new LocalFileTimestampVersionFinder()) ImmutableMap.<String, SearchableVersionedDataFinder>of("file", new LocalFileTimestampVersionFinder())
) )

2
pom.xml
View File

@ -65,7 +65,7 @@
</scm> </scm>
<properties> <properties>
<metamx.java-util.version>0.27.4</metamx.java-util.version> <metamx.java-util.version>0.27.5</metamx.java-util.version>
<apache.curator.version>2.9.1</apache.curator.version> <apache.curator.version>2.9.1</apache.curator.version>
<jetty.version>9.2.5.v20141112</jetty.version> <jetty.version>9.2.5.v20141112</jetty.version>
<jersey.version>1.19</jersey.version> <jersey.version>1.19</jersey.version>