diff --git a/BUCK b/BUCK
index 247e10a..eefa42b 100644
--- a/BUCK
+++ b/BUCK
@@ -12,9 +12,6 @@
   ],
   deps = [
     '//plugins/its-base:its-base__plugin',
-    '//plugins/its-jira/lib:jira-rest-java-client-core',
-    '//plugins/its-jira/lib:atlassian-httpclient-apache-httpcomponents',
-    '//plugins/its-jira/lib:jira-rest-java-client-api',
-    '//plugins/its-jira/lib:atlassian-util-concurrent'
-],
+    '//lib/commons:codec',
+  ],
 )
diff --git a/lib/BUCK b/lib/BUCK
deleted file mode 100644
index bdfc429..0000000
--- a/lib/BUCK
+++ /dev/null
@@ -1,301 +0,0 @@
-include_defs('//lib/maven.defs')
-
-define_license('CPL1.0')
-define_license('CDDL')
-define_license('BSD')
-
-ATLASSIAN_REPO = 'https://maven.atlassian.com/repository/public/'
-
-maven_jar(
-  name = 'jira-rest-java-client-core',
-  id = 'com.atlassian.jira:jira-rest-java-client-core:3.0.0',
-  sha1 = '6dd9fcb1b6cbf2e266270bd3ab10a10f8c8a5464',
-  deps = [
-    ':atlassian-httpclient-apache-httpcomponents',
-    ':atlassian-util-concurrent',
-    ':guava',
-    ':httpmime',
-    ':jersey-client',
-    ':jersey-json',
-    ':jira-rest-java-client-api',
-    ':joda-time'
-  ],
-  license = 'Apache2.0',
-  repository = ATLASSIAN_REPO
-)
-
-maven_jar(
-  name = 'atlassian-httpclient-apache-httpcomponents',
-  id = 'com.atlassian.httpclient:atlassian-httpclient-apache-httpcomponents:0.13.2',
-  deps = [
-    ':atlassian-event',
-    ':atlassian-httpclient-api',
-    ':httpasyncclient',
-    ':httpasyncclient-cache',
-    ':httpclient-cache',
-    ':httpcore',
-    ':httpcore-nio',
-    ':sal-api',
-    ':slf4j-api',
-    ':spring-context'
-  ],
-  repository = ATLASSIAN_REPO,
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'spring-context',
-  id = 'org.springframework:spring-context:2.5.6',
-  deps = [
-    ':aopalliance',
-    ':spring-core',
-    ':spring-beans'
-  ],
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'aopalliance',
-  id = 'aopalliance:aopalliance:1.0',
-  license = 'PublicDomain'
-)
-
-maven_jar(
-  name = 'spring-beans',
-  id = 'org.springframework:spring-beans:2.5.6',
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'spring-core',
-  id = 'org.springframework:spring-core:2.5.6',
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'httpasyncclient',
-  id  = 'org.apache.httpcomponents:httpasyncclient:4.0-beta3-atlassian-1',
-  license = 'Apache2.0',
-  repository = ATLASSIAN_REPO
-)
-
-maven_jar(
-  name = 'httpcore',
-  id = 'org.apache.httpcomponents:httpcore:4.2.2',
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'httpcore-nio',
-  id = 'org.apache.httpcomponents:httpcore-nio:4.2.2',
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'httpclient-cache',
-  id = 'org.apache.httpcomponents:httpclient-cache:4.2.1-atlassian-2',
-  deps = [
-    ':httpclient'
-  ],
-  license = 'Apache2.0',
-  repository = ATLASSIAN_REPO
-)
-
-maven_jar(
-  name = 'httpclient',
-  id = 'org.apache.httpcomponents:httpclient:4.2.1-atlassian-2',
-  deps = [
-    ':commons-codec'
-  ],
-  license = 'Apache2.0',
-  repository = ATLASSIAN_REPO
-)
-
-maven_jar(
-  name = 'commons-codec',
-  id = 'commons-codec:commons-codec:1.6',
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'httpasyncclient-cache',
-  id = 'org.apache.httpcomponents:httpasyncclient-cache:4.0-beta3-atlassian-1',
-  license = 'Apache2.0',
-  repository = ATLASSIAN_REPO
-)
-
-maven_jar(
-  name = 'slf4j-api',
-  id = 'org.slf4j:slf4j-api:1.6.4',
-  license = 'slf4j'
-)
-
-maven_jar(
-  name  ='atlassian-event',
-  id = 'com.atlassian.event:atlassian-event:2.2.0',
-  license = 'BSD',
-  repository = ATLASSIAN_REPO,
-  local_license = True
-)
-
-maven_jar(
-  name = 'sal-api',
-  id = 'com.atlassian.sal:sal-api:2.7.0',
-  license = 'BSD',
-  repository = ATLASSIAN_REPO,
-  local_license = True
-)
-
-maven_jar(
-  name = 'atlassian-httpclient-api',
-  id = 'com.atlassian.httpclient:atlassian-httpclient-api:0.13.2',
-  sha1 = '1d375dbeb33159b72fb85ff992c078712d7ebb92',
-  deps = [
-    ':atlassian-httpclient-spi'
-  ],
-  license = 'Apache2.0',
-  repository = ATLASSIAN_REPO
-)
-
-maven_jar(
-  name = 'atlassian-httpclient-spi',
-  id = 'com.atlassian.httpclient:atlassian-httpclient-spi:0.13.2',
-  license = 'Apache2.0',
-  repository = ATLASSIAN_REPO
-)
-
-maven_jar(
-  name = 'joda-time',
-  id = 'joda-time:joda-time:1.6',
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'atlassian-util-concurrent',
-  id = 'com.atlassian.util.concurrent:atlassian-util-concurrent:2.4.0-M9',
-  repository = ATLASSIAN_REPO,
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'httpmime',
-  id = 'org.apache.httpcomponents:httpmime:4.1.2',
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'guava',
-  id = 'com.google.guava:guava:10.0.1',
-  deps = [
-    ':jsr305'
-  ],
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'jsr305',
-  id = 'com.google.code.findbugs:jsr305:1.3.9',
-  license = 'Apache2.0',
-  attach_source = False
-)
-
-maven_jar(
-  name = 'jira-rest-java-client-api',
-  id = 'com.atlassian.jira:jira-rest-java-client-api:3.0.0',
-  sha1 = 'dd2dfa40cfbb43fe0e450d359d639c1d9a1fa28e',
-  license = 'Apache2.0',
-  repository = ATLASSIAN_REPO
-)
-
-maven_jar(
-  name = 'jersey-client',
-  id = 'com.sun.jersey:jersey-client:1.5',
-  deps = [
-    ':jersey-core'
-  ],
-  license = 'CDDL',
-  local_license = True
-)
-
-maven_jar(
-  name = 'jersey-core',
-  id = 'com.sun.jersey:jersey-core:1.5',
-  license = 'CDDL',
-  local_license = True
-)
-
-maven_jar(
-  name = 'jersey-json',
-  id = 'com.sun.jersey:jersey-json:1.5',
-  deps = [
-    ':jackson-core-asl',
-    ':jackson-mapper-asl',
-    ':jackson-xc',
-    ':jaxb-impl',
-    ':jettison'
-  ],
-  license = 'CDDL',
-  local_license = True
-)
-
-maven_jar(
-  name = 'jettison',
-  id = 'org.codehaus.jettison:jettison:1.1',
-  deps = [
-    ':stax-api-1'
-  ],
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'stax-api-1',
-  id='stax:stax-api:1.0.1',
-  license = 'Apache2.0',
-  attach_source = False
-)
-
-maven_jar(
-  name = 'jaxb-impl',
-  id = 'com.sun.xml.bind:jaxb-impl:2.2.3',
-  deps = [
-    ':jaxb-api'
-  ],
-  license = 'CDDL',
-  local_license = True
-)
-
-maven_jar(
-  name = 'jaxb-api',
-  id = 'javax.xml.bind:jaxb-api:2.2.2',
-  deps = [
-    ':stax-api-2'
-  ],
-  license = 'CDDL',
-  local_license = True
-)
-
-maven_jar(
-  name = 'stax-api-2',
-  id = 'javax.xml.stream:stax-api:1.0-2',
-  license = 'CDDL',
-  attach_source = False,
-  local_license = True
-)
-
-maven_jar(
-  name = 'jackson-core-asl',
-  id = 'org.codehaus.jackson:jackson-core-asl:1.5.5',
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'jackson-mapper-asl',
-  id = 'org.codehaus.jackson:jackson-mapper-asl:1.5.5',
-  license = 'Apache2.0'
-)
-
-maven_jar(
-  name = 'jackson-xc',
-  id = 'org.codehaus.jackson:jackson-xc:1.5.5',
-  license = 'Apache2.0'
-)
diff --git a/lib/LICENSE-BSD b/lib/LICENSE-BSD
deleted file mode 100644
index a63f2ea..0000000
--- a/lib/LICENSE-BSD
+++ /dev/null
@@ -1,9 +0,0 @@
-The Regents of the University of California. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-All advertising materials mentioning features or use of this software must display the following acknowledgement: “This product includes software developed by the University of California, Berkeley and its contributors.”
-Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/lib/LICENSE-CDDL b/lib/LICENSE-CDDL
deleted file mode 100644
index fcf1fb5..0000000
--- a/lib/LICENSE-CDDL
+++ /dev/null
@@ -1,129 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-Version 1.0
-1. Definitions.
-
-1.1. “Contributor” means each individual or entity that creates or contributes to the creation of Modifications.
-
-1.2. “Contributor Version” means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
-
-1.3. “Covered Software” means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
-
-1.4. “Executable” means the Covered Software in any form other than Source Code.
-
-1.5. “Initial Developer” means the individual or entity that first makes Original Software available under this License.
-
-1.6. “Larger Work” means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
-
-1.7. “License” means this document.
-
-1.8. “Licensable” means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-
-1.9. “Modifications” means the Source Code and Executable form of any of the following:
-
-A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
-
-B. Any new file that contains any part of the Original Software or previous Modification; or
-
-C. Any new file that is contributed or otherwise made available under the terms of this License.
-
-1.10. “Original Software” means the Source Code and Executable form of computer software code that is originally released under this License.
-
-1.11. “Patent Claims” means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-
-1.12. “Source Code” means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
-
-1.13. “You” (or “Your”) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, “You” includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. License Grants.
-
-2.1. The Initial Developer Grant.
-
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
-
-(c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
-
-(d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
-
-2.2. Contributor Grant.
-
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-
-(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
-
-(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-3.1. Availability of Source Code.
-
-Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
-
-3.2. Modifications.
-
-The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
-
-3.3. Required Notices.
-
-You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
-
-3.4. Application of Additional Terms.
-
-You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients’ rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-3.5. Distribution of Executable Versions.
-
-You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient’s rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-3.6. Larger Works.
-
-You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
-4.1. New Versions.
-
-Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
-
-4.2. Effect of New Versions.
-
-You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
-
-4.3. Modified Versions.
-
-When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-
-6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as “Participant”) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant.
-
-6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY’S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-The Covered Software is a “commercial item,” as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” (as that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and “commercial computer software documentation” as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
-This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction’s conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys’ fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
diff --git a/lib/LICENSE-CPL1.0 b/lib/LICENSE-CPL1.0
deleted file mode 100644
index 365b949..0000000
--- a/lib/LICENSE-CPL1.0
+++ /dev/null
@@ -1,211 +0,0 @@
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are
-distributed by that particular Contributor. A Contribution 'originates' from a
-Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to
-the Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free copyright license to
-reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and such
-derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form.
-This patent license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses
-to its Contributions set forth herein, no assurances are provided by any
-Contributor that the Program does not infringe the patent or other intellectual
-property rights of any other entity. Each Contributor disclaims any liability to
-Recipient for claims brought by any other entity based on infringement of
-intellectual property rights or otherwise. As a condition to exercising the
-rights and licenses granted hereunder, each Recipient hereby assumes sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient's responsibility to acquire that license
-before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright license set
-forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its
-own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title and
-non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and consequential
-damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered
-by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable manner on or
-through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the
-Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to
-control, and cooperate with the Commercial Contributor in, the defense and any
-related settlement negotiations. The Indemnified Contributor may participate in
-any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its exercise of
-rights under this Agreement, including but not limited to the risks and costs of
-program errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of the
-terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to
-a patent applicable to software (including a cross-claim or counterclaim in a
-lawsuit), then any patent licenses granted by that Contributor to such Recipient
-under this Agreement shall terminate as of the date such litigation is filed. In
-addition, if Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted under
-Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
-as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the Agreement
-is published, Contributor may elect to distribute the Program (including its
-Contributions) under the new version. Except as expressly stated in Sections
-2(a) and 2(b) above, Recipient receives no rights or licenses to the
-intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java
index e0c8bea..c0340a2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java
@@ -14,16 +14,12 @@
 
 package com.googlesource.gerrit.plugins.its.jira;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.pgm.init.api.AllProjectsConfig;
 import com.google.gerrit.pgm.init.api.AllProjectsNameOnInitProvider;
+import com.google.gerrit.pgm.init.api.ConsoleUI;
 import com.google.gerrit.pgm.init.api.InitFlags;
 import com.google.gerrit.pgm.init.api.Section;
-import com.google.gerrit.pgm.init.api.ConsoleUI;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -32,10 +28,12 @@
 
 import org.eclipse.jgit.errors.ConfigInvalidException;
 
+import java.io.IOException;
+import java.util.Arrays;
+
 /** Initialize the GitRepositoryManager configuration section. */
 @Singleton
 class InitJira extends InitIts {
-  private static final String COMMENT_LINK_SECTION = "commentLink";
   private final String pluginName;
   private final Section.Factory sections;
   private final InitFlags flags;
@@ -125,7 +123,7 @@
       new JiraClient(jiraUrl, jiraUsername, jiraPassword).sysInfo().getVersion();
       ui.message("[OK]\n");
       return true;
-    } catch (URISyntaxException e) {
+    } catch (IOException e) {
       ui.message("*FAILED* (%s)\n", e.toString());
       return false;
     }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraClient.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraClient.java
index 348c135..c0d7376 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraClient.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2013 The Android Open Source Project
+// Copyright (C) 2013 - 2017 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,133 +14,145 @@
 
 package com.googlesource.gerrit.plugins.its.jira;
 
-import com.atlassian.jira.rest.client.api.IssueRestClient;
-import com.atlassian.jira.rest.client.api.JiraRestClient;
-import com.atlassian.jira.rest.client.api.JiraRestClientFactory;
-import com.atlassian.jira.rest.client.api.RestClientException;
-import com.atlassian.jira.rest.client.api.domain.Comment;
-import com.atlassian.jira.rest.client.api.domain.Issue;
-import com.atlassian.jira.rest.client.api.domain.ServerInfo;
-import com.atlassian.jira.rest.client.api.domain.Transition;
-import com.atlassian.jira.rest.client.api.domain.input.TransitionInput;
-import com.atlassian.jira.rest.client.internal.async.AsynchronousJiraRestClientFactory;
-import com.atlassian.util.concurrent.Promise;
+import static java.net.HttpURLConnection.HTTP_CREATED;
+import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
+import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
+import static java.net.HttpURLConnection.HTTP_NO_CONTENT;
+import static java.net.HttpURLConnection.HTTP_OK;
+
+import com.google.gson.Gson;
+
 import com.googlesource.gerrit.plugins.its.base.its.InvalidTransitionException;
+import com.googlesource.gerrit.plugins.its.jira.restapi.JiraComment;
+import com.googlesource.gerrit.plugins.its.jira.restapi.JiraIssue;
+import com.googlesource.gerrit.plugins.its.jira.restapi.JiraProject;
+import com.googlesource.gerrit.plugins.its.jira.restapi.JiraRestApi;
+import com.googlesource.gerrit.plugins.its.jira.restapi.JiraRestApiProvider;
+import com.googlesource.gerrit.plugins.its.jira.restapi.JiraServerInfo;
+import com.googlesource.gerrit.plugins.its.jira.restapi.JiraTransition;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.URI;
-import java.net.URISyntaxException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Arrays;
+import java.util.List;
 
-/**
- * Jira Rest Client.
- */
 public class JiraClient {
   private static final Logger log = LoggerFactory.getLogger(JiraClient.class);
 
-  private JiraRestClient client = null;
+  private final JiraRestApiProvider apiBuilder;
+  private final Gson gson;
 
   /**
-   * @param url  jira url
+   * @param url jira url
    * @param user username of the jira user
    * @param pass password of the jira user
-   * @throws URISyntaxException
    */
-  public JiraClient(String url, String user, String pass) throws URISyntaxException {
-    URI jiraUri = new URI(url);
-    log.debug("Trying to access Jira at " + jiraUri);
-    JiraRestClientFactory factory = new AsynchronousJiraRestClientFactory();
-    client = factory.createWithBasicHttpAuthentication(jiraUri, user, pass);
-    log.debug("Initialized jira client " + client);
-  }
-
-  /**
-   * @param issueKey Issue id
-   * @return Issueobjekt by issue id
-   * @throws RestClientException
-   */
-  public Issue getIssue(String issueKey) throws RestClientException {
-    IssueRestClient issueClient = this.client.getIssueClient();
-    return issueClient.getIssue(issueKey).claim();
+  public JiraClient(String url, String user, String pass)
+      throws MalformedURLException {
+    this.apiBuilder = new JiraRestApiProvider(url, user, pass);
+    this.gson = new Gson();
   }
 
   /**
    * @param issueKey Jira Issue key
    * @return true if issue exists
    */
-  public boolean issueExists(String issueKey) throws RestClientException {
-    boolean ret = true;
-    try{
-      getIssue(issueKey);
-    } catch (RestClientException e) {
-      if (e.getStatusCode().get() == 404){
+  public boolean issueExists(String issueKey) throws IOException {
+    JiraRestApi<JiraIssue> api = apiBuilder.getIssue();
+
+    api.doGet("/" + issueKey, HTTP_OK,
+        new int[] {HTTP_NOT_FOUND, HTTP_FORBIDDEN});
+    Integer code = api.getResponseCode();
+    switch (code) {
+      case HTTP_OK:
+        return true;
+      case HTTP_NOT_FOUND:
         log.error("Issue " + issueKey + " not found ");
-        ret = false;
-      } else {
-        throw e;
-      }
+        return false;
+      case HTTP_FORBIDDEN:
+        log.error("No permission to read Issue " + issueKey);
+        return false;
+      default:
+        // Cannot happen due to passCodes filter
+        throw new IOException(
+            "Unexpected HTTP code received:" + code.toString());
     }
-    return ret;
   }
 
   /**
    * @param issueKey Jira Issue key
    * @return Iterable of available transitions
-   * @throws RestClientException
+   * @throws IOException
    */
-  public Iterable<Transition> getTransitions(String issueKey) throws RestClientException {
-    return client.getIssueClient().getTransitions(getIssue(issueKey)).claim();
+  public List<JiraTransition.Item> getTransitions(String issueKey)
+      throws IOException {
+
+    JiraRestApi<JiraTransition> api =
+        apiBuilder.get(JiraTransition.class, "/issue");
+    return Arrays.asList(
+        api.doGet("/" + issueKey + "/transitions", HTTP_OK).transitions);
   }
 
   /**
    * @param issueKey Jira Issue key
-   * @param comment  Comment  to be added
-   * @throws RestClientException
+   * @param comment String to be added
+   * @throws IOException
    */
-  public void addComment(String issueKey, Comment comment) throws RestClientException, URISyntaxException {
-    log.debug("Trying to add comment for issue " + issueKey);
-    Issue issue = getIssue(issueKey);
-    URI issueUri;
-    issueUri = new URI(issue.getSelf().toString() + "/comment/");
-    IssueRestClient issueClient = client.getIssueClient();
-    Promise<Void> promise = issueClient.addComment(issueUri, comment);
-    promise.claim();
-    log.debug("Comment added to issue " + issueKey);
+  public void addComment(String issueKey, String comment) throws IOException {
+
+    if (issueExists(issueKey)) {
+      log.debug("Trying to add comment for issue {}", issueKey);
+      apiBuilder.getIssue().doPost("/" + issueKey + "/comment",
+          gson.toJson(new JiraComment(comment)), HTTP_CREATED);
+      log.debug("Comment added to issue {}", issueKey);
+    } else {
+      log.error("Issue {} does not exist or no access permission", issueKey);
+    }
   }
 
   /**
-   * @param issueKey   Jira Issue key
-   * @param transition Transition to perform
+   * @param issueKey Jira Issue key
+   * @param transition JiraTransition.Item to perform
    * @return true if successful
    */
-  public boolean doTransition(String issueKey, String transition) throws RestClientException, InvalidTransitionException {
-    Transition t = getTransitionByName(getTransitions(issueKey), transition);
+  public boolean doTransition(String issueKey, String transition)
+      throws IOException, InvalidTransitionException {
+    log.debug("Making transition to {} for {}", transition, issueKey);
+    JiraTransition.Item t = getTransitionByName(issueKey, transition);
     if (t == null) {
-      throw new InvalidTransitionException("Action " + transition
-        + " not executable on issue " + issueKey);
+      throw new InvalidTransitionException(
+          "Action " + transition + " not executable on issue " + issueKey);
     }
-    TransitionInput input;
-    input = new TransitionInput(t.getId());
-    log.debug("Setting transition input to: " + input.toString());
-    client.getIssueClient().transition(getIssue(issueKey), input).claim();
-    return true;
+    log.debug("Transition issue {} to '{}' ({})", issueKey, transition,
+        t.getId());
+    return apiBuilder.getIssue().doPost("/" + issueKey + "/transitions",
+        gson.toJson(new JiraTransition(t)), HTTP_NO_CONTENT);
   }
 
   /**
    * @return Serverinformation of jira
    */
-  public ServerInfo sysInfo() throws RestClientException {
-    return client.getMetadataClient().getServerInfo().claim();
+  public JiraServerInfo sysInfo() throws IOException {
+    return apiBuilder.getServerInfo().doGet("", HTTP_OK);
   }
 
-  private Transition getTransitionByName(Iterable<Transition> transitions, String transition) {
-    Transition ret = null;
-    for (Transition t : transitions) {
+  /**
+   * @return List of all projects we have access to in jira
+   */
+  public JiraProject[] getProjects() throws IOException {
+    return apiBuilder.getProjects().doGet("", HTTP_OK);
+  }
+
+  private JiraTransition.Item getTransitionByName(String issueKey,
+      String transition) throws IOException {
+    for (JiraTransition.Item t : getTransitions(issueKey)) {
       if (transition.equals(t.getName())) {
-        ret = t;
-        break;
+        return t;
       }
     }
-    return ret;
+    return null;
   }
 }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsFacade.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsFacade.java
index fc76fc0..2f8da02 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsFacade.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsFacade.java
@@ -14,17 +14,21 @@
 
 package com.googlesource.gerrit.plugins.its.jira;
 
-import com.atlassian.jira.rest.client.api.domain.Comment;
-import com.atlassian.jira.rest.client.api.domain.ServerInfo;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.inject.Inject;
+
+import com.googlesource.gerrit.plugins.its.base.its.InvalidTransitionException;
 import com.googlesource.gerrit.plugins.its.base.its.ItsFacade;
+import com.googlesource.gerrit.plugins.its.jira.restapi.JiraProject;
+import com.googlesource.gerrit.plugins.its.jira.restapi.JiraServerInfo;
+
 import org.eclipse.jgit.lib.Config;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.concurrent.Callable;
 
@@ -45,12 +49,16 @@
 
   @Inject
   public JiraItsFacade(@PluginName String pluginName,
-                       @GerritServerConfig Config cfg) {
+      @GerritServerConfig Config cfg) {
     this.pluginName = pluginName;
     try {
       this.gerritConfig = cfg;
-      ServerInfo info = client().sysInfo();
-      log.info("Connected to JIRA at {}, reported version is {}", info.getBaseUri(), info.getVersion());
+      JiraServerInfo info = client().sysInfo();
+      log.info("Connected to JIRA at {}, reported version is {}",
+          info.getBaseUri(), info.getVersion());
+      for (JiraProject p : client().getProjects()) {
+        log.info("Found project: {} (key: {})", p.getName(), p.getKey());
+      }
     } catch (Exception ex) {
       log.warn("Jira is currently not available", ex);
     }
@@ -59,33 +67,35 @@
   @Override
   public String healthCheck(final Check check) throws IOException {
 
-    return execute(new Callable<String>(){
+    return execute(new Callable<String>() {
       @Override
       public String call() throws Exception {
-        if (check.equals(Check.ACCESS))
-          return healthCheckAccess();
-        else
-          return healthCheckSysinfo();
-      }});
+        if (check.equals(Check.ACCESS)) return healthCheckAccess();
+        return healthCheckSysinfo();
+      }
+    });
   }
 
   @Override
-  public void addComment(final String issueKey, final String comment) throws IOException {
+  public void addComment(final String issueKey, final String comment)
+      throws IOException {
 
-    execute(new Callable<String>(){
+    execute(new Callable<String>() {
       @Override
       public String call() throws Exception {
         log.debug("Adding comment {} to issue {}", comment, issueKey);
-        client().addComment(issueKey, Comment.valueOf(comment));
+        client().addComment(issueKey, comment);
         log.debug("Added comment {} to issue {}", comment, issueKey);
         return issueKey;
-      }});
+      }
+    });
   }
 
   @Override
-  public void addRelatedLink(final String issueKey, final URL relatedUrl, String description)
-      throws IOException {
-    addComment(issueKey, "Related URL: " + createLinkForWebui(relatedUrl.toExternalForm(), description));
+  public void addRelatedLink(final String issueKey, final URL relatedUrl,
+      String description) throws IOException {
+    addComment(issueKey, "Related URL: "
+        + createLinkForWebui(relatedUrl.toExternalForm(), description));
   }
 
   @Override
@@ -98,12 +108,14 @@
         log.debug("Performing action {} on issue {}", actionName, issueKey);
         doPerformAction(issueKey, actionName);
         return issueKey;
-      }});
+      }
+    });
   }
 
   private void doPerformAction(final String issueKey, final String actionName)
-      throws IOException {
-    log.debug("Trying to perform action: " + actionName + " on issue " + issueKey);
+      throws IOException, InvalidTransitionException {
+    log.debug(
+        "Trying to perform action: " + actionName + " on issue " + issueKey);
     boolean ret = client().doTransition(issueKey, actionName);
     if (ret) {
       log.debug("Action " + actionName + " successful on Issue " + issueKey);
@@ -118,54 +130,47 @@
       @Override
       public Boolean call() throws Exception {
         return client().issueExists(issueKey);
-      }});
+      }
+    });
   }
 
-  private JiraClient client() throws IOException {
+  private JiraClient client() throws MalformedURLException {
     if (client == null) {
-      try {
-        log.debug("Connecting to jira at {}", getUrl());
-        client = new JiraClient(getUrl(), getUsername(), getPassword());
-        log.debug("Authenticating as User {}", getUsername());
-      } catch (Exception e) {
-        log.info("Unable to connect to " + getUrl() + " as "
-          + getUsername());
-        throw new IOException(e);
-      }
+      log.debug("Connecting to jira at {}", getUrl());
+      client = new JiraClient(getUrl(), getUsername(), getPassword());
+      log.debug("Authenticating as User {}", getUsername());
     }
     return client;
   }
 
   private <P> P execute(Callable<P> function) throws IOException {
     int attempt = 0;
-    while(true) {
+    while (true) {
       try {
         return function.call();
       } catch (Exception ex) {
         if (isRecoverable(ex) && ++attempt < MAX_ATTEMPTS) {
-          log.debug("Call failed - retrying, attempt {} of {}", attempt, MAX_ATTEMPTS);
+          log.debug("Call failed - retrying, attempt {} of {}", attempt,
+              MAX_ATTEMPTS);
           continue;
         }
-        if (ex instanceof IOException)
-          throw ((IOException)ex);
-        else
-          throw new IOException(ex);
+        if (ex instanceof IOException) throw ((IOException) ex);
+        throw new IOException(ex);
       }
     }
   }
+
   private boolean isRecoverable(Exception ex) {
     String className = ex.getClass().getName();
     return className.startsWith("java.net");
   }
 
   private String getPassword() {
-    return gerritConfig.getString(pluginName, null,
-      GERRIT_CONFIG_PASSWORD);
+    return gerritConfig.getString(pluginName, null, GERRIT_CONFIG_PASSWORD);
   }
 
   private String getUsername() {
-    return gerritConfig.getString(pluginName, null,
-      GERRIT_CONFIG_USERNAME);
+    return gerritConfig.getString(pluginName, null, GERRIT_CONFIG_USERNAME);
   }
 
   private String getUrl() {
@@ -179,14 +184,18 @@
 
   private String healthCheckAccess() throws IOException {
     client().sysInfo();
-    final String result = "{\"status\"=\"ok\",\"username\"=\"" + getUsername() + "\"}";
+    final String result =
+        "{\"status\"=\"ok\",\"username\"=\"" + getUsername() + "\"}";
     log.debug("Healtheck on access result: {}", result);
     return result;
   }
 
   private String healthCheckSysinfo() throws IOException {
-    ServerInfo info = client().sysInfo();
-    final String result = "{\"status\"=\"ok\",\"system\"=\"Jira\",\"version\"=\""+info.getVersion()+"\",\"url\"=\""+getUrl()+"\",\"build\"=\""+info.getBuildNumber()+"\"}";
+    JiraServerInfo info = client().sysInfo();
+    final String result =
+        "{\"status\"=\"ok\",\"system\"=\"Jira\",\"version\"=\""
+            + info.getVersion() + "\",\"url\"=\"" + getUrl() + "\",\"build\"=\""
+            + info.getBuildNumber() + "\"}";
     log.debug("Healtheck on sysinfo result: {}", result);
     return result;
   }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraSession.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraSession.java
deleted file mode 100644
index 2609ddf..0000000
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraSession.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2013 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.its.jira;
-
-public class JiraSession {
-
-  private final String username;
-  private final String token;
-
-  public JiraSession(final String username, final String loginToken) {
-    super();
-    this.username = username;
-    this.token = loginToken;
-  }
-
-  public String getUsername() {
-    return username;
-  }
-
-  public String getToken() {
-    return token;
-  }
-
-  public String toString() {
-    return "username="+username+", token="+token;
-  }
-}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraComment.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraComment.java
new file mode 100644
index 0000000..e3e2f0e
--- /dev/null
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraComment.java
@@ -0,0 +1,24 @@
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.googlesource.gerrit.plugins.its.jira.restapi;
+
+public class JiraComment {
+
+  final String body;
+
+  public JiraComment(String body) {
+    this.body = body;
+  }
+}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraIssue.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraIssue.java
new file mode 100644
index 0000000..8a22098
--- /dev/null
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraIssue.java
@@ -0,0 +1,20 @@
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.googlesource.gerrit.plugins.its.jira.restapi;
+
+public class JiraIssue {
+  String id;
+  String key;
+}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraProject.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraProject.java
new file mode 100644
index 0000000..d244cb4
--- /dev/null
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraProject.java
@@ -0,0 +1,34 @@
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.googlesource.gerrit.plugins.its.jira.restapi;
+
+public class JiraProject {
+
+  String id;
+  String key;
+  String name;
+
+  public String getId() {
+    return id;
+  }
+
+  public String getKey() {
+    return key;
+  }
+
+  public String getName() {
+    return name;
+  }
+}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraRestApi.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraRestApi.java
new file mode 100644
index 0000000..e0be291
--- /dev/null
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraRestApi.java
@@ -0,0 +1,161 @@
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.googlesource.gerrit.plugins.its.jira.restapi;
+
+import com.google.gson.Gson;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang.ArrayUtils;
+import org.eclipse.jgit.util.HttpSupport;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URL;
+
+/**
+ * Jira Rest Client.
+ */
+public class JiraRestApi<T> {
+  private static final String BASE_PREFIX = "/rest/api/2";
+  private final URL baseUrl;
+  private final String auth;
+  private final Gson gson;
+
+  private final Class<T> classOfT;
+  private final String classPrefix;
+  private T data;
+  private int responseCode;
+
+  /**
+   * @param url jira url
+   * @param user username of the jira user
+   * @param pass password of the jira user
+   */
+  JiraRestApi(URL url, String user, String pass, Class<T> classOfT,
+      String classPrefix) {
+    String auth = user + ":" + pass;
+    this.auth = new String(Base64.encodeBase64(auth.getBytes()));
+    this.baseUrl = url;
+    this.gson = new Gson();
+    this.classOfT = classOfT;
+    this.classPrefix = classPrefix;
+  }
+
+  public int getResponseCode() {
+    return responseCode;
+  }
+
+  /**
+   * Do a simple GET request. Object of type 'T' is returned containing the
+   * parsed JSON data
+   *
+   * @param passCode HTTP response code required to mark this GET as success
+   * @param failCodes HTTP response codes allowed and not fail on unexcepted
+   *        response
+   * @throws IOException generated if unexpected failCode is returned
+   */
+  public T doGet(String spec, int passCode, int[] failCodes)
+      throws IOException {
+    HttpURLConnection conn = prepHttpConnection(spec, false);
+    try {
+      if (validateResponse(conn, passCode, failCodes)) {
+        readIncomingData(conn);
+      }
+      return data;
+    } finally {
+      conn.disconnect();
+    }
+  }
+
+  public T doGet(String spec, int passCode) throws IOException {
+    return doGet(spec, passCode, null);
+  }
+
+  /**
+   * Do a simple POST request.
+   */
+  public boolean doPost(String spec, String jsonInput, int passCode)
+      throws IOException {
+    HttpURLConnection conn = prepHttpConnection(spec, true);
+    try {
+      writePostData(jsonInput, conn);
+      return validateResponse(conn, passCode, null);
+    } finally {
+      conn.disconnect();
+    }
+  }
+
+  private HttpURLConnection prepHttpConnection(String spec,
+      boolean isPostRequest) throws IOException {
+    URL url = new URL(baseUrl, BASE_PREFIX + classPrefix + spec);
+    ProxySelector proxySelector = ProxySelector.getDefault();
+    Proxy proxy = HttpSupport.proxyFor(proxySelector, url);
+    HttpURLConnection conn = (HttpURLConnection) url.openConnection(proxy);
+    conn.setRequestProperty("Authorization", "Basic " + auth);
+    conn.setRequestProperty("Content-Type", "application/json");
+    if (isPostRequest) {
+      conn.setRequestMethod("POST");
+      conn.setDoOutput(true);
+    } else {
+      conn.setRequestMethod("GET");
+    }
+    return conn;
+  }
+
+  /**
+   * Write the Read the returned data from the HTTP connection.
+   */
+  private void writePostData(String postData, HttpURLConnection conn)
+      throws IOException {
+    if (postData != null) {
+      try (OutputStream os = conn.getOutputStream()) {
+        os.write(postData.getBytes());
+        os.flush();
+      }
+    }
+  }
+
+  /**
+   * Read the returned data from the HTTP connection.
+   */
+  private void readIncomingData(HttpURLConnection conn) throws IOException {
+    try (InputStreamReader isr = new InputStreamReader(conn.getInputStream())) {
+      data = gson.fromJson(isr, classOfT);
+    }
+  }
+
+  /**
+   * Checks if the connection returned one of the provides pass or fail Codes.
+   * If not, an IOException exception is thrown. If it was part of the list,
+   * then the actual response code is returned. returns true if valid response
+   * is returned, otherwise false
+   */
+  private boolean validateResponse(HttpURLConnection conn, int passCode,
+      int[] failCodes) throws IOException {
+    responseCode = conn.getResponseCode();
+    if (responseCode == passCode) {
+      return true;
+    }
+    if ((failCodes == null)
+        || (!ArrayUtils.contains(failCodes, responseCode))) {
+      throw new IOException("Request failed");
+    }
+    return false;
+  }
+}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraRestApiProvider.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraRestApiProvider.java
new file mode 100644
index 0000000..54ce637
--- /dev/null
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraRestApiProvider.java
@@ -0,0 +1,33 @@
+package com.googlesource.gerrit.plugins.its.jira.restapi;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class JiraRestApiProvider {
+  private final URL url;
+  private final String user;
+  private final String pass;
+
+  public JiraRestApiProvider(String url, String user, String pass)
+      throws MalformedURLException {
+    this.url = new URL(url);
+    this.user = user;
+    this.pass = pass;
+  }
+
+  public <T> JiraRestApi<T> get(Class<T> classOfT, String classPrefix) {
+    return new JiraRestApi<>(url, user, pass, classOfT, classPrefix);
+  }
+
+  public JiraRestApi<JiraIssue> getIssue() {
+    return get(JiraIssue.class, "/issue");
+  }
+
+  public JiraRestApi<JiraServerInfo> getServerInfo() {
+    return get(JiraServerInfo.class, "/serverInfo");
+  }
+
+  public JiraRestApi<JiraProject[]> getProjects() {
+    return get(JiraProject[].class, "/project");
+  }
+}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraServerInfo.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraServerInfo.java
new file mode 100644
index 0000000..9b2fe79
--- /dev/null
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraServerInfo.java
@@ -0,0 +1,39 @@
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.googlesource.gerrit.plugins.its.jira.restapi;
+
+public class JiraServerInfo {
+
+  String baseUrl;
+  String version;
+  String deploymentType;
+  String buildNumber;
+  String buildDate;
+  String serverTime;
+  String scmInfo;
+  String serverTitle;
+
+  public String getVersion() {
+    return version;
+  }
+
+  public String getBuildNumber() {
+    return buildNumber;
+  }
+
+  public String getBaseUri() {
+    return baseUrl;
+  }
+}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraTransition.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraTransition.java
new file mode 100644
index 0000000..4bbad2c
--- /dev/null
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraTransition.java
@@ -0,0 +1,41 @@
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.googlesource.gerrit.plugins.its.jira.restapi;
+
+public class JiraTransition {
+
+  // 'Get Transactions' require a list of items
+  public Item[] transitions;
+
+  // 'Do Transaction' require a single item
+  Item transition;
+
+  public JiraTransition(Item transition) {
+    this.transition = transition;
+  }
+
+  public static class Item {
+    String name;
+    String id;
+
+    public String getName() {
+      return name;
+    }
+
+    public String getId() {
+      return id;
+    }
+  }
+}