Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull request #129

Open
wants to merge 871 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
871 commits
Select commit Hold shift + click to select a range
a694aea
Merge pull request #347 from jekh/mitm-module
jekh Dec 28, 2015
abd1c9b
Updated dependency and plugin versions
jekh Dec 24, 2015
0d6a906
Updated BouncyCastle to 1.53
jekh Dec 28, 2015
aeb1399
Text updates for beta-4 release
jekh Dec 28, 2015
9862424
Merge pull request #348 from jekh/dependency-updates
jekh Dec 28, 2015
9194038
Merge pull request #349 from jekh/beta-4-updates
jekh Dec 28, 2015
4c1d916
[maven-release-plugin] prepare release browsermob-proxy-2.1.0-beta-4
jekh Dec 28, 2015
154fe9b
[maven-release-plugin] prepare for next development iteration
jekh Dec 28, 2015
f519c45
Added test demonstrating short-circuiting with Javascript filters
jekh Dec 28, 2015
29de4db
Merge pull request #350 from jekh/add-javascript-short-circuit-test
jekh Dec 28, 2015
ca5b21c
Skipping tests that require unlimited strength encryption when it is …
jekh Dec 28, 2015
cf308ab
Merge pull request #351 from jekh/fix-test-error-when-unlimited-stren…
jekh Dec 28, 2015
7ba5adc
Require explicitly specifying the HTTP method when blacklisting CONNECTs
jekh Dec 28, 2015
f616a83
Added ImpersonatingMitmManager builder method using EC keys by default
jekh Dec 29, 2015
c291112
Merge pull request #352 from jekh/require-method-when-blacklisting-co…
jekh Jan 1, 2016
0151bd8
Merge pull request #353 from jekh/add-ec-builder-for-mitm
jekh Jan 1, 2016
688033c
Fixed seconds/milliseconds mismatch in cookie expiration date
jekh Jan 2, 2016
70b8e46
Merge pull request #355 from jekh/fix-invalid-cookie-expiration
jekh Jan 2, 2016
87199bf
Replaced legacy ProxyServer's server certificate generation with equi…
jekh Jan 3, 2016
f3de6f8
Merge pull request #359 from jekh/remove-old-bouncycastle
jekh Jan 3, 2016
5a9cf00
Fixed broken ca-certificate-rsa.cer link
jekh Jan 5, 2016
a360756
Merge pull request #363 from jekh/update-readme
jekh Jan 5, 2016
6159f37
Using port 0 in integration test
jekh Jan 5, 2016
4ee38a4
Added auto basic authentication to LittleProxy implementation
jekh Jan 5, 2016
f9634de
Updated new interface compatibility docs to reflect LP implementation…
jekh Jan 5, 2016
f67c8a2
Merge pull request #364 from jekh/add-auto-basic-auth
jekh Jan 5, 2016
039c8f2
Ignore Eclipse generated files in modules too.
ganskef Jan 5, 2016
13282ec
Merge pull request #365 from ganskef/enable_eclipse_modules
jekh Jan 6, 2016
e55239c
Added useEcc option to BrowserMobProxyServer and to query param on /p…
jekh Jan 8, 2016
972f348
Merge pull request #368 from jekh/add-useecc-option-in-core-and-stand…
jekh Jan 8, 2016
93f9f84
Added javassist to browsermob-dist and as optional dependency to brow…
jekh Jan 8, 2016
672b8ea
Using netty SslContext instead of JDK SSLContext when creating client…
jekh Jan 8, 2016
4924cbf
Added option to specify cipher suites for client and server connectio…
jekh Jan 10, 2016
65629ee
Merge pull request #369 from jekh/use-netty-sslcontext
jekh Jan 10, 2016
51396ad
Corrected start and end dates for generated root certificates to be +…
jekh Jan 13, 2016
181c371
Merge pull request #373 from jekh/fix-default-root-certificate-genera…
jekh Jan 13, 2016
3476a72
Using SHA384 instead of SHA512 when signing impersonated certificates…
jekh Feb 6, 2016
de800d6
Fixed timeout conversion in setIdleConnectionTimeout() to use correct…
bsaylor Feb 17, 2016
687c8f2
Merge pull request #385 from bsaylor/master
jekh Feb 17, 2016
8dca999
Not escaping URL paths when applying rewrite rules
jekh Feb 17, 2016
56a0ba5
Merge pull request #388 from jekh/do-not-decode-query-params-in-rewri…
jekh Feb 22, 2016
3dc3401
Merge remote-tracking branch 'upstream/master' into use-sha-384
jekh Feb 22, 2016
7bbabae
Updated maven dependencies to latest versions
jekh Mar 7, 2016
d03fc4e
Updated surefire version. Setting heap available to surefire.
jekh Mar 7, 2016
1bfac73
Merge pull request #396 from jekh/update-surefire-settings
jekh Mar 7, 2016
2ba117b
Merge remote-tracking branch 'upstream/master' into update-dependencies
jekh Mar 7, 2016
946d871
Merge remote-tracking branch 'upstream/master' into use-sha-384
jekh Mar 7, 2016
eba1118
Merge pull request #386 from jekh/use-sha-384
jekh Mar 7, 2016
c68d0af
Merge pull request #397 from jekh/update-dependencies
jekh Mar 7, 2016
d250e2a
Fixing missing response.content.mimeType in HAR when the server does …
jekh Mar 13, 2016
122dcb7
Merge pull request #401 from jekh/fix-missing-mime-type
jekh Mar 13, 2016
f46e14e
Not validating path and query params when returning the full URL, to …
jekh Mar 13, 2016
62a1afb
Merge pull request #402 from jekh/fix-uri-parse-issue-in-har-capture
jekh Mar 13, 2016
7e2e150
Updated to new LP beta2 release for MITM module
jekh Mar 26, 2016
fe31e02
Updated to latest bmp build of LP
jekh Mar 26, 2016
646b8ac
Merge pull request #409 from jekh/use-littleproxy-beta2
jekh Mar 26, 2016
3f3d24b
Updated netty, slf4j, jackson, and selenium versions
jekh Mar 26, 2016
9e68c70
Merge pull request #410 from jekh/dependency-updates
jekh Mar 26, 2016
fa21142
[maven-release-plugin] prepare release browsermob-proxy-2.1.0-beta-5
jekh Mar 26, 2016
8ca7988
[maven-release-plugin] prepare for next development iteration
jekh Mar 26, 2016
d14547a
Updated readme for beta-5 release
jekh Mar 26, 2016
3267da6
Updated HAR version strings for beta-5 release
jekh Mar 26, 2016
f138d6f
Merge pull request #411 from jekh/beta-5-updates
jekh Mar 26, 2016
9af162a
Using the version string the 'version' file when creating the HAR cre…
jekh Apr 9, 2016
ea200ca
Merge pull request #420 from jekh/auto-update-version-string
jekh Apr 11, 2016
e505840
Added support for explicit trust sources when MITMing. Not trusting a…
jekh Apr 10, 2016
049b2f3
Added trustAllServers parameter to REST /proxy call
jekh Apr 10, 2016
0a8ba32
Updated MITM documentation to include explicit trust source info
jekh Apr 11, 2016
4c6efa1
Removed superfluous generics brackets
jekh Apr 11, 2016
77d7d1f
Removed unused variable
jekh Apr 11, 2016
7575c3f
Updated netty and slf4j versions
jekh Apr 11, 2016
a8b83f3
Updated plugin versions
jekh Apr 11, 2016
2edbdf0
Merge pull request #421 from jekh/use-explicit-trust-source
jekh Apr 11, 2016
f09532b
Using new ClasspathResourceUtil instead of guava Resources class to l…
jekh Apr 11, 2016
e1b5bb3
Merge pull request #423 from jekh/replace-classpath-resource-loader
jekh Apr 11, 2016
bd5d4ba
Merge pull request #422 from jekh/dependency-updates-and-cleanup
jekh Apr 11, 2016
bc2d9cc
Using the hostname in the HttpRequest, rather than from the upstream …
jekh Apr 23, 2016
daf99ea
Updated MITM docs to include information about LittleProxy compatibility
jekh Apr 23, 2016
299291a
Merge pull request #432 from jekh/use-httprequest-for-mitm-hostname
jekh Apr 23, 2016
370b29a
Updating commons-io, netty-4.1, and mockito versions
jekh Apr 23, 2016
657a78f
Allow changing the connect timeout after the proxy has been started
jekh Apr 23, 2016
43323ba
Merge pull request #433 from jekh/upgrade-dependencies
jekh Apr 23, 2016
a70f124
Updated to 2016-04-20 version of cURL's cacerts.pem
jekh Apr 23, 2016
f16ee1e
Merge pull request #434 from jekh/allow-modify-connect-timeout-after-…
jekh Apr 23, 2016
3266ef6
Merge pull request #435 from jekh/update-cacerts
jekh Apr 23, 2016
5093638
[maven-release-plugin] prepare release browsermob-proxy-2.1.0-beta-6
jekh Apr 23, 2016
c7b8d01
[maven-release-plugin] prepare for next development iteration
jekh Apr 23, 2016
84afd81
Updated readme for beta-6 release
jekh Apr 23, 2016
789d5cc
Merge pull request #436 from jekh/update-docs-for-beta-6
jekh Apr 23, 2016
180ddb2
Using the proper IP Address tag when adding IP Addresses to the SAN l…
jekh May 1, 2016
c23805a
Added new InsecureExtendedTrustManager to bypass all upstream server …
jekh May 1, 2016
bc88fdf
Merge pull request #444 from jekh/fix-ip-addresses-in-san-list
jekh May 1, 2016
9e2ab69
Merge pull request #445 from jekh/fix-trust-all-upstream-servers
jekh May 1, 2016
754b54b
Made it more obvious that you have to create the HAR before retrievin…
siliconrockstar May 9, 2016
7c5a203
Merge pull request #448 from siliconrockstar/patch-1
jekh May 13, 2016
e93cddb
Added support for chained proxy authorization
jekh May 13, 2016
72a63c4
Added proxyUsername and proxyPassword params for chained proxy auth i…
jekh May 13, 2016
a4ef822
Merge pull request #451 from jekh/proxy-auth-support
jekh May 13, 2016
5502f47
Updated to latest jackson
jekh May 14, 2016
c89e651
Merge pull request #452 from jekh/update-jackson
jekh May 14, 2016
6ec2b33
Moved deprecated code out of BrowserMobProxyServer into BrowserMobPro…
jekh May 14, 2016
46ffc67
Merge pull request #453 from jekh/relocate-legacy-adapter-code
jekh May 15, 2016
dc5f189
Refactored -core and -littleproxy modules. Reversed dependency relati…
jekh May 15, 2016
c7439d5
Fixed 'patern' typo in BlacklistFilter
jekh May 15, 2016
183f62c
Replaced tabs with spaces
jekh May 15, 2016
e8e3de1
Renamed browsermob-core to browsermob-core-legacy and renamed browser…
jekh May 15, 2016
398156f
Renamed directories: browsermob-core to browsermob-legacy and browser…
jekh May 15, 2016
d9ca569
Dropped -littleproxy from HAR creator string
jekh May 15, 2016
62b8e02
Updated version to 2.1.0-SNAPSHOT
jekh May 15, 2016
3c05783
Removing unnecessary transitive dependency from LP
jekh May 15, 2016
f758fae
Removed obsolete profile from browsermob-dist
jekh May 15, 2016
6222a12
Documentation updates for 2.1.0
jekh May 15, 2016
73d3621
Merge pull request #454 from jekh/refactor-core-and-littleproxy
jekh May 16, 2016
9540b17
[maven-release-plugin] prepare release browsermob-proxy-2.1.0
jekh May 16, 2016
5620728
[maven-release-plugin] prepare for next development iteration
jekh May 16, 2016
19501e2
Fixed issue with TrustSource initialization failure, especially if th…
jekh May 16, 2016
ec4899c
Merge pull request #455 from jekh/fix-trustsource-empty-array
jekh May 17, 2016
e58ae29
REST API in table
antonecma May 22, 2016
ac7b7f5
Merge pull request #459 from antonecma/master
jekh May 29, 2016
1b84a7f
[maven-release-plugin] prepare release browsermob-proxy-2.1.1
jekh May 29, 2016
a8c4c1e
[maven-release-plugin] prepare for next development iteration
jekh May 29, 2016
243671e
Updated documentation for the 2.1.1 release
jekh May 29, 2016
4df7400
Merge pull request #469 from jekh/documentation-updates-2.1.1
jekh May 29, 2016
65683c0
Upgraded the deprecated netty cookie decoder to the non-deprecated im…
jekh May 30, 2016
a0c8cfd
Fixed incorrect cookie Max-Age/Expires parsing in Har
jekh May 30, 2016
80102f4
Merge pull request #464 from jekh/fix-har-cookie-capture
jekh May 29, 2016
e961cf5
Updated MITM docs and pom to reflect the LittleProxy 1.1.0 release
jekh May 30, 2016
cafd8d4
Merge pull request #465 from jekh/mitm-updates-for-littleproxy-release
jekh May 29, 2016
5743d8f
Updated gitignore to exclude mockserver temp files
jekh May 30, 2016
52d5788
Merge pull request #466 from jekh/gitignore-update
jekh May 29, 2016
61ff4ba
Added methods to BrowserMobProxy to get the current read and write ba…
jekh May 30, 2016
9443605
Merge pull request #467 from jekh/support-getting-bandwidth-limits
jekh May 29, 2016
d3a6aea
Updating log4j and mockito versions
jekh May 30, 2016
b09ea44
Merge pull request #468 from jekh/dependency-updates
jekh May 29, 2016
f463002
Added rewrite rules tests and updated documentation
jekh Jun 5, 2016
f65e9b3
Merge pull request #475 from jekh/add-rewrite-rules-tests
jekh Jun 5, 2016
5851fac
README.md: captureHeaders disabled by default
djtm Jun 17, 2016
8f105d9
README.md: Considently use port 808X
djtm Jun 17, 2016
7c89742
Merge pull request #481 from djtm/master
jekh Jun 18, 2016
d7cd84e
Adding missing captureCookies param to REST API when using the Little…
jekh Jun 18, 2016
6f2f963
Merge pull request #482 from jekh/add-capturecookies-param-to-rest-api
jekh Jun 18, 2016
b14a61a
Not logging a warning message when the HarCaptureFilter cannot find a…
jekh Jun 26, 2016
142a3ee
Merge pull request #487 from jekh/silence-har-ip-address-warning
jekh Jun 26, 2016
476a2ac
Updated netty, jackson, and unit test dependencies
jekh Jun 26, 2016
514ee10
Merge pull request #488 from jekh/dependency-updates
jekh Jun 26, 2016
45ebc64
Deleted duplicated 'upstreamKbps'.
antonecma Jul 9, 2016
502e4f4
Merge pull request #496 from antonecma/patch-1
jekh Jul 9, 2016
56f23d3
Moved java tests to proper directory
jekh Jul 9, 2016
4480774
Added test for host name remapping
jekh Jul 9, 2016
644a80e
Merge pull request #497 from jekh/add-host-remapping-test
jekh Jul 9, 2016
abb2ee0
Not logging warning message when populating the HAR for uncached IP a…
jekh Jul 9, 2016
3d30808
Updated netty and log4j versions, and test dependencies
jekh Jul 9, 2016
e62c6b1
Merge pull request #498 from jekh/silence-har-ip-address-warning-for-…
jekh Jul 9, 2016
5ad6b18
Removed unused phantomjs test and dependencies
jekh Jul 10, 2016
4b9caf5
Merge pull request #500 from jekh/remove-phantomjs-test
jekh Jul 10, 2016
6338d28
Merge pull request #499 from jekh/dependency-updates
jekh Jul 10, 2016
d3f121b
Fixed potential NPE in ServerResponseCaptureFilter
jekh Jul 19, 2016
eaad5c9
Merge pull request #503 from jekh/fix-npe-in-server-capture-filter
jekh Jul 19, 2016
751e744
Added Quick Start section to readme
jekh Jul 19, 2016
2875f64
Merge pull request #504 from jekh/add-quickstart-to-readme
jekh Jul 19, 2016
8a96e3a
Updated netty version and mockito version
jekh Jul 19, 2016
5dc62a7
Merge pull request #506 from jekh/update-dependencies
jekh Jul 19, 2016
4f2cba1
Making netty 4.1 the default in standalone mode
jekh Jul 19, 2016
7288ecf
Merge pull request #507 from jekh/netty-4.1-in-dist
jekh Jul 19, 2016
67131e7
Updated to most recent littleproxy version
jekh Jul 23, 2016
bc3bec0
Merge pull request #512 from jekh/update-bmp-littleproxy-version
jekh Jul 23, 2016
3d15594
[maven-release-plugin] prepare release browsermob-proxy-2.1.2
jekh Jul 23, 2016
4040b28
[maven-release-plugin] prepare for next development iteration
jekh Jul 23, 2016
6c181af
Updated documentation for 2.1.2 release
jekh Jul 23, 2016
1116cd7
Merge pull request #513 from jekh/update-docs-for-2.1.2
jekh Jul 23, 2016
d8f38fd
Add support for serverBindAddress in the REST API
Schamper Jul 28, 2016
66d5d91
Typo
Schamper Jul 28, 2016
bf6e57c
Change clientBindAddress argument to null
Schamper Jul 31, 2016
0dae510
Merge pull request #521 from Schamper/master
jekh Jul 31, 2016
2fe198d
Upgraded to latest netty to avoid memory leak
jekh Aug 2, 2016
177f346
Merge pull request #524 from jekh/upgrade-netty
jekh Aug 2, 2016
be37698
Throwing an exception when attempting to set a chained proxy after ca…
jekh Aug 26, 2016
dcec66e
Merge pull request #531 from jekh/set-chained-proxy-before-start
jekh Aug 26, 2016
d15f761
Updated bouncycastle and jackson versions
jekh Aug 27, 2016
89f8c64
Merge pull request #532 from jekh/update-jackson-and-bouncycastle
jekh Aug 27, 2016
1270ccc
Reordered static final fields to avoid nulls during class initialization
jekh Sep 12, 2016
56d3ec2
Merge pull request #544 from jekh/fix-mitm-trustmanager-error
jekh Sep 12, 2016
ee8a4bd
Updated netty, javassist, log4j, jackson, and guava versions
jekh Nov 23, 2016
3ecf560
Updated plugin dependencies
jekh Nov 23, 2016
10e0b95
Merge pull request #562 from jekh/update-dependencies
jekh Nov 28, 2016
5ba8c02
Added simple 'version' flag to command-line launcher
jekh Dec 7, 2016
60c5c3e
Merge pull request #569 from jekh/add-version-command-line-option
jekh Dec 7, 2016
a7f7863
Updated default charset to UTF-8
jekh Dec 10, 2016
a56f102
Merge pull request #572 from jekh/default-charset-utf8
jekh Dec 10, 2016
4dea28c
Updated to latest bmp-littleproxy release
jekh Dec 11, 2016
092d369
Merge pull request #573 from jekh/dependency-updates
jekh Dec 11, 2016
027dc25
Removed ossrh parent pom
jekh Dec 11, 2016
32051f6
Always building distributable zip file, even when release profile is …
jekh Dec 11, 2016
69a86a5
Merge pull request #574 from jekh/remove-ossrh-parent-pom
jekh Dec 11, 2016
be6b332
[maven-release-plugin] prepare release browsermob-proxy-2.1.3
jekh Dec 11, 2016
132995b
[maven-release-plugin] prepare for next development iteration
jekh Dec 11, 2016
da62def
Fixes for Mac OS start script
fffilimonov Dec 13, 2016
b89988d
Removed uadetector dependency. Not capturing browser version in HarLo…
jekh Dec 15, 2016
e1e97e6
Merge pull request #575 from fffilimonov/mac-os-scripts
jekh Dec 15, 2016
bd3cb9c
Merge pull request #576 from jekh/remove-uadetector
jekh Dec 15, 2016
90f68ce
Removed all usages of javax.xml.bind.DatatypeConverter. Replaced base…
jekh Dec 19, 2016
0620464
Merge pull request #577 from jekh/remove-javax-datatype-converter
jekh Dec 19, 2016
7c11597
Updated default trust store from curl/mozilla as of 2016-11-02
jekh Dec 23, 2016
a319a5f
Merge pull request #581 from jekh/update-truststore
jekh Dec 23, 2016
0759a63
Updated bmp build of littleproxy
jekh Dec 24, 2016
65b312d
Updated slf4j, bouncycastle, and mockito versions
jekh Dec 24, 2016
f88c78f
Merge pull request #582 from jekh/update-dependency-versions
jekh Dec 24, 2016
af12cef
Simplified startup script on unix OSes
jekh Dec 26, 2016
d42aa20
Merge pull request #584 from jekh/update-startup-script
jekh Dec 26, 2016
dc683d3
[maven-release-plugin] prepare release browsermob-proxy-2.1.4
jekh Dec 26, 2016
81f554b
[maven-release-plugin] prepare for next development iteration
jekh Dec 26, 2016
7aa14a1
Updated documentation for 2.1.4 release
jekh Dec 26, 2016
db37779
Merge pull request #585 from jekh/update-documentation-for-2.1.4
jekh Dec 26, 2016
7e329a6
Updated several dependency versions, including netty
jekh Feb 4, 2017
94c8e79
Removed annotation on legacy code that is no longer supported
jekh Feb 4, 2017
3352e50
Merge pull request #602 from jekh/update-dependencies
jekh Feb 4, 2017
4485feb
Documentation updates for the selenium 3/firefox issue
jekh Feb 4, 2017
bb946c3
Updated to 2017-01-18 version of Mozilla CA list
jekh Feb 4, 2017
7406315
Merge pull request #603 from jekh/update-docs
jekh Feb 4, 2017
1b2d859
Merge pull request #604 from jekh/update-trust-store
jekh Feb 4, 2017
206a463
Updated jackson, slf4j, and LP build
jekh Feb 27, 2017
b166613
Merge pull request #612 from jekh/update-dependencies
jekh Feb 27, 2017
221aee2
Updated MITM documentation and LP version
jekh Mar 5, 2017
6a257e9
Merge pull request #617 from jekh/update-mitm-docs
jekh Mar 5, 2017
d2c4ebb
Readme typo fix
BenRuns Mar 16, 2017
02807e2
Bumping plugin versions to latest
jekh Jul 15, 2017
ffd97b4
Updated dependencies, including guava (to 22). Replaced usage of depr…
jekh Jul 16, 2017
5df0350
Replaced deprecated guava Files.toString() usage
jekh Jul 16, 2017
a87b935
Deleted legacy SslTest with dependencies on external websites
jekh Jul 16, 2017
ed6f580
Merge pull request #666 from jekh/update-to-guava-22-and-other-depend…
jekh Jul 16, 2017
00b793d
Officially deprecating dnsjava usage and removing DnsJavaResolver fro…
jekh Jul 16, 2017
c4cb0fe
Merge pull request #667 from jekh/deprecate-dnsjava-resolver
jekh Jul 16, 2017
5d7f789
Fix flaky tests: use nanoseconds instead of milliseconds
valfirst Jun 7, 2017
a4c5e4a
Removed tests from legacy HarTest that used external websites
jekh Jul 16, 2017
46aa6c6
Merge pull request #668 from jekh/use-nanos-on-dns-tests
jekh Jul 16, 2017
272ed31
Merge pull request #669 from jekh/remove-har-tests-with-external-depe…
jekh Jul 16, 2017
24a8410
Merge pull request #618 from BenRuns/master
jekh Jul 16, 2017
9fa0e0e
Updated to curl-provided cacerts generated on 2017-06-07
jekh Jul 16, 2017
05ddde8
Merge pull request #670 from jekh/update-cacerts
jekh Jul 16, 2017
b1a661b
added captureCookies flag documentation in creation new HAR REST API
Apr 21, 2017
a8a4bd5
Update README.md
jtsalomo Apr 24, 2017
89c876c
Merge pull request #671 from jekh/readme-updates
jekh Jul 16, 2017
fba8e4c
Fix some syntax errors
nightscape Sep 1, 2017
3b26e7a
Updated netty, bouncycastle, and log4j versions
jekh Sep 11, 2017
5252aa9
Disabling travis-ci java 7 build, since oraclejdk7 is no longer
jekh Sep 11, 2017
9aef41a
Merge pull request #696 from jekh/update-dependencies
jekh Sep 11, 2017
5d8fa6d
Merge pull request #694 from nightscape/patch-1
jekh Sep 11, 2017
12fd36b
[maven-release-plugin] prepare release browsermob-proxy-2.1.5
jekh Sep 11, 2017
b15f22c
[maven-release-plugin] prepare for next development iteration
jekh Sep 11, 2017
679d90d
Updated readme for 2.1.5
jekh Sep 11, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 13 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ target
/.classpath
/.settings
/.project
*/.classpath
*/.settings
*/.project
/.idea
atlassian-ide-plugin.xml
.DS_Store
.DS_Store
dependency-reduced-pom.xml
littleproxy_cert
littleproxy_keystore.jks

