Skip to content

Commit

Permalink
Remove 3rdparty targets used by commons but not pants.
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjy committed Apr 3, 2014
1 parent 22c220a commit 9a48f7f
Showing 1 changed file with 0 additions and 160 deletions.
160 changes: 0 additions & 160 deletions 3rdparty/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ def add_log4j_excludes(jar):
.exclude(org='com.sun.jmx', name='jmxri'))


def add_zookeeper_excludes(jar):
return add_log4j_excludes(jar.exclude(org='com.twitter.common.zookeeper'))


# TODO(John Sirois): XXX only antlr2 is directly referenced by BUILDs
jar_library(name='antlr2',
dependencies=[ jar(org='antlr', name='antlr', rev='2.7.7') ])
Expand All @@ -47,15 +43,6 @@ jar_library(name='antlr4',
]
)

jar_library(name='aopalliance',
dependencies=[
jar(org='aopalliance', name='aopalliance', rev='1.0').with_sources()
]
)

jar_library(name='args4j',
dependencies=[ jar(org='args4j', name='args4j', rev='2.0.16').with_sources() ])

jar_library(name='checkstyle',
dependencies=[
jar(org='com.puppycrawl.tools', name='checkstyle', rev='5.5')
Expand All @@ -66,25 +53,6 @@ jar_library(name='checkstyle',
]
)

jar_library(name='commons-beanutils',
dependencies=[
jar(org='commons-beanutils', name='commons-beanutils', rev='1.8.3')
.with_sources()
]
)

jar_library(name='commons-codec',
dependencies=[
jar(org='commons-codec', name='commons-codec', rev='1.6').with_sources()
]
)

jar_library(name='commons-io',
dependencies=[
jar(org='commons-io', name='commons-io', rev='2.1').with_sources()
]
)

jar_library(name='commons-lang',
dependencies=[
jar(org='commons-lang', name='commons-lang', rev='2.5').with_sources()
Expand All @@ -102,33 +70,11 @@ jar_library(name='finagle-core',
pants(':util-core'),
])

jar_library(name='finagle-http',
dependencies=[
jar(org='com.twitter', name='finagle-http_2.9.2', rev=FINAGLE_REV)
])

jar_library(name='finagle-thrift',
dependencies=[
jar(org='com.twitter', name='finagle-thrift_2.9.2', rev=FINAGLE_REV)
])

jar_library(name='finagle-serversets',
dependencies=[
add_zookeeper_excludes(
jar(org='com.twitter', name='finagle-serversets_2.9.2', rev=FINAGLE_REV)
.exclude(org='com.twitter.common'))
])

jar_library(name='finagle-ostrich4',
dependencies=[
jar(org='com.twitter', name='finagle-ostrich4_2.9.2', rev=FINAGLE_REV)
])

jar_library(name='gson',
dependencies=[
jar(org='com.google.code.gson', name='gson', rev='2.2.2').with_sources()
])

# common rev for all com.google.guava%guava* artifacts
GUAVA_REV = '15.0'

Expand All @@ -155,33 +101,6 @@ jar_library(name='guice',
]
)

jar_library(name='guice-multibindings',
dependencies=[
jar(org='com.google.inject.extensions', name='guice-multibindings', rev='3.0')
.with_sources()
]
)

jar_library(name='guice-servlet',
dependencies=[
jar(org='com.google.inject.extensions', name='guice-servlet', rev='3.0')
.with_sources()
]
)

jar_library(name='jetty',
dependencies=[
jar(org='org.mortbay.jetty', name='jetty', rev='6.1.25').with_sources()
]
)

jar_library(name='joda-time',
dependencies=[
jar(org='joda-time', name='joda-time', rev='2.3'),
jar(org='org.joda', name='joda-convert', rev='1.5')
]
)

jar_library(name='jsr305',
dependencies=[
jar(org='com.google.code.findbugs', name='jsr305', rev='1.3.9')
Expand All @@ -193,38 +112,6 @@ jar_library(name='log4j',
add_log4j_excludes(jar(org='log4j', name='log4j', rev='1.2.15').with_sources())
])


# TODO: move all lucene targets to 3rdparty/jvm/org/apache/lucene
def lucene_jar_library(name, jar_name, rev, force=False):
jar_library(name=name,
dependencies=[
jar(org='org.apache.lucene',
name=jar_name,
rev=rev,
force=force)
.withSources()])

LUCENE_TARGETS = ('lucene-analyzers-common',
'lucene-analyzers-smartcn',
'lucene-core')

# make backwards compatible unversioned default targets
for t in LUCENE_TARGETS:
lucene_jar_library(t, t, '4.1.0')

# Make explicitly versioned targets
# **** Please don't edit this target, instead, create a new, similar one below,
# **** or edit the loop above instead for new revisions.
# **** This is important because we don't want this target to ever change without warning
# **** as it can cause long-lived indexes stored on disk or in hdfs to become unreadable / invalid
for t in LUCENE_TARGETS:
lucene_jar_library(t + '-4.1.0', t, '4.1.0', force=True)

jar_library(name='ostrich',
dependencies=[
jar(org='com.twitter', name='ostrich', rev='8.2.3').with_sources()
])

jar_library(name='protobuf-2.4.1',
dependencies=[
jar(org='com.google.protobuf', name='protobuf-java', rev='2.4.1').with_sources()
Expand Down Expand Up @@ -253,24 +140,6 @@ jar_library(name='scrooge-core',
]
)

jar_library(name='servlet-api',
dependencies=[
jar(org='javax.servlet', name='servlet-api', rev='2.5').with_sources()
]
)

jar_library(name='spy-memcached',
dependencies=[
jar(org='spy', name='spymemcached', rev='2.8.1')
]
)

jar_library(name='stringtemplate',
dependencies=[
jar(org='org.antlr', name='stringtemplate', rev='3.2.1').with_sources()
]
)

jar_library(name='slf4j-api',
dependencies=[
jar(org='org.slf4j', name='slf4j-api', rev='1.6.1').with_sources()
Expand Down Expand Up @@ -305,27 +174,13 @@ jar_library(name='thrift-0.5.0-finagle',
jar_library(name='thrift',
dependencies=[ pants(':thrift-0.5.0') ])

jar_library(name='twitter-commons',
dependencies=[])
jar_library(name='twitter-text',
dependencies=[ jar(org='com.twitter', name='twitter-text', rev='1.5.0') ])

# common rev for all com.twitter%util* artifacts
UTIL_REV = '6.8.1'

jar_library(name='util-core',
dependencies=[
jar(org='com.twitter', name='util-core_2.9.2', rev=UTIL_REV).with_sources() ])

jar_library(name='util-jvm',
dependencies=[ jar(org='com.twitter', name='util-jvm_2.9.2', rev=UTIL_REV) ])

jar_library(name='zookeeper',
dependencies=[
add_zookeeper_excludes(
jar(org='org.apache.zookeeper', name='zookeeper', rev='3.3.4').with_sources())
]
)

###############
# Test support
Expand Down Expand Up @@ -356,25 +211,10 @@ jar_library(name='junit',
]
)

jar_library(name='scalap',
dependencies=[
jar(org='org.scala-lang', name='scalap', rev='2.9.3')
])

jar_library(name='specs_2.9',
dependencies=[
jar(org='org.scala-tools.testing', name='specs_2.9.3', rev='1.6.9')
]
)

jar_library(name='specs', dependencies=[ pants(':specs_2.9') ])

jar_library(name='tl4j',
dependencies=[
jar(org='com.google.testing', name='test-libraries-for-java', rev='1.1.1')
# tl4j by default pulls in junit-4.6, which conflicts with 4.10 needed by our
# testing code (e.g. ConcurrentJunitRunner). So exclude it here so that the junit
# target defined above is used instead. tl4j seems to be happy with junit-4.10.
.exclude(org='junit', name='junit')
]
)

0 comments on commit 9a48f7f

Please sign in to comment.