opendev/gerrit
Code Issues Proposed changes

Stop packaging joda time in root of gerrit.war

Browse Source 
46b1ac8f07 unnessesary introduced
dependency in gerrit-launcher to joda time library.  Since then
the all joda time classes are packaging in root of gerrit.war

Change-Id: I30515f93f328b109f6b8538415f305230d4ea9c1
This commit is contained in:
David Ostrovsky
2014-02-04 21:14:25 +01:00
parent eb505336a8
commit a2a067df82
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-launcher/BUCK
View File

@@ -1,7 +1,6 @@
java_library( java_library(
name = 'launcher', name = 'launcher',
srcs = glob(['src/main/java/**/*.java']), srcs = glob(['src/main/java/**/*.java']),
deps = ['//lib/joda:joda-time'],
visibility = [ visibility = [
'//gerrit-acceptance-tests/...', '//gerrit-acceptance-tests/...',
'//gerrit-main:main_lib', '//gerrit-main:main_lib',

4
gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
View File

@@ -17,8 +17,6 @@ package com.google.gerrit.launcher;
import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MILLISECONDS;
import org.joda.time.DateTimeUtils;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@@ -509,7 +507,7 @@ public final class GerritLauncher {
// //
final File[] tmpEntries = tmp.listFiles(); final File[] tmpEntries = tmp.listFiles();
if (tmpEntries != null) { if (tmpEntries != null) {
final long now = DateTimeUtils.currentTimeMillis(); final long now = System.currentTimeMillis();
final long expired = now - MILLISECONDS.convert(7, DAYS); final long expired = now - MILLISECONDS.convert(7, DAYS);
for (final File tmpEntry : tmpEntries) { for (final File tmpEntry : tmpEntries) {
if (tmpEntry.isDirectory() && tmpEntry.lastModified() < expired) { if (tmpEntry.isDirectory() && tmpEntry.lastModified() < expired) {