# mockserver-related files
ClientCertificate.pem
ClientPrivateKey.pem
ClientPublicKey.pem
mockserver_keystore.jks
12 changes: 12 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
sudo: false

language: java
jdk:
# Not running tests against openjdk7, since the SunEC is not included in travis-ci's version of openjdk7.
# Not running tests against oraclejdk7, since travis-ci no longer provides it.
# - openjdk7
- oraclejdk8

cache:
directories:
- $HOME/.m2
432 changes: 318 additions & 114 deletions README.md

Large diffs are not rendered by default.

249 changes: 249 additions & 0 deletions browsermob-core/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,249 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<packaging>jar</packaging>

<parent>
<artifactId>browsermob-proxy</artifactId>
<groupId>net.lightbody.bmp</groupId>
<version>2.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>browsermob-core</artifactId>
<name>BrowserMob Proxy Core (LittleProxy) Module</name>

<properties>
<unit-test-jetty.version>7.6.16.v20140903</unit-test-jetty.version>
</properties>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>net/lightbody/bmp/version</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<includes>
<include>**/**</include>
</includes>
<excludes>
<exclude>net/lightbody/bmp/version</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx1g -XX:MaxPermSize=256m</argLine>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>net.lightbody.bmp</groupId>
<artifactId>littleproxy</artifactId>
<exclusions>
<exclusion>
<groupId>com.barchart.udt</groupId>
<artifactId>barchart-udt-bundle</artifactId>
</exclusion>
<exclusion>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>

<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>2.1.8</version>
</dependency>

<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-api</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>

<!-- deflate support; not a transitive dependency of netty out-of-the-box -->
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jzlib</artifactId>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- pull in a version of netty that is known to work with LP+BMP -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
</dependency>

<dependency>
<groupId>net.lightbody.bmp</groupId>
<artifactId>mitm</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Netty will use javassist to improve performance if it is present on the classpath, but it is not required -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-netty</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
<!-- exclude individual netty transitive dependencies, since we include netty-all -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${unit-test-jetty.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${unit-test-jetty.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${unit-test-jetty.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Loading