diff --git a/.gitignore b/.gitignore index 06011fffff..4f873d0b02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,19 @@ -target/ +# Maven dependency-reduced-pom.xml -openam-ui/openam-ui-ria/npm-debug.log.* +target/ test-output/ + +# MacOS .DS_Store -# Editor generated files +# IDEA *.iml .idea/ + +# Eclipse .project .settings .classpath + +# VSCode +.vscode/ diff --git a/Dockerfile b/Dockerfile index 990e7079d1..dbb7a9045e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /project COPY . . # Perform actual Wren:AM build -ARG BUILD_ARGS=-Dpmd.skip +ARG BUILD_ARGS RUN \ --mount=type=cache,target=/root/.m2 \ --mount=type=cache,target=/root/.npm \ diff --git a/legal/THIRDPARTYREADME.txt b/legal-notices/THIRDPARTYREADME.txt similarity index 100% rename from legal/THIRDPARTYREADME.txt rename to legal-notices/THIRDPARTYREADME.txt diff --git a/legal-notices/license.txt b/legal-notices/license.txt new file mode 100644 index 0000000000..07ee90a596 --- /dev/null +++ b/legal-notices/license.txt @@ -0,0 +1,131 @@ +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/legal-oem/THIRDPARTYREADME.txt b/legal-oem/THIRDPARTYREADME.txt deleted file mode 100644 index 74cdb5c82a..0000000000 --- a/legal-oem/THIRDPARTYREADME.txt +++ /dev/null @@ -1,1883 +0,0 @@ -DO NOT TRANSLATE OR LOCALIZE - -*************************************************************************** -Apache Software License, Version 2.0 -*************************************************************************** - -Version: asciidoctorj-1.5.4.jar -Copyright: Copyright 2012-2016 Dan Allen, Ryan Waldron and the Asciidoctor Project - -Version: bootstrap-tabdrop-1.0.js -Copyright: Copyright 2012 Stefan Petre - -Version: microplugin-0.0.3.js -Copyright: Copyright © 2013 Brian Reavis & Contributors - -Version: selectize-0.12.1-min.js -Copyright: Copyright © 2013 Brian Reavis & Contributors - -Version: sifter-0.4.1-min.js -Copyright: Copyright © 2013 Brian Reavis & Contributors - -Version: Click toolkit (installer) -Copyright: Copyright (c) 2005-2009 Thomas Fuchs, - (c) 2005-2009 Ivan Krstic, - (c) 2005-2009 Jon Tirsen, - (c) 2005-2009 Sam Stephenson, - Copyright (c) 2005-2009 Marty Haught - -Version: excanvas.js 3.6.2 -Copyright: Copyright 2006 Google Inc. - -Version: js-class.js 3.6.2 -Copyright: Copyright 2006 Google Inc. - -Version: click-extras-2.3.0.jar -Copyright: Copyright (c) 2005-2009 Thomas Fuchs, - (c) 2005-2009 Ivan Krstic, - (c) 2005-2009 Jon Tirsen, - (c) 2005-2009 Sam Stephenson, - Copyright (c) 2005-2009 Marty Haught - -Version: click-nodeps-2.3.0.jar -Copyright: Copyright (c) 2005-2009 Thomas Fuchs, - (c) 2005-2009 Ivan Krstic, - (c) 2005-2009 Jon Tirsen, - (c) 2005-2009 Sam Stephenson, - Copyright (c) 2005-2009 Marty Haught - -Version: commons-codec-1.6.jar -Copyright: Copyright 2002-2013 The Apache Software Foundation, - Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org) - -Version: commons-collections-3.2.2.jar -Copyright: Copyright 2001-2015 The Apache Software Foundation - -Version: commons-fileupload-1.3.1.jar -Copyright: Copyright 2002-2014 The Apache Software Foundation - -Version: commons-io-2.3.jar -Copyright: Copyright 2002-2012 The Apache Software Foundation - -Version: commons-lang-2.6.jar -Copyright: Copyright 2001-2008 The Apache Software Foundation - -Version: commons-lang3-3.4.jar -Copyright: Copyright 2001-2015 The Apache Software Foundation - -Version: commons-logging-1.1.3.jar -Copyright: Copyright 2001-2007 The Apache Software Foundation - -Version: commons-logging-api-1.1.jar -Copyright: Copyright 2001-2007 The Apache Software Foundation - -Version: cxf-api-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-rt-bindings-soap-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-rt-bindings-xml-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-rt-core-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-rt-databinding-jaxb-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-rt-frontend-jaxws-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-rt-frontend-simple-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-rt-transports-http-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-rt-transports-http-jetty-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-rt-ws-addr-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-rt-ws-policy-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-rt-ws-security-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: cxf-services-sts-core-2.7.18.jar -Copyright: Copyright 2006-2015 The Apache Software Foundation - -Version: ehcache-core-2.5.1.jar -Copyright: Copyright 2003-2010 Terracotta, Inc. - -Version: FastInfoset-1.2.13.jar -Copyright: Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved. - -Version: forgerock-guava-annotations-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-base-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-cache-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-collect-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-concurrent-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-escape-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-eventbus-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-hash-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-io-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-math-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-net-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-primitives-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guava-reflect-18.0.3.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guice-core-1.1.0.jar -Copyright: Copyright 2010 The Guava Authors - -Version: forgerock-guice-servlet-1.1.0.jar -Copyright: Copyright 2010 The Guava Authors - -Version: geoip2-2.0.0.jar -Copyright: Copyright https://www.maxmind.com - -Version: geronimo-javamail_1.4_spec-1.7.1.jar -Copyright: Copyright (C) 2003-2006 The Apache Software Foundation - -Version: geronimo-servlet_3.0_spec-1.0.jar -Copyright: Copyright 2003-2010 The Apache Software Foundation - Copyright © 1994-2002 World Wide Web Consortium, - (Massachusetts Institute of Technology, Institut National - de Recherche en Informatique et en Automatique, Keio - University). All Rights Reserved. - -Version: google-http-client-1.19.0.jar -Copyright: Copyright (c) 2011 Google Inc. - -Version: groovy-2.4.6.jar -Copyright: Copyright 2001-2016 The Apache Software Foundation - -Version: groovy-json-2.4.6.jar -Copyright: Copyright 2001-2016 The Apache Software Foundation - -Version: groovy-jsr223-2.4.6.jar -Copyright: Copyright 2001-2016 The Apache Software Foundation - -Version: guice-3.0-no_aop.jar -Copyright: Copyright 2009 Google Inc - -Version: guice-assistedinject-3.0.jar -Copyright: Copyright 2009 Google Inc - -Version: guice-multibindings-3.0.jar -Copyright: Copyright 2009 Google Inc - -Version: HikariCP-2.4.1.jar -Copyright: Copyright (C) 2013-2015 Brett Wooldridge - -Version: httpasyncclient-osgi-4.1.2.jar -Copyright: Copyright 2010-2015 The Apache Software Foundation - -Version: httpasyncclient-osgi-4.5.2.jar -Copyright: Copyright 2010-2015 The Apache Software Foundation - -Version: httpclient-4.0.1.jar -Copyright: Copyright 1999-2014 The Apache Software Foundation - -Version: httpclient-4.3.6.jar -Copyright: Copyright 1999-2015 The Apache Software Foundation - -Version: httpclient-osgi-4.5.2.jar -Copyright: Copyright 1999-2015 The Apache Software Foundation - -Version: httpcore-4.0.1.jar -Copyright: Copyright 1999-2014 The Apache Software Foundation - -Version: httpcore-4.3.3.jar -Copyright: Copyright 2005-2015 The Apache Software Foundation - This project contains annotations derived from JCIP-ANNOTATIONS - Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net - -Version: httpcore-osgi-4.4.5.jar -Copyright: Copyright 2005-2015 The Apache Software Foundation - This project contains annotations derived from JCIP-ANNOTATIONS - Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net - -Version: httpcore-nio-4.4.1.jar -Copyright: 2005-2015 The Apache Software Foundation - -Version: jackson-annotations-2.8.1.jar -Copyright: Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi - -Version: jackson-core-2.8.1.jar -Copyright: Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi - -Version: jackson-core-asl-1.9.7.jar -Copyright: Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi - -Version: jackson-databind-2.8.1.jar -Copyright: Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi - -Version: jackson-dataformat-csv-2.8.1.jar -Copyright: Copyright ©2009-2011 FasterXML, LLC. All rights reserved unless otherwise indicated. - -Version: jackson-dataformat-smile-2.4.4.jar -Copyright: Copyright ©2009-2011 FasterXML, LLC. All rights reserved unless otherwise indicated. - -Version: jackson-dataformat-xml-2.8.1.jar -Copyright: Copyright ©2009-2015 FasterXML, LLC. All rights reserved unless otherwise indicated. - -Version: jackson-dataformat-yaml-2.8.1.jar -Copyright: Copyright ©2009-2015 FasterXML, LLC. All rights reserved unless otherwise indicated. - -Version: jackson-module-jaxb-annotations-2.8.1.jar -Copyright: Copyright ©2009-2011 FasterXML, LLC. All rights reserved unless otherwise indicated. - -Version: jackson-module-jsonSchema-2.8.1.jar -Copyright: Copyright ©2009-2011 FasterXML, LLC. All rights reserved unless otherwise indicated. - -Version: java-ipv6-0.14.jar -Copyright: Copyright 2013 Jan Van Besien - -Version: javax.inject-1.jar -Copyright: Copyright (C) 2009 The JSR-330 Expert Group - -Version: jetty-continuation-8.1.15.v20140411.jar -Copyright: Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. - -Version: jetty-http-8.1.15.v20140411.jar -Copyright: Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. - -Version: jetty-io-8.1.15.v20140411.jar -Copyright: Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. - -Version: jetty-security-8.1.15.v20140411.jar -Copyright: Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. - -Version: jetty-server-8.1.15.v20140411.jar -Copyright: Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. - -Version: jetty-util-8.1.15.v20140411.jar -Copyright: Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. - -Version: joda-time-2.1.jar -Copyright: Copyright 2001-2011 Stephen Colebourne - -Version: jsr305-3.0.0.jar -Copyright: Copyright (C) 2005, University of Maryland - Copyright (c) 2005 Brian Goetz - -Version: jstl-1.1.2.jar -Copyright: Copyright 1999-2004 The Apache Software Foundation. - -Version: maxmind-db-1.0.0.jar -Copyright: Copyright (c) 2014 by MaxMind, Inc. - -Version: neethi-3.0.3.jar -Copyright: Copyright © 2004-2014 The Apache Software Foundation. All Rights Reserved. - -Version: opensaml-2.6.1.jar -Copyright: Copyright (c) University Corporation for Advanced Internet Development, Inc. - -Version: openws-1.5.1.jar -Copyright: Copyright 2007 University Corporation for Advanced Internet Development, Inc. - -Version: org.apache.servicemix.bundles.javax-inject-1_2.jar -Copyright: Copyright (C) 2009 The JSR-330 Expert Group - Copyright 2005-2012 The Apache Software Foundation - -Version: org.restlet.ext.freemarker-2.3.4.jar -Copyright: Copyright 2005-2012 Restlet S.A.S. - -Version: org.restlet.ext.jackson-2.3.4.jar -Copyright: Copyright 2005-2012 Restlet S.A.S. - -Version: org.restlet.ext.json-2.3.4.jar -Copyright: Copyright 2005-2012 Restlet S.A.S. - -Version: org.restlet.ext.servlet-2.3.4.jar -Copyright: Copyright 2005-2012 Restlet S.A.S. - -Version: org.restlet.ext.slf4j-2.3.4.jar -Copyright: Copyright 2005-2012 Restlet S.A.S. - -Version: org.restlet.ext.xml-2.3.4.jar -Copyright: Copyright 2005-2012 Restlet S.A.S. - -Version: org.restlet-2.3.4.jar -Copyright: Copyright 2005-2012 Restlet S.A.S. - -Version: serializer-2.7.1.jar -Copyright: Copyright 2001, 2002,2004 The Apache Software Foundation. - -Version: snakeyaml-1.6.jar -Copyright: Copyright (c) 2008-2010 Andrey Somov - -Version: super-csv-2.4.0.jar -Copyright: Copyright 2007 Kasper B. Graversen - -Version: swagger-models-1.5.9.jar -Copyright: Copyright 2016 SmartBear Software - -Version: velocity-1.7.jar -Copyright: Copyright 2005-2012 Restlet S.A.S. - -Version: xalan-2.7.1.jar -Copyright: Copyright 1999-2006- Apache 1999-2002 - Lotus 2001-2002 - Sun, 2003 - IBM - -Version: xercesImpl-2.11.0.jar -Copyright: Copyright 1999-2006- Apache 1999-2002 - Lotus 2001-2002 - Sun, 2003 - IBM - -Version: xml-apis-2.11.0.jar -Copyright: Copyright 1999-2006- Apache 1999-2002 - Lotus 2001-2002 - Sun, 2003 - IBM - -Version: xml-resolver-2.11.0.jar -Copyright: Copyright 1999-2006- Apache 1999-2002 - Lotus 2001-2002 - Sun, 2003 - IBM - -Version: xml-resolver-1.2.jar -Copyright: Copyright 2006 The Apache Software Foundation. - -Version: xml-serializer-2.11.0.jar -Copyright: Copyright 1999-2006- Apache 1999-2002 - Lotus 2001-2002 - Sun, 2003 - IBM - -Version: xmlschema-core-2.1.0.jar -Copyright: Copyright 2004-2014 The Apache Software Foundation - Portions Copyright 2006 International Business Machines Corp. - Portions Copyright (C) World Wide Web Consortium 2006, 2007 and licensed under the - three-part BSD license. - -Version: xmlsec-1.5.6.jar -Copyright: Copyright 2000-2013 The Apache Software Foundation - -Version: xmltooling-1.4.1.jar -Copyright: Copyright 2008 Members of the EGEE Collaboration. - Copyright 2008 University Corporation for Advanced Internet Development, Inc. - -Version: validation-api-1.1.0.Final.jar -Copyright: Copyright 2009-2012, Red Hat, Inc. and/or its affiliates, and individual contributors - -Version: woodstox-core-asl-4.3.0.jar -Copyright (c) 2004 Tatu Saloranta, tatu.saloranta@iki.fi - -Version: woodstox-core-asl-4.4.1.jar -Copyright (c) 2004 Tatu Saloranta, tatu.saloranta@iki.fi - -Version: woodstox-core-5.0.2.jar -Copyright (c) 2004 Tatu Saloranta, tatu.saloranta@iki.fi - -Version: wss4j-1.6.19.jar -Copyright: Copyright 2004-2015 The Apache Software Foundation - -Version: joda-time-2.7.jar -Copyright 2001-2016 Stephen Colebourne - -================== -Full license text: -================== - -Apache License - -Version 2.0, January 2004 - -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - -"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - -You must give any other recipients of the Work or Derivative Works a copy of this License; and -You must cause any modified files to carry prominent notices stating that You changed the files; and -You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and -If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. - -You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. -5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) 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. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work -To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -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. - - -*************************************************************************** -The BSD 3-Clause License -*************************************************************************** - -Version: asm-3.3.1.jar -Copyright: Copyright (c) 2000-2011 INRIA, France Telecom - -Version: sinon-1.10.3.js -Copyright: Copyright (c) 2010-2014, Christian Johansen - -Version: YUI toolkit (installer) -Copyright: Copyright (c) 2007, Yahoo! Inc. All rights reserved. - -Version: esapiport-2013-12-04.jar -Copyright: Copyright (c) 2007 - The OWASP Foundation - -Version: freemarker-2.3.19.jar -Copyright: Copyright (c) 2003 The Visigoth Software Society. All rights reserved. - -Version: ognl-2.6.9.jar -Copyright: Copyright (c) 1998-2004, Drew Davidson and Luke Blanshard - -Version: relaxngDatatype-20020414.jar -Copyright: Copyright (c) 2001, Thai Open Source Software Center Ltd, James Clark, Kohsuke KAWAGUCHI - -Version: forgerock-util-1.3.5.jar -Copyright: Copyright 2014 ForgeRock AS., - Copyright © 2010 ApexIdentity Inc. All rights reserved., - Copyright (c) 2004, Mikael Grev, MiG InfoCom AB., - Copyright (c) 2006-2008 Sun Microsystems Inc. All Rights Reserved - -Version: jquery-nestingSortable-0.9.12.js -Copyright: Copyright (c) 2012 Jonas von Andrian - -Version: jsslutils-1.0.5.jar -Copyright: Copyright (c) 2008-2010, The University of Manchester, United Kingdom. All rights reserved. - -================== -Full license text: -================== - -Copyright (c) , -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -2. 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. - -3. Neither the name of the copyright holder 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. - - -*************************************************************************** -The BSD 2-Clause License -*************************************************************************** - -Version: stax2-api-3.1.4.jar -Copyright: Copyright (c) 2010-, FasterXML.com - -================== -Full license text: -================== - -Copyright (c) , -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -2. 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. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. - - -*************************************************************************** -Common Public License Version 1.0 (CPL) -*************************************************************************** - -Version: wsdl4j-1.6.3.jar -Copyright: Copyright IBM Corp 2001-2013 - -================== -Full license text: -================== - -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. - - -*************************************************************************** -The MIT License (MIT) -*************************************************************************** - -Version: backbone-1.1.2-min.js -Copyright: Copyright (c) 2010-2014 Jeremy Ashkenas, DocumentCloud - -Version: backbone-relational-0.9.0-min.js -Copyright: Copyright (c) 2011-2014 Paul Uithol - -Version: backbone.paginator.min-2.0.2-min.js -Copyright: Copyright (c) 2012-2014 Jimmy Yuen Ho Wong and contributors - -Version: backgrid-filter.min-0.3.5-min.js -Copyright: Copyright (c) 2012 Jimmy Yuen Ho Wong - -Version: backgrid-paginator-0.3.5-custom.min.js -Copyright: Copyright (c) 2012 Jimmy Yuen Ho Wong - -Version: backgrid-paginator.min-0.3.5-min.js -Copyright: Copyright (c) 2012 Jimmy Yuen Ho Wong - -Version: backgrid-select-all-0.3.5-min.js -Copyright: Copyright (c) 2012 Jimmy Yuen Ho Wong - -Version: backgrid.min-0.3.5-min.js -Copyright: Copyright (c) 2012 Jimmy Yuen Ho Wong - -Version: bootstrap-3.3.5-custom.js -Copyright: Copyright (c) 2011-2015 Twitter, Inc - -Version: bootstrap-clockpicker-0.0.7-min.js -CopyrightL Copyright (c) 2014 Wang Shenwei - -Version: bootstrap-datetimepicker-4.14.30-min.js -Copyright: Copyright (c) 2015 Jonathan Peterson - -Version: bootstrap-dialog-1.34.4-min.js -Copyright: Copyright 2015 Twitter. - -Version: codemirror/addon/display/fullscreen.js -Copyright: Copyright (C) 2014 by Marijn Haverbeke - -Version: codemirror/lib/codemirror.js -Copyright: Copyright (C) 2014 by Marijn Haverbeke - -Version: codemirror/mode/groovy/groovy.js -Copyright: Copyright (C) 2014 by Marijn Haverbeke - -Version: codemirror/mode/javascript/javascript.js -Copyright: Copyright (C) 2014 by Marijn Haverbeke - -Version: form2js-2.0.js -Copyright: Copyright (c) 2010 Maxim Vasiliev - -Version: handlebars-3.0.3-min.js -Copyright: Copyright (C) 2011-2015 by Yehuda Katz - -Version: grid.locale-en.js -Copyright: Copyright (c) Tony Tomov tony@trirand.com - -Version: groovy-sandbox-1.6.jar -Copyright: Copyright (c) 2012-2014 Kohsuke Kawaguchi, CloudBees, Inc., other contributors - -Version: i18next-1.7.3-min.js -Copyright: Copyright (c)2014 Jan Mühlemann (jamuhl). - -Version: jquery-1.11.1-min.js -Copyright: Copyright (c) 2005, 2014 jQuery Foundation, Inc. - -Version: jquery-2.1.1-min.js -Copyright: Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors - -Version: bootstrap-clockpicker-0.0.7-min.js -Copyright: Copyright 2014 Wang Shenwei. - -Version: jquery-ui-1.11.1-min.js -Copyright: Copyright (c) 2005, 2014 jQuery Foundation, Inc. - -Version: jquery.autosize.input.min.js -Copyright: Copyright http://www.jacklmoore.com/autosize - -Version: jquery.ba-dotimeout-1.0-min.js -Copyright: Copyright (c) 2010 "Cowboy" Ben Alma - -Version: jquery.jqGrid-4.5.4-min.js -Copyright: Copyright (c) 2010 Shawn Chin - -Version: jquery.placeholder-2.0.8.js -Copyright: Copyright Mathias Bynens - -Version: js2form-2.0.js -Copyright: Copyright (c) 2010 Maxim Vasiliev - -Version: lodash-3.10.1-min.js -Copyright: Copyright 2012-2015 The Dojo Foundation - Copyright (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative (from Underscore.js 1.5.2) - -Version: moment-2.8.1-min.js -Copyright: Copyright Tim Wood, Iskren Chernev, Moment.js - -Version: qrcode-1.0.0-min.js -Copyright: Copyright (c) 2009 Kazuhiko Arase - -Version: qunit-1.15.0.js -Copyright: Copyright 2012-2014 The Dojo Foundation - -Version: requirejs-2.1.14-min.js -Copyright: Copyright (c) 2010-2014, The Dojo Foundation - -Version: spin-2.0.1-min.js -Copyright: Copyright (c) 2011-2014 Felix Gnass - -Version: squire-0.2.0.js -Copyright: Copyright (c) 2013 Merrick Christensen - -Version: ui.multiselect-0.3.js -Copyright: Copyright Michael Aufreiter, Yanick Rochon - -Version: xdate-0.8-min.js -Copyright: Copyright (c) 2011 Adam Shaw, http://arshaw.com/xdate/ - -Version: bluff-min.js 3.6.2 -Copyright: Copyright (C) 2008-2010 James Coglan - -Version: bluff-src.js 3.6.2 -Copyright: Copyright (C) 2008-2010 James Coglan - -Version: jquery-amd-min.js -Copyright: Copyright 2011, John Resig - -Version: jquery-ui.js -Copyright: Copyright 2011, John Resig - -Version: jquery.js -Copyright: Copyright 2011, John Resig - -Version: jquery-amd-1.7.1-alpha-1.js -Copyright: Copyright 2011, John Resig - -Version: sha256.js -Copyright: Copyright (c) 2009-2013 by Jeff Mott. All rights reserved. - -Version: swfobject-2.2-min.js -Copyright: Copyright (c) 2007-2009 Geoff Stearns, Michael Williams, and Bobby van der Sluis - -Version: calendar_date_select.js (1.16.1) -Copyright: Copyright 2009 Tim Harper - -Version: jsoneditor-0.7.22-custom.js -Copyright: Copyright (c) 2013 Jeremy Dorn - -Version: jsoneditor-0.7.9-min.js -Copyright: Copyright (c) 2013 Jeremy Dorn - -Version: js2form-2.0.js -Copyright: Copyright (c) 2010 Maxim Vasiliev - -Version: require-jquery.js -Copyright: Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. - -Version: colorpicker.js -Copyright: Copyright 2008 Sebo Zoltan - -Version: isorelax-20030108.jar -Copyright: Copyright 2001 Kohsuke KAWAGUCHI - -Version: slf4j-api-1.7.5.jar -Copyright: Copyright 2004-2013 QOS.ch - -Version: slf4j-nop-1.7.5.jar -Copyright: Copyright 2004-2013 QOS.ch - -Version: slf4j-jdk14-1.7.5.jar -Copyright: Copyright 2004-2007 QOS.ch - -Version: text.js -Copyright: Copyright (c) 2010-2014, The Dojo Foundation - -================== -Full license text: -================== - -The MIT License (MIT) - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - -*************************************************************************** -Mozilla Public License 2.0 (MPL-2.0) -*************************************************************************** - -Version: jss4-2007-08-11.jar -Copyright: Copyright Mozilla Foundation - -Version: rhino-1.7R4.jar -Copyright: Copyright Mozilla Foundation - -================== -Full license text: -================== - -1. Definitions -1.1. “Contributor” -means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software. - -1.2. “Contributor Version” -means the combination of the Contributions of others (if any) used by a Contributor and that particular Contributor’s Contribution. - -1.3. “Contribution” -means Covered Software of a particular Contributor. - -1.4. “Covered Software” -means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof. - -1.5. “Incompatible With Secondary Licenses” -means - -that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or - -that the Covered Software was made available under the terms of version 1.1 or earlier of the License, but not also under the terms of a Secondary License. - -1.6. “Executable Form” -means any form of the work other than Source Code Form. - -1.7. “Larger Work” -means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software. - -1.8. “License” -means this document. - -1.9. “Licensable” -means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently, any and all of the rights conveyed by this License. - -1.10. “Modifications” -means any of the following: - -any file in Source Code Form that results from an addition to, deletion from, or modification of the contents of Covered Software; or - -any new file in Source Code Form that contains any Covered Software. - -1.11. “Patent Claims” of a Contributor -means any patent claim(s), including without limitation, method, process, and apparatus claims, in any patent Licensable by such Contributor that would be infringed, but for the grant of the License, by the making, using, selling, offering for sale, having made, import, or transfer of either its Contributions or its Contributor Version. - -1.12. “Secondary License” -means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses. - -1.13. “Source Code Form” -means the form of the work preferred for making modifications. - -1.14. “You” (or “Your”) -means an individual or a legal entity exercising rights under this License. For legal entities, “You” includes any entity that 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 and Conditions -2.1. Grants -Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license: - -under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its Contributions, either on an unmodified basis, with Modifications, or as part of a Larger Work; and - -under Patent Claims of such Contributor to make, use, sell, offer for sale, have made, import, and otherwise transfer either its Contributions or its Contributor Version. - -2.2. Effective Date -The licenses granted in Section 2.1 with respect to any Contribution become effective for each Contribution on the date the Contributor first distributes such Contribution. - -2.3. Limitations on Grant Scope -The licenses granted in this Section 2 are the only rights granted under this License. No additional rights or licenses will be implied from the distribution or licensing of Covered Software under this License. Notwithstanding Section 2.1(b) above, no patent license is granted by a Contributor: - -for any code that a Contributor has removed from Covered Software; or - -for infringements caused by: (i) Your and any other third party’s modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or - -under Patent Claims infringed by Covered Software in the absence of its Contributions. - -This License does not grant any rights in the trademarks, service marks, or logos of any Contributor (except as may be necessary to comply with the notice requirements in Section 3.4). - -2.4. Subsequent Licenses -No Contributor makes additional grants as a result of Your choice to distribute the Covered Software under a subsequent version of this License (see Section 10.2) or under the terms of a Secondary License (if permitted under the terms of Section 3.3). - -2.5. Representation -Each Contributor represents that the Contributor believes its Contributions are its original creation(s) or it has sufficient rights to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use -This License is not intended to limit any rights You have under applicable copyright doctrines of fair use, fair dealing, or other equivalents. - -2.7. Conditions -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in Section 2.1. - -3. Responsibilities -3.1. Distribution of Source Form -All distribution of Covered Software in Source Code Form, including any Modifications that You create or to which You contribute, must be under the terms of this License. You must inform recipients that the Source Code Form of the Covered Software is governed by the terms of this License, and how they can obtain a copy of this License. You may not attempt to alter or restrict the recipients’ rights in the Source Code Form. - -3.2. Distribution of Executable Form -If You distribute Covered Software in Executable Form then: - -such Covered Software must also be made available in Source Code Form, as described in Section 3.1, and You must inform recipients of the Executable Form how they can obtain a copy of such Source Code Form by reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and - -You may distribute such Executable Form under the terms of this License, or sublicense it under different terms, provided that the license for the Executable Form does not attempt to limit or alter the recipients’ rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work -You may create and distribute a Larger Work under terms of Your choice, provided that You also comply with the requirements of this License for the Covered Software. If the Larger Work is a combination of Covered Software with a work governed by one or more Secondary Licenses, and the Covered Software is not Incompatible With Secondary Licenses, this License permits You to additionally distribute such Covered Software under the terms of such Secondary License(s), so that the recipient of the Larger Work may, at their option, further distribute the Covered Software under the terms of either this License or such Secondary License(s). - -3.4. Notices -You may not remove or alter the substance of any license notices (including copyright notices, patent notices, disclaimers of warranty, or limitations of liability) contained within the Source Code Form of the Covered Software, except that You may alter any license notices to the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms -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 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 every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any jurisdiction. - -4. Inability to Comply Due to Statute or Regulation -If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Software due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be placed in a text file included with all distributions of the Covered Software under this License. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. - -5. Termination -5.1. The rights granted under this License will terminate automatically if You fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor explicitly and finally terminates Your grants, and (b) on an ongoing basis, if such Contributor fails to notify You of the non-compliance by some reasonable means prior to 60 days after You have come back into compliance. Moreover, Your grants from a particular Contributor are reinstated on an ongoing basis if such Contributor notifies You of the non-compliance by some reasonable means, this is the first time You have received notice of non-compliance with this License from such Contributor, and You become compliant prior to 30 days after Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent infringement claim (excluding declaratory judgment actions, counter-claims, and cross-claims) alleging that a Contributor Version directly or indirectly infringes any patent, then the rights granted to You by any and all Contributors for the Covered Software under Section 2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or Your distributors under this License prior to termination shall survive termination. - -6. Disclaimer of Warranty -Covered Software is provided under this License on an “as is” basis, without warranty of any kind, either expressed, implied, or statutory, 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 any 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 under this License except under this disclaimer. - -7. Limitation of Liability -Under no circumstances and under no legal theory, whether tort (including negligence), contract, or otherwise, shall any Contributor, or anyone who distributes Covered Software as permitted above, be liable to You for any direct, 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. Litigation -Any litigation relating to this License may be brought only in the courts of a jurisdiction where the defendant maintains its principal place of business and such litigation shall be governed by laws of that jurisdiction, without reference to its conflict-of-law provisions. Nothing in this Section shall prevent a party’s ability to bring cross-claims or counter-claims. - -9. Miscellaneous -This License represents the complete agreement concerning the 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. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not be used to construe this License against a Contributor. - -10. Versions of the License -10.1. New Versions -Mozilla Foundation is the license steward. Except as provided in Section 10.3, no one other than the license steward has the right to modify or publish new versions of this License. Each version will be given a distinguishing version number. - -10.2. Effect of New Versions -You may distribute the Covered Software under the terms of the version of the License under which You originally received the Covered Software, or under the terms of any subsequent version published by the license steward. - -10.3. Modified Versions -If you create software not governed by this License, and you want to create a new license for such software, you may create and use a modified version of this License if you rename the license and remove any references to the name of the license steward (except to note that such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses -If You choose to distribute Source Code Form that is Incompatible With Secondary Licenses under the terms of this version of the License, the notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - “Incompatible With Secondary Licenses” Notice -This Source Code Form is “Incompatible With Secondary Licenses”, as defined by the Mozilla Public License, v. 2.0. - - -*************************************************************************** -COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -*************************************************************************** - -Version: browserVersion.js -Copyright: Copyright (c) 2007 Sun Microsystems Inc. All Rights Reserved - -Version: password.js -Copyright: Copyright (c) 2007 Sun Microsystems Inc. All Rights Reserved - -Version: activation-1.1.jar -Copyright: Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. - -Version: grizzly-framework-2.3.11.jar -Copyright: Copyright (c) 2009-2013 Oracle and/or its affiliates. All rights reserved. - -Version: jato-2005-05-04.jar -Copyright: Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved - -Version: cc-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: cc_de-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: cc_es-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: cc_fr-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: cc_it-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: cc_ja-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: cc_ko-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: cc_sv-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: cc_zh-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: cc_zh_CN-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: cc_zh_HK-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: cc_zh_TW-2008-08-08.jar -Copyright: Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved - -Version: grizzly-framework-2.3.23.jar -Copyright: Copyright (c) 2007-2015 Oracle and/or its affiliates. All rights reserved. - -Version: grizzly-http-2.3.23.jar -Copyright: Copyright (c) 2007-2015 Oracle and/or its affiliates. All rights reserved. - -Version: grizzly-http-server-2.3.23.jar -Copyright: Copyright (c) 2007-2015 Oracle and/or its affiliates. All rights reserved. - -Version: grizzly-http-servlet-2.3.23.jar -Copyright: Copyright (c) 2007-2015 Oracle and/or its affiliates. All rights reserved. - -Version: jaxb-impl-1.0.6.jar -Copyright: Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved - -Version: jaxb-xjc-1.0.6.jar -Copyright: Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved - -Version: jsp-api-2.1.jar -Copyright: Copyright 2005 Sun Microsystems, Inc. All rights reserved. - -Version: jaxb-api-1.0.6.jar -Copyright: Copyright (c) 2001-2011 Oracle and/or its affiliates. All rights reserved. - -Version: javax.security.auth.message-3.1.jar -Copyright: Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. - -Version: jaxb-libs-1.0.6.jar -Copyright: Copyright (c) 2001-2011 Oracle and/or its affiliates. All rights reserved. - -Version: jaxb1-impl-2.0.2.jar -Copyright: Copyright (c) 2001-2011 Oracle and/or its affiliates. All rights reserved. - -Version: jaxp-api-1.4.2.jar -Copyright: Copyright (c) 2001-2011 Oracle and/or its affiliates. All rights reserved. - -Version: jaxrpc-api-1.1.jar -Copyright: Copyright (c) 2001-2011 Oracle and/or its affiliates. All rights reserved. - -Version: jaxrpc-impl-1.1.3_01-041406.jar -Copyright: Copyright (c) 2001-2011 Oracle and/or its affiliates. All rights reserved. - -Version: jaxrpc-spi-1.1.3_01.jar -Copyright: Copyright (c) 2001-2011 Oracle and/or its affiliates. All rights reserved. - -Version: jdmkrt-2007-01-10.jar -Copyright: Copyright (c) 2001-2011 Oracle and/or its affiliates. All rights reserved. - -Version: jersey-bundle-1.1.1-ea.jar -Copyright: Copyright (c) 2001-2011 Oracle and/or its affiliates. All rights reserved. - -Version: jersey-client-1.1.5.2.jar -Copyright: Copyright 1997-2007 Sun Microsystems - -Version: jersey-core-1.1.5.2.jar -Copyright: Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. - -Version: chf-http-core-1.0.0.jar -Copyright: Copyright 2015 ForgeRock AS. - -Version: chf-http-servlet-1.0.0.jar -Copyright: Copyright 2015 ForgeRock AS. - -Version: chf-client-apache-common-1.0.0.jar -Copyright: Copyright 2015 ForgeRock AS. - -Version: chf-client-apache-sync-1.0.0.jar -Copyright: Copyright 2015 ForgeRock AS. - -Version: json-fluent-3.0.0.jar -Copyright: Copyright 2015 ForgeRock AS. - -Version: json-resource-3.0.0.jar -Copyright: Copyright 2015 ForgeRock AS. - -Version: json-resource-http-3.0.0.jar -Copyright: Copyright 2015 ForgeRock AS. - -Version: json-web-token-3.0.0.jar -Copyright: Copyright 2015 ForgeRock AS. - -Version: jsr311-api-1.1.1.jar -Copyright: Copyright (c) 2009 Sun Microsystems Inc. All Rights Reserved - -Version: mail-1.4.5.jar -Copyright: Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. - -Version: oauth-client-1.1.5.2.jar -Copyright: Copyright 2009 Sun Microsystems, Inc. All rights reserved. - -Version: oauth-server-1.1.5.2.jar -Copyright: Copyright 2009 Sun Microsystems, Inc. All rights reserved. - -Version: oauth-signature-1.1.5.2.jar -Copyright: Copyright 2009 Sun Microsystems, Inc. All rights reserved. - -Version: opendj-ldap-sdk-2.6.9.jar -Copyright: Copyright 2014 ForgeRock AS. - -Version: opendj-server-2.6.2.jar -Copyright: Copyright 2014 ForgeRock AS. - -Version: xsdlib-20060615.jar -Copyright: Copyright (c) 2001-2013 Oracle and/or its affiliates. All rights reserved. - -Version: ClientSDK-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Copyright 2011-2014 ForgeRock AS., - Portions Copyrighted 2014 Nomura Research Institute, Ltd., - Portions Copyrighted 2012 Open Source Solution Technology Corporation, - Portions Copyrighted 2013 Cybernetica AS., - Copyright © 2010 ApexIdentity Inc. All rights reserved., - Copyright (c) 2004, Mikael Grev, MiG InfoCom AB. - -Version: i18n-core-1.4.0.jar -Copyright: Copyright 2009 Sun Microsystems, Inc, - Portions copyright 2011 ForgeRock AS - -Version: i18n-core-1.4.1.jar -Copyright: Copyright 2009 Sun Microsystems, Inc, - Portions copyright 2011 ForgeRock AS - -Version: openam-auth-ad-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-auth-anonymous-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-auth-application-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-auth-cert-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-auth-datastore-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-auth-hotp-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS, - Portions Copyrighted 2014 Nomura Research Institute, Ltd - -Version: openam-auth-httpbasic-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-auth-jdbc-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS, - Copyrighted 2012 Open Source Solution Technology Corporation - -Version: openam-auth-ldap-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS, - Portions Copyrighted 2014 Nomura Research Institute, Ltd - -Version: openam-auth-membership-12.0.0.jar -Copyright: Copyright (c) 2011-2012 ForgeRock Inc. All Rights Reserved, - Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved - -Version: openam-auth-msisdn-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-auth-nt-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-auth-radius-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-auth-scripted-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-auth-securid-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-auth-windowsdesktopsso-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS - -Version: openam-common-auth-ui-12.0.0.jar -Copyright: Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS., - Portions Copyrighted 2012 Open Source Solution Technology Corporation, - Portions Copyrighted 2013 Nomura Research Institute, Ltd. - -Version: openam-configurator-tool-12.0.0.jar -Copyright: Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved., - Portions Copyrighted 2011-2014 ForgeRock AS, - Portions Copyrighted 2012 Open Source Solution Technology Corporation - -Version: openam-core-12.0.0.jar -Copyright: Copyright (c) 2005-2009 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS, - Portions Copyrighted 2014 Nomura Research Institute Ltd., - Portions Copyrighted 2012 Open Source Solution Technology Corporation, - Portions Copyrighted 2013 Cybernetica AS. - -Version: openam-coretoken-12.0.0.jar -Copyright: Copyright (c) 2009 Sun Microsystems Inc. All Rights Reserved - -Version: openam-entitlements-12.0.0.jar -Copyright: Copyright (c) 2008-2009 Sun Microsystems Inc. All Rights Reserved, - Copyright 2011-2014 ForgeRock AS. - -Version: openam-example-clientsdk-cli-12.0.0.jar -Copyright: Copyright (c) 2006-2007 Sun Microsystems Inc. All Rights Reserved - -Version: openam-federation-library-12.0.0.jar -Copyright: Copyright (c) 2008-2009 Sun Microsystems Inc. All Rights Reserved, - Copyright 2011-2014 ForgeRock AS., - Portions Copyrighted 2014 Nomura Research Institute, Ltd. - -Version: openam-idpdiscovery-12.0.0.jar -Copyright: Copyright (c) 2006-2007 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2013 ForgeRock AS. - -Version: openam-server-auth-ui-12.0.0.jar -Copyright: Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved, - Portions Copyrighted 2011-2014 ForgeRock AS, - Portions Copyrighted 2014 Nomura Research Institute, Ltd. - -Version: OpenFM-12.0.0.jar -Copyright: Copyright (c) 2006-2007 Sun Microsystems Inc. All Rights Reserved, - Copyright 2011-2013 ForgeRock AS., - Portions Copyrighted 2012 Open Source Solution Technology Corporation, - Portions Copyrighted 2014 Nomura Research Institute, Ltd. - -Version: oauth2-core-12.0.0.jar -Copyright: Copyright 2014 ForgeRock AS., - Portions Copyrighted 2014 Nomura Research Institute, Ltd. - -Version: openam-auth-adaptive-12.0.0.jar -Copyright: Copyright (c) 2011-2014 ForgeRock AS. All Rights Reserved, - Portions Copyrighted 2013-2014 Nomura Research Institute, Ltd - -Version: openam-auth-common-12.0.0.jar -Copyright: Copyright 2011-2014 ForgeRock AS., - Portions Copyrighted 2011 Cybernetica AS. - -Version: openam-oauth-12.0.0.jar -Copyright: Copyright 2014 ForgeRock AS., - Portions Copyrighted 2014 Nomura Research Institute, Ltd. - -Version: openam-auth-oath-12.0.0.jar -Copyright: Copyright 2014 ForgeRock AS.,Copyright (c) 2011 IETF Trust, - Portions Copyrighted 2014 Nomura Research Institute, Ltd, - -Version: openam-auth-oauth2-12.0.0.jar -Copyright: Copyright 2011-2014 ForgeRock AS., - Copyright 2011 Cybernetica AS. - -Version: openam-cli-definitions-12.0.0.jar -Copyright: Copyright (c) 2011-2014 ForgeRock AS. All Rights Reserved, - Portions Copyrighted 2013-2014 Nomura Research Institute, Ltd - -Version: openam-cli-impl-12.0.0.jar -Copyright: Copyright (c) 2011-2014 ForgeRock AS. All Rights Reserved, - Portions Copyrighted 2013-2014 Nomura Research Institute, Ltd - -Version: openam-installer-utils-12.0.0.jar -Copyright: Copyright (c) 2011 ForgeRock AS. All Rights Reserved, - Portions Copyrighted 2012 Open Source Solution Technology Corporation - -Version: openam-upgrade-tool-12.0.0.jar -Copyright: Portions Copyrighted 2012 Open Source Solution Technology Corporation - -Version: openam-oauth2-12.0.0.jar -Copyright: Copyright 2014 ForgeRock AS., - Portions Copyrighted 2014 Nomura Research Institute, Ltd - -Version: openam-rest-12.0.0.jar -Copyright: Copyright 2014 ForgeRock AS., - Copyright (c) 2006-2008 Sun Microsystems Inc., - Portions Copyrighted 2014 Nomura Research Institute, Ltd - -Version: openid-connect-restlet-12.0.0.jar -Copyright: Copyright 2014 ForgeRock AS., - Portions Copyrighted 2014 Nomura Research Institute, Ltd - -Version: forgerock-util-2.0.0.jar -Copyright: Copyright 2015 ForgeRock AS., - Copyright © 2010 ApexIdentity Inc. All rights reserved., - Copyright (c) 2004, Mikael Grev, MiG InfoCom AB., - Copyright (c) 2006-2008 Sun Microsystems Inc. All Rights Reserved - -Version: javax.mail-1.5.1.jar -Copyright: Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. - -================== -Full license text: -================== - -COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0 (CDDL-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 recipients 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 PARTYS 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 jurisdictions 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. - - -*************************************************************************** -COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1 -*************************************************************************** - -Version: mimepull-1.7.jar -Copyright: Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. - -Version: saaj-impl-1.3.19.jar -Copyright: Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved. - -================== -Full license text: -================== - -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. -Oracle 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. If You assert a patent infringement claim against Participant alleging that the Participant Software directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. -6.4. 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 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. - -NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) - -The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. - -*************************************************************************** -Eclipse Public License (EPL) Version 1.0 -*************************************************************************** - -Version: jgrapht-core-0.9.1.jar -Copyright: Copyright 2003-2015, by Barak Naveh and Contributors. All rights reserved. - -Version: jruby-complete-1.7.21.jar -Copyright: Copyright (c) 2007-2016 The JRuby project - -================== -Full license text: -================== - -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE 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 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. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation 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. - - -*************************************************************************** -CC0 - Public Domain Dedication -*************************************************************************** - -Version: HdrHistogram-2.1.4.jar -Copyright disclaimer: Written by Gil Tene of Azul Systems, and released to the public domain, - -Version: json2-1.0.js -Copyright: Public Domain. - NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. - -================== -Full license text: -================== - -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following: - -the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work; -moral rights retained by the original author(s) and/or performer(s); -publicity and privacy rights pertaining to a person's image or likeness depicted in a Work; -rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below; -rights protecting the extraction, dissemination, use and reuse of data in a Work; -database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and -other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof. -2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose. - -4. Limitations and Disclaimers. - -No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document. -Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law. -Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work. -Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work. - -*************************************************************************** -The JSON License -*************************************************************************** - -Version: org.restlet.lib.org.json-2.0.jar -Copyright: Copyright (c) 2002 JSON.org - -Version: json-20090211.jar -Copyright: Copyright (c) 2002 JSON.org - -================== -Full license text: -================== - -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/openam-annotations/pom.xml b/openam-annotations/pom.xml index 990aa750a0..c0c7424429 100755 --- a/openam-annotations/pom.xml +++ b/openam-annotations/pom.xml @@ -13,26 +13,23 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT - + openam-annotations + Wren:AM - Annotations Wren:AM Annotations - openam-annotations - jar true - diff --git a/openam-audit/openam-audit-configuration/pom.xml b/openam-audit/openam-audit-configuration/pom.xml index 1a104a0c16..ea531f485f 100644 --- a/openam-audit/openam-audit-configuration/pom.xml +++ b/openam-audit/openam-audit-configuration/pom.xml @@ -13,19 +13,20 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. - * Portions copyright 2018-2022 Wren Security + * Portions copyright 2018-2023 Wren Security --> + 4.0.0 + + org.wrensecurity.wrenam openam-audit - org.forgerock.openam - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - 4.0.0 - Wren:AM - Audit Configuration openam-audit-configuration - jar + + Wren:AM - Audit Configuration true @@ -33,37 +34,45 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-audit-core + - org.forgerock.openam + org.wrensecurity.wrenam openam-core + org.wrensecurity.commons forgerock-audit-handler-csv + org.wrensecurity.commons forgerock-audit-handler-syslog + org.wrensecurity.commons forgerock-audit-handler-jdbc + org.wrensecurity.commons forgerock-audit-handler-elasticsearch + org.wrensecurity.commons forgerock-audit-handler-splunk + org.wrensecurity.commons forgerock-audit-handler-jms + com.zaxxer HikariCP @@ -75,6 +84,7 @@ h2 test + org.apache.activemq activemq-client diff --git a/openam-audit/openam-audit-configuration/src/license/THIRD-PARTY.properties b/openam-audit/openam-audit-configuration/src/license/THIRD-PARTY.properties deleted file mode 100644 index 958921d069..0000000000 --- a/openam-audit/openam-audit-configuration/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:39:53 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-audit/openam-audit-context/pom.xml b/openam-audit/openam-audit-context/pom.xml index 35bcf8e94c..7d281b63bb 100644 --- a/openam-audit/openam-audit-context/pom.xml +++ b/openam-audit/openam-audit-context/pom.xml @@ -13,19 +13,20 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. - * Portions copyright 2018-2022 Wren Security + * Portions copyright 2018-2023 Wren Security --> + 4.0.0 + + org.wrensecurity.wrenam openam-audit - org.forgerock.openam - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - 4.0.0 - Wren:AM - Audit Context openam-audit-context - jar + + Wren:AM - Audit Context true @@ -36,28 +37,32 @@ org.wrensecurity.commons forgerock-util + org.wrensecurity.commons forgerock-audit-core + javax.servlet javax.servlet-api provided + com.google.inject guice no_aop + org.wrensecurity.commons wrensec-guice-core + org.easytesting fest-assert - diff --git a/openam-audit/openam-audit-core/pom.xml b/openam-audit/openam-audit-core/pom.xml index b9ac742aea..7ee0327866 100644 --- a/openam-audit/openam-audit-core/pom.xml +++ b/openam-audit/openam-audit-core/pom.xml @@ -13,19 +13,20 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> + 4.0.0 + + org.wrensecurity.wrenam openam-audit - org.forgerock.openam - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - 4.0.0 - Wren:AM - Audit Core openam-audit-core - jar + + Wren:AM - Audit Core true @@ -33,47 +34,54 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-shared + - org.forgerock.openam + org.wrensecurity.wrenam openam-i18n + org.wrensecurity.commons forgerock-audit-core + com.google.inject.extensions guice-assistedinject + javax.servlet javax.servlet-api provided + - org.forgerock.openam + org.wrensecurity.wrenam openam-test-utils test + org.wrensecurity.commons forgerock-test-utils test + org.wrensecurity.commons json-resource test-jar test + org.wrensecurity.commons wrensec-guice-test test - diff --git a/openam-audit/openam-audit-rest/pom.xml b/openam-audit/openam-audit-rest/pom.xml index d09470c83a..85a399cd77 100644 --- a/openam-audit/openam-audit-rest/pom.xml +++ b/openam-audit/openam-audit-rest/pom.xml @@ -16,16 +16,18 @@ * Portions Copyright 2018-2022 Wren Security --> + 4.0.0 + + org.wrensecurity.wrenam openam-audit - org.forgerock.openam - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - 4.0.0 - Wren:AM - Audit REST openam-audit-rest + Wren:AM - Audit REST + true @@ -35,19 +37,21 @@ org.wrensecurity.commons forgerock-audit-core + - org.forgerock.openam + org.wrensecurity.wrenam openam-rest + - org.forgerock.openam + org.wrensecurity.wrenam openam-i18n + - org.forgerock.openam + org.wrensecurity.wrenam openam-test-utils test - diff --git a/openam-audit/openam-audit-rest/src/license/THIRD-PARTY.properties b/openam-audit/openam-audit-rest/src/license/THIRD-PARTY.properties deleted file mode 100644 index b7d1302d7f..0000000000 --- a/openam-audit/openam-audit-rest/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,43 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - EPL 1.0 license -# - Eclipse Public License (EPL) 1.0 -# - GNU Lesser General Public License Version 2.1, February 1999 -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:50 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -org.restlet.jee--org.restlet.lib.org.json--2.0=Apache 2.0 -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-audit/pom.xml b/openam-audit/pom.xml index 5d9105604e..0799363020 100644 --- a/openam-audit/pom.xml +++ b/openam-audit/pom.xml @@ -13,26 +13,27 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> + 4.0.0 + - openam - org.forgerock.openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT - 4.0.0 - Wren:AM - Audit - Wren:AM Audit Modules openam-audit pom + Wren:AM - Audit + Wren:AM Audit Modules + + openam-audit-configuration openam-audit-context openam-audit-core - openam-audit-configuration openam-audit-rest - diff --git a/openam-authentication/openam-auth-ad/pom.xml b/openam-authentication/openam-auth-ad/pom.xml index 314136475c..cbde9960ab 100755 --- a/openam-authentication/openam-auth-ad/pom.xml +++ b/openam-authentication/openam-auth-ad/pom.xml @@ -13,28 +13,27 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-ad + Wren:AM - AD Authentication Module Wren:AM Authentication AD - openam-auth-ad - jar - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-ldap + ${project.version} diff --git a/openam-authentication/openam-auth-ad/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-ad/src/license/THIRD-PARTY.properties deleted file mode 100644 index 2df1fbfc85..0000000000 --- a/openam-authentication/openam-auth-ad/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:23 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-adaptive/pom.xml b/openam-authentication/openam-auth-adaptive/pom.xml index f3ec91cfe5..60c97f51bb 100755 --- a/openam-authentication/openam-auth-adaptive/pom.xml +++ b/openam-authentication/openam-auth-adaptive/pom.xml @@ -13,29 +13,28 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-adaptive + Wren:AM - Adaptive Authentication Module Wren:AM Authentication Adaptive - openam-auth-adaptive - jar com.maxmind.geoip2 geoip2 + javax.servlet javax.servlet-api diff --git a/openam-authentication/openam-auth-adaptive/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-adaptive/src/license/THIRD-PARTY.properties deleted file mode 100644 index 497aefe094..0000000000 --- a/openam-authentication/openam-auth-adaptive/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:08 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-amster/pom.xml b/openam-authentication/openam-auth-amster/pom.xml index b48b23df6c..00da8b4c5b 100644 --- a/openam-authentication/openam-auth-amster/pom.xml +++ b/openam-authentication/openam-auth-amster/pom.xml @@ -1,29 +1,31 @@ - + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. + * + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. + * + * When distributing Covered Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions copyright [year] [name of copyright owner]". + * + * Copyright 2016 ForgeRock AS. + * Portions Copyright 2023 Wren Security +--> + 4.0.0 + + org.wrensecurity.wrenam openam-authentication - org.forgerock.openam - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - 4.0.0 openam-auth-amster + Wren:AM - Amster Login Module Provides a method for the Amster CLI utility to authenticate with Wren:AM. @@ -31,10 +33,8 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-common - - diff --git a/openam-authentication/openam-auth-anonymous/pom.xml b/openam-authentication/openam-auth-anonymous/pom.xml index 67bdf6fe07..4f2deb1057 100755 --- a/openam-authentication/openam-auth-anonymous/pom.xml +++ b/openam-authentication/openam-auth-anonymous/pom.xml @@ -13,19 +13,18 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT + openam-auth-anonymous - jar Wren:AM - Anonymous Authentication Module Wren:AM Anonymous Authentication Module diff --git a/openam-authentication/openam-auth-anonymous/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-anonymous/src/license/THIRD-PARTY.properties deleted file mode 100644 index 04e310b35b..0000000000 --- a/openam-authentication/openam-auth-anonymous/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:04 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-application/pom.xml b/openam-authentication/openam-auth-application/pom.xml index fb2791d94d..28883a0ebf 100755 --- a/openam-authentication/openam-auth-application/pom.xml +++ b/openam-authentication/openam-auth-application/pom.xml @@ -13,23 +13,21 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-application + Wren:AM - Application Authentication Module Wren:AM Authentication Application - openam-auth-application - jar diff --git a/openam-authentication/openam-auth-application/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-application/src/license/THIRD-PARTY.properties deleted file mode 100644 index 2454a6a1f0..0000000000 --- a/openam-authentication/openam-auth-application/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:10 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-cert/pom.xml b/openam-authentication/openam-auth-cert/pom.xml index 49c49cb54a..30238b75d0 100755 --- a/openam-authentication/openam-auth-cert/pom.xml +++ b/openam-authentication/openam-auth-cert/pom.xml @@ -13,23 +13,21 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-cert + Wren:AM - Cert Authentication Module Wren:AM Authentication Cert - openam-auth-cert - jar @@ -37,10 +35,11 @@ javax.servlet-api provided + - org.forgerock.openam + org.wrensecurity.wrenam openam-certs + ${project.version} - diff --git a/openam-authentication/openam-auth-cert/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-cert/src/license/THIRD-PARTY.properties deleted file mode 100644 index 2454a6a1f0..0000000000 --- a/openam-authentication/openam-auth-cert/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:10 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-common/pom.xml b/openam-authentication/openam-auth-common/pom.xml index dc305cf576..b5e53750fe 100755 --- a/openam-authentication/openam-auth-common/pom.xml +++ b/openam-authentication/openam-auth-common/pom.xml @@ -13,46 +13,47 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-common + Wren:AM - Authentication Common Utilities Wren:AM Authentication Common Utilities - openam-auth-common - jar org.wrensecurity.commons forgerock-jaspi-runtime + org.glassfish javax.security.auth.message + javax.servlet javax.servlet-api provided + org.testng testng + org.mockito mockito-core - diff --git a/openam-authentication/openam-auth-common/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-common/src/license/THIRD-PARTY.properties deleted file mode 100644 index 04e310b35b..0000000000 --- a/openam-authentication/openam-auth-common/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:04 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePAPTest.java b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePAPTest.java index 90a5c9706f..e0081a9a89 100644 --- a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePAPTest.java +++ b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePAPTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; @@ -237,7 +237,7 @@ public void shouldCallOnLoginFailureAndDoNothing() throws AuthenticationExceptio jaspiPostAuthPlugin.onLoginFailure(requestParamsMap, request, response); //Then - verifyZeroInteractions(jaspiAuthWrapper); + verifyNoInteractions(jaspiAuthWrapper); } @Test @@ -252,6 +252,6 @@ public void shouldCallOnLogoutAndDoNothing() throws Exception { jaspiPostAuthPlugin.onLogout(request, response, ssoToken); //Then - verifyZeroInteractions(jaspiAuthWrapper); + verifyNoInteractions(jaspiAuthWrapper); } } diff --git a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModuleTest.java b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModuleTest.java index e2a3bcab55..44c571464d 100644 --- a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModuleTest.java +++ b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModuleTest.java @@ -22,6 +22,7 @@ import static org.mockito.BDDMockito.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import static org.mockito.ArgumentMatchers.any; import static org.testng.AssertJUnit.*; import java.security.Principal; @@ -37,7 +38,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -132,7 +133,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSuccess() throws Log Callback[] callbacks = new Callback[0]; int state = ISAuthConstants.LOGIN_START; - given(jaspiAuthWrapper.validateRequest(Matchers.anyObject(), Matchers.anyObject())) + given(jaspiAuthWrapper.validateRequest(any(), any())) .willReturn(AuthStatus.SUCCESS); //When @@ -140,7 +141,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSuccess() throws Log //Then assertTrue(processMethodCalled); - verify(jaspiAuthWrapper).validateRequest(Matchers.anyObject(), Matchers.anyObject()); + verify(jaspiAuthWrapper).validateRequest(any(), any()); assertEquals(returnedState, ISAuthConstants.LOGIN_SUCCEED); } @@ -151,7 +152,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendSuccess() throws Callback[] callbacks = new Callback[0]; int state = ISAuthConstants.LOGIN_START; - given(jaspiAuthWrapper.validateRequest(Matchers.anyObject(), Matchers.anyObject())) + given(jaspiAuthWrapper.validateRequest(any(), any())) .willReturn(AuthStatus.SEND_SUCCESS); //When @@ -159,7 +160,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendSuccess() throws //Then assertTrue(processMethodCalled); - verify(jaspiAuthWrapper).validateRequest(Matchers.anyObject(), Matchers.anyObject()); + verify(jaspiAuthWrapper).validateRequest(any(), any()); assertEquals(returnedState, ISAuthConstants.LOGIN_SUCCEED); } @@ -170,7 +171,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendFailure() throws Callback[] callbacks = new Callback[0]; int state = ISAuthConstants.LOGIN_START; - given(jaspiAuthWrapper.validateRequest(Matchers.anyObject(), Matchers.anyObject())) + given(jaspiAuthWrapper.validateRequest(any(), any())) .willReturn(AuthStatus.SEND_FAILURE); //When @@ -185,7 +186,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendFailure() throws //Then assertTrue(processMethodCalled); - verify(jaspiAuthWrapper).validateRequest(Matchers.anyObject(), Matchers.anyObject()); + verify(jaspiAuthWrapper).validateRequest(any(), any()); assertTrue(exceptionCaught); assertEquals(exception.getErrorCode(), "authFailed"); } @@ -197,7 +198,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendContinue() throw Callback[] callbacks = new Callback[0]; int state = ISAuthConstants.LOGIN_START; - given(jaspiAuthWrapper.validateRequest(Matchers.anyObject(), Matchers.anyObject())) + given(jaspiAuthWrapper.validateRequest(any(), any())) .willReturn(AuthStatus.SEND_CONTINUE); //When @@ -205,7 +206,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendContinue() throw //Then assertTrue(processMethodCalled); - verify(jaspiAuthWrapper).validateRequest(Matchers.anyObject(), Matchers.anyObject()); + verify(jaspiAuthWrapper).validateRequest(any(), any()); assertEquals(returnedState, ISAuthConstants.LOGIN_IGNORE); } diff --git a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthModuleWrapperTest.java b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthModuleWrapperTest.java index fbeeea06ae..106ace9790 100644 --- a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthModuleWrapperTest.java +++ b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthModuleWrapperTest.java @@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.mockito.Matchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -65,7 +64,7 @@ public void shouldInitialiseAuthenticationModule() throws Exception { jaspiAuthWrapper.initialize(callbackHandler, config); //Then - verify(serverAuthModule).initialize(Matchers.anyObject(), (MessagePolicy) isNull(), + verify(serverAuthModule).initialize(any(), (MessagePolicy) isNull(), eq(callbackHandler), eq(config)); } } diff --git a/openam-authentication/openam-auth-datastore/pom.xml b/openam-authentication/openam-auth-datastore/pom.xml index ac8c283c5b..d51016be1f 100755 --- a/openam-authentication/openam-auth-datastore/pom.xml +++ b/openam-authentication/openam-auth-datastore/pom.xml @@ -13,22 +13,19 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - - Wren:AM - Datastore Authentication Module - Wren:AM Authentication Datastore - openam-auth-datastore - jar + + Wren:AM - Datastore Authentication Module + Wren:AM Authentication Datastore diff --git a/openam-authentication/openam-auth-datastore/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-datastore/src/license/THIRD-PARTY.properties deleted file mode 100644 index f33d6f97e6..0000000000 --- a/openam-authentication/openam-auth-datastore/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:11 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-device-id/pom.xml b/openam-authentication/openam-auth-device-id/pom.xml index 6b3e25cb98..a1e5853fd2 100644 --- a/openam-authentication/openam-auth-device-id/pom.xml +++ b/openam-authentication/openam-auth-device-id/pom.xml @@ -13,31 +13,34 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT + openam-auth-device-id + Wren:AM - Device Id Authentication Module Wren:AM Authentication Device Id - openam-auth-device-id - jar - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-scripted + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-scripting + org.assertj assertj-core diff --git a/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/PersistModuleProcesserTest.java b/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/PersistModuleProcesserTest.java index 4ff4e54670..847f7bc579 100644 --- a/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/PersistModuleProcesserTest.java +++ b/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/PersistModuleProcesserTest.java @@ -33,7 +33,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; public class PersistModuleProcesserTest { @@ -62,7 +62,7 @@ public void shouldReturnLoginSucceedWhenDevicePrintProfileIsNull() throws AuthLo //Then assertThat(newState).isEqualTo(ISAuthConstants.LOGIN_SUCCEED); - verifyZeroInteractions(profilePersister); + verifyNoInteractions(profilePersister); } @Test @@ -79,7 +79,7 @@ public void shouldReturnLoginSucceedWhenDevicePrintProfileIsEmpty() throws AuthL //Then assertThat(newState).isEqualTo(ISAuthConstants.LOGIN_SUCCEED); - verifyZeroInteractions(profilePersister); + verifyNoInteractions(profilePersister); } @Test @@ -119,7 +119,7 @@ public void shouldReturnSaveProfileStateWhenDevicePrintNotEmptyAndAutoSaveNotCon //Then assertThat(newState).isEqualTo(SAVE_PROFILE_STATE); - verifyZeroInteractions(profilePersister); + verifyNoInteractions(profilePersister); } @Test @@ -139,7 +139,7 @@ public void shouldReturnNameProfileStateWhenUserChooseToSaveProfile() throws Aut //Then assertThat(newState).isEqualTo(NAME_PROFILE_STATE); - verifyZeroInteractions(profilePersister); + verifyNoInteractions(profilePersister); } @Test @@ -159,7 +159,7 @@ public void shouldReturnLoginSucceedWithoutSavingProfileWhenUserChooseToNotSaveP //Then assertThat(newState).isEqualTo(ISAuthConstants.LOGIN_SUCCEED); - verifyZeroInteractions(profilePersister); + verifyNoInteractions(profilePersister); } @Test diff --git a/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/ProfilePersisterTest.java b/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/ProfilePersisterTest.java index 7acb71ef6f..5ec8f09a7a 100644 --- a/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/ProfilePersisterTest.java +++ b/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/ProfilePersisterTest.java @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.Time.*; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-authentication/openam-auth-fr-oath/pom.xml b/openam-authentication/openam-auth-fr-oath/pom.xml index 037f394030..6f5430dceb 100644 --- a/openam-authentication/openam-auth-fr-oath/pom.xml +++ b/openam-authentication/openam-auth-fr-oath/pom.xml @@ -18,28 +18,29 @@ 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-fr-oath + Wren:AM - OATH Authenticator Wren:AM Authentication OATH - openam-auth-fr-oath - jar - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-hotp + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-core-rest + javax.servlet javax.servlet-api diff --git a/openam-authentication/openam-auth-fr-oath/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-fr-oath/src/license/THIRD-PARTY.properties deleted file mode 100644 index e984930d73..0000000000 --- a/openam-authentication/openam-auth-fr-oath/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,43 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - EPL 1.0 license -# - Eclipse Public License (EPL) 1.0 -# - GNU Lesser General Public License Version 2.1, February 1999 -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:46:03 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -org.restlet.jee--org.restlet.lib.org.json--2.0=Apache 2.0 -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-fr-oath/src/test/java/org/forgerock/openam/authentication/modules/fr/oath/OathMakerTest.java b/openam-authentication/openam-auth-fr-oath/src/test/java/org/forgerock/openam/authentication/modules/fr/oath/OathMakerTest.java index 77d58e7938..f4e5e09429 100644 --- a/openam-authentication/openam-auth-fr-oath/src/test/java/org/forgerock/openam/authentication/modules/fr/oath/OathMakerTest.java +++ b/openam-authentication/openam-auth-fr-oath/src/test/java/org/forgerock/openam/authentication/modules/fr/oath/OathMakerTest.java @@ -17,7 +17,7 @@ package org.forgerock.openam.authentication.modules.fr.oath; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import com.sun.identity.shared.debug.Debug; diff --git a/openam-authentication/openam-auth-hotp/pom.xml b/openam-authentication/openam-auth-hotp/pom.xml index 73f0688b4c..4e4a4083c3 100755 --- a/openam-authentication/openam-auth-hotp/pom.xml +++ b/openam-authentication/openam-auth-hotp/pom.xml @@ -13,23 +13,21 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-hotp + Wren:AM - HOTP Authentication Module Wren:AM Authentication HOTP - openam-auth-hotp - jar @@ -37,10 +35,10 @@ javax.servlet-api provided + com.sun.mail javax.mail - diff --git a/openam-authentication/openam-auth-hotp/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-hotp/src/license/THIRD-PARTY.properties deleted file mode 100644 index d23d59139a..0000000000 --- a/openam-authentication/openam-auth-hotp/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:13 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-httpbasic/pom.xml b/openam-authentication/openam-auth-httpbasic/pom.xml index a01a656a7c..bf1d3c104e 100755 --- a/openam-authentication/openam-auth-httpbasic/pom.xml +++ b/openam-authentication/openam-auth-httpbasic/pom.xml @@ -13,23 +13,21 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-httpbasic + Wren:AM - HTTP Basic Authentication Module Wren:AM Authentication HTTP Basic - openam-auth-httpbasic - jar @@ -38,5 +36,4 @@ provided - diff --git a/openam-authentication/openam-auth-httpbasic/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-httpbasic/src/license/THIRD-PARTY.properties deleted file mode 100644 index d23d59139a..0000000000 --- a/openam-authentication/openam-auth-httpbasic/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:13 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-jdbc/pom.xml b/openam-authentication/openam-auth-jdbc/pom.xml index dbee728910..852a4ceb0b 100755 --- a/openam-authentication/openam-auth-jdbc/pom.xml +++ b/openam-authentication/openam-auth-jdbc/pom.xml @@ -13,22 +13,19 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - - Wren:AM - JDBC Authentication Module - Wren:AM Authentication JDBC openam-auth-jdbc - jar + Wren:AM - JDBC Authentication Module + Wren:AM Authentication JDBC diff --git a/openam-authentication/openam-auth-jdbc/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-jdbc/src/license/THIRD-PARTY.properties deleted file mode 100644 index 1824bbbb11..0000000000 --- a/openam-authentication/openam-auth-jdbc/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:14 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-ldap/pom.xml b/openam-authentication/openam-auth-ldap/pom.xml index 4239fe54fa..9affcb6925 100755 --- a/openam-authentication/openam-auth-ldap/pom.xml +++ b/openam-authentication/openam-auth-ldap/pom.xml @@ -13,29 +13,28 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-ldap + Wren:AM - LDAP Authentication Module Wren:AM Authentication LDAP - openam-auth-ldap - jar org.wrensecurity.wrends opendj-core + org.wrensecurity.wrends opendj-grizzly diff --git a/openam-authentication/openam-auth-ldap/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-ldap/src/license/THIRD-PARTY.properties deleted file mode 100644 index 04e310b35b..0000000000 --- a/openam-authentication/openam-auth-ldap/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:04 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-membership/pom.xml b/openam-authentication/openam-auth-membership/pom.xml index 2538eeacca..25d6be3422 100755 --- a/openam-authentication/openam-auth-membership/pom.xml +++ b/openam-authentication/openam-auth-membership/pom.xml @@ -13,22 +13,19 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - - Wren:AM - Membership Authentication Module - Wren:AM Authentication Membership openam-auth-membership - jar + Wren:AM - Membership Authentication Module + Wren:AM Authentication Membership diff --git a/openam-authentication/openam-auth-membership/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-membership/src/license/THIRD-PARTY.properties deleted file mode 100644 index 4042edaec3..0000000000 --- a/openam-authentication/openam-auth-membership/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:15 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-msisdn/pom.xml b/openam-authentication/openam-auth-msisdn/pom.xml index 5a7a855ab2..ce2b95634f 100755 --- a/openam-authentication/openam-auth-msisdn/pom.xml +++ b/openam-authentication/openam-auth-msisdn/pom.xml @@ -13,23 +13,21 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-msisdn + Wren:AM - MSISDN Authentication Module Wren:AM Authentication MSISDN - openam-auth-msisdn - jar @@ -38,5 +36,4 @@ provided - diff --git a/openam-authentication/openam-auth-msisdn/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-msisdn/src/license/THIRD-PARTY.properties deleted file mode 100644 index 4042edaec3..0000000000 --- a/openam-authentication/openam-auth-msisdn/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:15 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-nt/pom.xml b/openam-authentication/openam-auth-nt/pom.xml index 19d9744a51..0d676e4205 100755 --- a/openam-authentication/openam-auth-nt/pom.xml +++ b/openam-authentication/openam-auth-nt/pom.xml @@ -13,22 +13,19 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - - Wren:AM - NT Authentication Module - Wren:AM Authentication NT openam-auth-nt - jar + Wren:AM - NT Authentication Module + Wren:AM Authentication NT diff --git a/openam-authentication/openam-auth-nt/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-nt/src/license/THIRD-PARTY.properties deleted file mode 100644 index bb7d9945fb..0000000000 --- a/openam-authentication/openam-auth-nt/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:18 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-oath/pom.xml b/openam-authentication/openam-auth-oath/pom.xml index e0257a5684..ae0ad98e90 100755 --- a/openam-authentication/openam-auth-oath/pom.xml +++ b/openam-authentication/openam-auth-oath/pom.xml @@ -13,29 +13,29 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-oath + Wren:AM - OATH Authentication Module Wren:AM Authentication OATH - openam-auth-oath - jar - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-hotp + ${project.version} + javax.servlet javax.servlet-api diff --git a/openam-authentication/openam-auth-oath/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-oath/src/license/THIRD-PARTY.properties deleted file mode 100644 index a3ec717958..0000000000 --- a/openam-authentication/openam-auth-oath/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:26 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-oauth2/pom.xml b/openam-authentication/openam-auth-oauth2/pom.xml index 5921ca3628..ff17f3714e 100755 --- a/openam-authentication/openam-auth-oauth2/pom.xml +++ b/openam-authentication/openam-auth-oauth2/pom.xml @@ -13,42 +13,45 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-oauth2 + Wren:AM - OAuth2 Authentication Module Wren:AM Authentication OAUTH2 - openam-auth-oauth2 - jar - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-common + - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-oidc + ${project.version} + javax.servlet javax.servlet-api provided + org.json json + external esapiport diff --git a/openam-authentication/openam-auth-oauth2/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-oauth2/src/license/THIRD-PARTY.properties deleted file mode 100644 index c1ce9f3153..0000000000 --- a/openam-authentication/openam-auth-oauth2/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:34 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-oidc/pom.xml b/openam-authentication/openam-auth-oidc/pom.xml index ca498a388c..8238cd6367 100755 --- a/openam-authentication/openam-auth-oidc/pom.xml +++ b/openam-authentication/openam-auth-oidc/pom.xml @@ -13,54 +13,57 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-oidc + Wren:AM - OpenID Connect Authentication module Wren:AM authentication module which consumes the jaspi OpenId Connect authentication module domain logic - openam-auth-oidc - jar org.wrensecurity.commons forgerock-jaspi-openid-connect-module + org.wrensecurity.commons forgerock-jaspi-runtime + - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-common + javax.servlet javax.servlet-api provided + org.testng testng + org.easytesting fest-assert + org.mockito mockito-core - diff --git a/openam-authentication/openam-auth-oidc/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-oidc/src/license/THIRD-PARTY.properties deleted file mode 100644 index 0e0e52f272..0000000000 --- a/openam-authentication/openam-auth-oidc/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:24 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-persistentcookie/pom.xml b/openam-authentication/openam-auth-persistentcookie/pom.xml index e1e1db02f8..433b54aa25 100755 --- a/openam-authentication/openam-auth-persistentcookie/pom.xml +++ b/openam-authentication/openam-auth-persistentcookie/pom.xml @@ -13,46 +13,47 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-persistentcookie + Wren:AM - Persistent Cookie Authentication Module Wren:AM Authentication Persistent - openam-auth-persistentcookie - jar org.wrensecurity.commons forgerock-jaspi-jwt-session-module + - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-common + javax.servlet javax.servlet-api provided + org.testng testng + org.mockito mockito-core - diff --git a/openam-authentication/openam-auth-persistentcookie/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-persistentcookie/src/license/THIRD-PARTY.properties deleted file mode 100644 index 0e0e52f272..0000000000 --- a/openam-authentication/openam-auth-persistentcookie/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:24 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModuleTest.java b/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModuleTest.java index fe64edafef..097520c4f2 100644 --- a/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModuleTest.java +++ b/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModuleTest.java @@ -49,7 +49,7 @@ import org.forgerock.json.jose.jwt.JwtClaimsSet; import org.forgerock.openam.authentication.modules.common.AMLoginModuleBinder; import org.forgerock.openam.core.CoreWrapper; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/openam-authentication/openam-auth-push/pom.xml b/openam-authentication/openam-auth-push/pom.xml index cdd1015a8e..98d3685034 100644 --- a/openam-authentication/openam-auth-push/pom.xml +++ b/openam-authentication/openam-auth-push/pom.xml @@ -13,21 +13,21 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> + 4.0.0 + + org.wrensecurity.wrenam openam-authentication - org.forgerock.openam - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - 4.0.0 - + openam-auth-push + Wren:AM - Push Authentication Module Wren:AM Auth AuthenticatorPush - openam-auth-push - jar true @@ -35,27 +35,30 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-common + javax.servlet javax.servlet-api provided + org.wrensecurity.commons.guava wrensec-guava-cache + - org.forgerock.openam + org.wrensecurity.wrenam openam-push-notification + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-core-rest - 14.0.0-SNAPSHOT - diff --git a/openam-authentication/openam-auth-push/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-push/src/license/THIRD-PARTY.properties deleted file mode 100644 index e984930d73..0000000000 --- a/openam-authentication/openam-auth-push/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,43 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - EPL 1.0 license -# - Eclipse Public License (EPL) 1.0 -# - GNU Lesser General Public License Version 2.1, February 1999 -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:46:03 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -org.restlet.jee--org.restlet.lib.org.json--2.0=Apache 2.0 -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-radius/pom.xml b/openam-authentication/openam-auth-radius/pom.xml index b3c90499e1..3331a5110c 100755 --- a/openam-authentication/openam-auth-radius/pom.xml +++ b/openam-authentication/openam-auth-radius/pom.xml @@ -18,27 +18,27 @@ 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-radius + Wren:AM - RADIUS Authentication Module Wren:AM Authentication Radius - openam-auth-radius - jar org.testng testng + - org.forgerock.openam - openam-radius-common + org.wrensecurity.wrenam + openam-radius-common + ${project.version} diff --git a/openam-authentication/openam-auth-radius/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-radius/src/license/THIRD-PARTY.properties deleted file mode 100644 index bb7d9945fb..0000000000 --- a/openam-authentication/openam-auth-radius/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:18 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-saml2/pom.xml b/openam-authentication/openam-auth-saml2/pom.xml index e7e632d5d8..162464c929 100644 --- a/openam-authentication/openam-auth-saml2/pom.xml +++ b/openam-authentication/openam-auth-saml2/pom.xml @@ -13,21 +13,21 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> + 4.0.0 + + org.wrensecurity.wrenam openam-authentication - org.forgerock.openam - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - 4.0.0 - + openam-auth-saml2 + Wren:AM - SAML2 Authentication Module Wren:AM Authentication SAML2 - openam-auth-saml2 - jar true @@ -35,18 +35,22 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-common + - org.forgerock.openam + org.wrensecurity.wrenam openam-federation-library + ${project.version} + javax.servlet javax.servlet-api provided + org.wrensecurity.commons.guava wrensec-guava-cache diff --git a/openam-authentication/openam-auth-saml2/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-saml2/src/license/THIRD-PARTY.properties deleted file mode 100644 index ce9cb77e90..0000000000 --- a/openam-authentication/openam-auth-saml2/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,41 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:25 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-impl--1.0.6=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb-xjc--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-scripted/pom.xml b/openam-authentication/openam-auth-scripted/pom.xml index 024ff49b60..fa7aa7bae0 100644 --- a/openam-authentication/openam-auth-scripted/pom.xml +++ b/openam-authentication/openam-auth-scripted/pom.xml @@ -13,23 +13,21 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-scripted + Wren:AM - Scripted Authentication Module Wren:AM Scripted Authentication Module - openam-auth-scripted - jar @@ -37,28 +35,31 @@ javax.servlet-api provided + - org.forgerock.openam + org.wrensecurity.wrenam openam-http-client + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-scripting - org.testng testng + org.mockito mockito-core + org.easytesting fest-assert - diff --git a/openam-authentication/openam-auth-scripted/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-scripted/src/license/THIRD-PARTY.properties deleted file mode 100644 index aef58d9a0d..0000000000 --- a/openam-authentication/openam-auth-scripted/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - EPL 1.0 license -# - Eclipse Public License (EPL) 1.0 -# - GNU Lesser General Public License Version 2.1, February 1999 -# - Mozilla Public License, Version 2.0 -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:51:12 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -org.restlet.jee--org.restlet.lib.org.json--2.0=Apache 2.0 -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/openam-auth-securid/pom.xml b/openam-authentication/openam-auth-securid/pom.xml index 3b0a5b2e6e..f65aa22c4f 100755 --- a/openam-authentication/openam-auth-securid/pom.xml +++ b/openam-authentication/openam-auth-securid/pom.xml @@ -20,9 +20,9 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT diff --git a/openam-authentication/openam-auth-windowsdesktopsso/pom.xml b/openam-authentication/openam-auth-windowsdesktopsso/pom.xml index b6df925294..2b66224925 100755 --- a/openam-authentication/openam-auth-windowsdesktopsso/pom.xml +++ b/openam-authentication/openam-auth-windowsdesktopsso/pom.xml @@ -13,23 +13,21 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-authentication - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-auth-windowsdesktopsso + Wren:AM - WindowsDesktopSSO Authentication Module Wren:AM Authentication WindowsDesktopSSO - openam-auth-windowsdesktopsso - jar @@ -38,5 +36,4 @@ provided - diff --git a/openam-authentication/openam-auth-windowsdesktopsso/src/license/THIRD-PARTY.properties b/openam-authentication/openam-auth-windowsdesktopsso/src/license/THIRD-PARTY.properties deleted file mode 100644 index 28988a9b0f..0000000000 --- a/openam-authentication/openam-auth-windowsdesktopsso/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:40:19 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-authentication/pom.xml b/openam-authentication/pom.xml index e8980443f9..7c131f862c 100755 --- a/openam-authentication/pom.xml +++ b/openam-authentication/pom.xml @@ -13,33 +13,34 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT - - Wren:AM - Authentication - Wren:AM Authentication Modules openam-authentication pom - + Wren:AM - Authentication + Wren:AM Authentication Modules + - openam-auth-common openam-auth-ad - openam-auth-anonymous openam-auth-adaptive + openam-auth-amster + openam-auth-anonymous openam-auth-application openam-auth-cert + openam-auth-common openam-auth-datastore + openam-auth-device-id + openam-auth-fr-oath openam-auth-hotp openam-auth-httpbasic openam-auth-jdbc @@ -48,19 +49,23 @@ openam-auth-msisdn openam-auth-nt openam-auth-oath - openam-auth-fr-oath openam-auth-oauth2 - openam-auth-radius - openam-auth-push - openam-auth-windowsdesktopsso - openam-auth-persistentcookie openam-auth-oidc - openam-auth-scripted - openam-auth-device-id + openam-auth-persistentcookie + openam-auth-push + openam-auth-radius openam-auth-saml2 - openam-auth-amster + openam-auth-scripted + openam-auth-windowsdesktopsso + + + org.wrensecurity.wrenam + openam-core + + + release @@ -75,12 +80,4 @@ - - - - org.forgerock.openam - openam-core - - - diff --git a/openam-certs/pom.xml b/openam-certs/pom.xml index 2b380c7791..27cd2c385f 100644 --- a/openam-certs/pom.xml +++ b/openam-certs/pom.xml @@ -13,36 +13,40 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> + 4.0.0 + - openam - org.forgerock.openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT - 4.0.0 openam-certs + Wren:AM - Certificate Validation - org.forgerock.openam + org.wrensecurity.wrenam openam-ldap-utils + org.wrensecurity.wrends opendj-core + org.wrensecurity.wrends opendj-grizzly + - org.forgerock.openam + org.wrensecurity.wrenam openam-shared - diff --git a/openam-cli/openam-cli-definitions/pom.xml b/openam-cli/openam-cli-definitions/pom.xml index 153177e4cc..fc72e7c74c 100644 --- a/openam-cli/openam-cli-definitions/pom.xml +++ b/openam-cli/openam-cli-definitions/pom.xml @@ -13,21 +13,19 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-cli - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-cli-definitions + Wren:AM - CLI Definitions Wren:AM Command Line Definitions - openam-cli-definitions - jar diff --git a/openam-cli/openam-cli-impl/pom.xml b/openam-cli/openam-cli-impl/pom.xml index 49f76ee855..6f42b04c05 100644 --- a/openam-cli/openam-cli-impl/pom.xml +++ b/openam-cli/openam-cli-impl/pom.xml @@ -13,96 +13,111 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-cli - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - + openam-cli-impl + Wren:AM - CLI Implementation Wren:AM Command Line Implementation - openam-cli-impl - jar - - - - - org.forgerock.maven.plugins - build-helper-plugin - - - generate-resources - - generate-cli - - - - - - org.forgerock.openam - openam-cli-definitions - ${project.version} - - - - ${project.build.directory}/generated-resources - - com.sun.identity.cli.definition.AccessManager - com.sun.identity.federation.cli.definition.FederationManager - - - - - - org.forgerock.openam + org.wrensecurity.wrenam openam-cli-definitions + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-core + - org.forgerock.openam + org.wrensecurity.wrenam openam-core-rest + - org.forgerock.openam + org.wrensecurity.wrenam OpenFM + ${project.version} + javax.servlet javax.servlet-api provided + - org.forgerock.openam + org.wrensecurity.wrenam openam-shared + - org.forgerock.openam + org.wrensecurity.wrenam openam-entitlements + - org.forgerock.openam + org.wrensecurity.wrenam openam-xacml3-schema + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-audit-core + - org.forgerock.openam + org.wrensecurity.wrenam openam-audit-configuration + ${project.version} + + + + + + ${project.groupId} + build-helper-plugin + + + + generate-resources + + generate-cli + + + + + + + org.wrensecurity.wrenam + openam-cli-definitions + ${project.version} + + + + + ${project.build.directory}/generated-resources + + com.sun.identity.cli.definition.AccessManager + com.sun.identity.federation.cli.definition.FederationManager + + + + + diff --git a/openam-cli/openam-cli-impl/src/license/THIRD-PARTY.properties b/openam-cli/openam-cli-impl/src/license/THIRD-PARTY.properties deleted file mode 100644 index c3a5abc383..0000000000 --- a/openam-cli/openam-cli-impl/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,46 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - EPL 1.0 license -# - Eclipse Public License (EPL) 1.0 -# - GNU Lesser General Public License Version 2.1, February 1999 -# - Mozilla Public License, Version 2.0 -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:51:53 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-impl--1.0.6=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb-xjc--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -org.restlet.jee--org.restlet.lib.org.json--2.0=Apache 2.0 -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-cli/pom.xml b/openam-cli/pom.xml index e87dc49ac4..3971ea6705 100644 --- a/openam-cli/pom.xml +++ b/openam-cli/pom.xml @@ -13,27 +13,25 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT - - Wren:AM - CLI Base - Wren:AM Command Line Interface openam-cli pom + Wren:AM - CLI Base + Wren:AM Command Line Interface + openam-cli-definitions openam-cli-impl - diff --git a/openam-clientsdk/pom.xml b/openam-clientsdk/pom.xml index 63efffea54..8acc0d363d 100755 --- a/openam-clientsdk/pom.xml +++ b/openam-clientsdk/pom.xml @@ -13,31 +13,89 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> 4.0.0 - - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT - + openam-clientsdk + Wren:AM - Client SDK Wren:AM Java Client SDK - openam-clientsdk - jar - org.forgerock.openam.sdk + org.wrensecurity.wrenam.sdk - + + + org.wrensecurity.wrenam + openam-jaxrpc-schema + ${project.version} + + + org.wrensecurity.wrenam + openam-dtd-schema + ${project.version} + + + org.wrensecurity.wrenam + openam-xacml3-schema + ${project.version} + + + org.wrensecurity.wrenam + OpenFM + ${project.version} + + + org.wrensecurity.wrenam + openam-entitlements + + + org.wrensecurity.wrenam + openam-client-sts + ${project.version} + + + org.wrensecurity.wrends + opendj-core + + + org.wrensecurity.wrends + opendj-grizzly + + + org.wrensecurity.commons.guava + wrensec-guava-collect + + + org.wrensecurity.commons.guava + wrensec-guava-base + + + joda-time + joda-time + + + org.wrensecurity.http + chf-http-core + + + org.slf4j + slf4j-api + + + ClientSDK-${project.version} + ${project.build.directory}/generated-resources @@ -80,10 +138,12 @@ + org.apache.maven.plugins maven-shade-plugin + package @@ -92,6 +152,7 @@ + + + org/ + ${shade.package}.org. + - org.forgerock.openam.**.* + org.wrensecurity.wrenam.**.* org.w3c.dom.**.* org.xml.sax.**.* + com/ + ${shade.package}.com. + com.sun.identity.**.* com.iplanet.**.* + javax.inject + ${shade.package}.javax.inject + javax.mail + ${shade.package}.javax.mail + javax.activation + ${shade.package}.javax.activation + false true true @@ -665,59 +776,4 @@ - - - - org.forgerock.openam - openam-jaxrpc-schema - - - org.forgerock.openam - openam-dtd-schema - - - org.forgerock.openam - openam-xacml3-schema - - - org.forgerock.openam - OpenFM - - - org.forgerock.openam - openam-entitlements - - - org.forgerock.openam - openam-client-sts - - - org.wrensecurity.wrends - opendj-core - - - org.wrensecurity.wrends - opendj-grizzly - - - org.wrensecurity.commons.guava - wrensec-guava-collect - - - org.wrensecurity.commons.guava - wrensec-guava-base - - - joda-time - joda-time - - - org.wrensecurity.http - chf-http-core - - - org.slf4j - slf4j-api - - diff --git a/openam-common-auth-ui/pom.xml b/openam-common-auth-ui/pom.xml index daee298b01..74c0e563f0 100755 --- a/openam-common-auth-ui/pom.xml +++ b/openam-common-auth-ui/pom.xml @@ -17,18 +17,17 @@ --> 4.0.0 - + - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT - + openam-common-auth-ui + Wren:AM - Common Auth UI Wren:AM Common Auth UI - openam-common-auth-ui - jar @@ -36,17 +35,17 @@ javax.servlet-api provided + javax.servlet.jsp jsp-api + - org.forgerock.openam + org.wrensecurity.wrenam openam-core provided - - diff --git a/openam-common-auth-ui/src/license/THIRD-PARTY.properties b/openam-common-auth-ui/src/license/THIRD-PARTY.properties deleted file mode 100644 index eb1f28aacc..0000000000 --- a/openam-common-auth-ui/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - BSD -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Thu Dec 17 15:21:24 GMT 2015 -com.sleepycat--je--5.0.104=SleepyCat diff --git a/openam-console/pom.xml b/openam-console/pom.xml index adb0c2808a..16279fe73f 100644 --- a/openam-console/pom.xml +++ b/openam-console/pom.xml @@ -13,30 +13,29 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT - - Wren:AM - Admin Console - Wren:AM Admin Console openam-console war - + Wren:AM - Admin Console + Wren:AM Admin Console + org.apache.maven.plugins maven-war-plugin + WEB-INF/lib/jersey-core-1.1.5.2.jar, @@ -45,18 +44,18 @@ WEB-INF/lib/jaxb-xjc-1.0.6.jar, WEB-INF/lib/jdom-2.0.1.jar, + Wren:AM Admin Console - ${project.version} - ${maven.build.timestamp} + ${project.version} - ${project.build.outputTimestamp} Wren Security Wren:AM Admin Console - ${project.version} - ${maven.build.timestamp} - - ForgeRock - ${maven.build.timestamp} + ${project.version} - ${project.build.outputTimestamp} + Wren Security + bin @@ -95,11 +94,11 @@ org.apache.maven.plugins maven-javadoc-plugin + true - @@ -108,79 +107,99 @@ com.iplanet.jato jato + com.sun.web.ui cc + com.sun.web.ui cc_de + com.sun.web.ui cc_es + com.sun.web.ui cc_fr + com.sun.web.ui cc_it + com.sun.web.ui cc_ja + com.sun.web.ui cc_ko + com.sun.web.ui cc_sv + com.sun.web.ui cc_zh + com.sun.web.ui cc_zh_CN + com.sun.web.ui cc_zh_HK + com.sun.web.ui cc_zh_TW + javax.servlet javax.servlet-api provided + javax.servlet.jsp jsp-api + - org.forgerock.openam + org.wrensecurity.wrenam openam-core + - org.forgerock.openam + org.wrensecurity.wrenam openam-entitlements + - org.forgerock.openam + org.wrensecurity.wrenam OpenFM + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-oauth2 + org.easytesting fest-assert diff --git a/openam-console/src/license/THIRD-PARTY.properties b/openam-console/src/license/THIRD-PARTY.properties deleted file mode 100644 index 9f040c438a..0000000000 --- a/openam-console/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,57 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - EPL 1.0 license -# - Eclipse Public License (EPL) 1.0 -# - GNU Lesser General Public License Version 2.1, February 1999 -# - Mozilla Public License, Version 2.0 -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:52:07 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.web.ui--cc_de--2008-08-08=CDDL -com.sun.web.ui--cc_es--2008-08-08=CDDL -com.sun.web.ui--cc_fr--2008-08-08=CDDL -com.sun.web.ui--cc_it--2008-08-08=CDDL -com.sun.web.ui--cc_ja--2008-08-08=CDDL -com.sun.web.ui--cc_ko--2008-08-08=CDDL -com.sun.web.ui--cc_sv--2008-08-08=CDDL -com.sun.web.ui--cc_zh--2008-08-08=CDDL -com.sun.web.ui--cc_zh_CN--2008-08-08=CDDL -com.sun.web.ui--cc_zh_HK--2008-08-08=CDDL -com.sun.web.ui--cc_zh_TW--2008-08-08=CDDL -com.sun.xml.bind--jaxb-impl--1.0.6=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb-xjc--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -org.restlet.jee--org.restlet.lib.org.json--2.0=Apache 2.0 -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-core-rest/pom.xml b/openam-core-rest/pom.xml index 4311d25c7e..c03d15eda8 100755 --- a/openam-core-rest/pom.xml +++ b/openam-core-rest/pom.xml @@ -19,64 +19,77 @@ 4.0.0 - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT + openam-core-rest + Wren:AM - Core REST Wren:AM Core REST - openam-core-rest - org.forgerock.openam + org.wrensecurity.wrenam openam-core + - org.forgerock.openam + org.wrensecurity.wrenam openam-core + ${project.version} test-jar test + - org.forgerock.openam + org.wrensecurity.wrenam openam-rest + - org.forgerock.openam + org.wrensecurity.wrenam openam-dashboard + ${project.version} + org.wrensecurity.commons forgerock-selfservice-core + - org.forgerock.openam + org.wrensecurity.wrenam openam-i18n + javax.servlet javax.servlet-api provided + org.asciidoctor asciidoctorj + org.wrensecurity.commons json-resource test-jar test + org.wrensecurity.commons forgerock-test-utils test + - org.forgerock.openam + org.wrensecurity.wrenam openam-test-utils test diff --git a/openam-core-rest/src/license/THIRD-PARTY.properties b/openam-core-rest/src/license/THIRD-PARTY.properties deleted file mode 100644 index 03099d3ecc..0000000000 --- a/openam-core-rest/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,43 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - EPL 1.0 license -# - Eclipse Public License (EPL) 1.0 -# - GNU Lesser General Public License Version 2.1, February 1999 -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:45:45 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -org.restlet.jee--org.restlet.lib.org.json--2.0=Apache 2.0 -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/AuthIdHelperTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/AuthIdHelperTest.java index 871fdf0f1f..c141c48818 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/AuthIdHelperTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/AuthIdHelperTest.java @@ -53,7 +53,7 @@ import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException; import org.forgerock.openam.utils.AMKeyProvider; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -85,14 +85,14 @@ public void setUp() { SignedJwtBuilderImpl signedJwtBuilder = mock(SignedJwtBuilderImpl.class); given(jwtBuilderFactory.claims()).willReturn(claimsSetBuilder); - given(claimsSetBuilder.claim(anyString(), anyObject())).willReturn(claimsSetBuilder); + given(claimsSetBuilder.claim(anyString(), any())).willReturn(claimsSetBuilder); given(claimsSetBuilder.claims(anyMap())).willReturn(claimsSetBuilder); given(claimsSetBuilder.build()).willReturn(claimsSet); - given(jwtBuilderFactory.jws(Matchers.anyObject())).willReturn(signedJwtBuilder); + given(jwtBuilderFactory.jws(any())).willReturn(signedJwtBuilder); given(signedJwtBuilder.headers()).willReturn(jwsHeaderBuilder); - given(jwsHeaderBuilder.alg(Matchers.anyObject())).willReturn(jwsHeaderBuilder); + given(jwsHeaderBuilder.alg(any())).willReturn(jwsHeaderBuilder); given(jwsHeaderBuilder.done()).willReturn(signedJwtBuilder); given(signedJwtBuilder.claims(claimsSet)).willReturn(signedJwtBuilder); @@ -305,7 +305,7 @@ public void shouldVerifyAuthId() throws SignatureException, SSOException, SMSExc PublicKey publicKey = mock(PublicKey.class); given(jwtBuilderFactory.reconstruct("AUTH_ID", SignedJwt.class)).willReturn(signedJwt); - given(signedJwt.verify(Matchers.anyObject())).willReturn(true); + given(signedJwt.verify(any())).willReturn(true); mockGetSigningKey("REALM_DN", false); @@ -314,7 +314,7 @@ public void shouldVerifyAuthId() throws SignatureException, SSOException, SMSExc //Then verify(jwtBuilderFactory).reconstruct("AUTH_ID", SignedJwt.class); - verify(signedJwt).verify(Matchers.anyObject()); + verify(signedJwt).verify(any()); } @Test @@ -341,7 +341,7 @@ public void shouldVerifyAuthIdAndFail() throws SignatureException, SSOException, //Then verify(jwtBuilderFactory).reconstruct("AUTH_ID", SignedJwt.class); - verify(signedJwt).verify(Matchers.anyObject()); + verify(signedJwt).verify(any()); assertTrue(exceptionCaught); } diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthCallbackHandlerManagerTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthCallbackHandlerManagerTest.java index aa9eb02206..e4e4b3e73d 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthCallbackHandlerManagerTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthCallbackHandlerManagerTest.java @@ -20,7 +20,6 @@ import org.forgerock.openam.core.rest.authn.callbackhandlers.RestAuthCallbackHandler; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthResponseException; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException; -import org.mockito.Matchers; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -30,6 +29,7 @@ import javax.ws.rs.core.HttpHeaders; import java.util.LinkedHashMap; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -67,8 +67,7 @@ public void shouldHandleCallbacksIntoJson() throws RestAuthResponseException, Re JsonValue jsonCallback2 = new JsonValue(new LinkedHashMap()); jsonCallback2.put("KEY2", "VALUE2"); - given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())) + given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler(any())) .willReturn(restAuthCallbackHandler1) .willReturn(restAuthCallbackHandler1).willReturn(restAuthCallbackHandler2); given(restAuthCallbackHandler1.updateCallbackFromRequest(request, response, callback1)) @@ -104,8 +103,7 @@ public void shouldHandleCallbacksInternally() throws RestAuthResponseException, RestAuthCallbackHandler restAuthCallbackHandler1 = mock(RestAuthCallbackHandler.class); RestAuthCallbackHandler restAuthCallbackHandler2 = mock(RestAuthCallbackHandler.class); - given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())).willReturn( + given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler(any())).willReturn( restAuthCallbackHandler1).willReturn(restAuthCallbackHandler2); given(restAuthCallbackHandler1.updateCallbackFromRequest(request, response, callback1)) .willReturn(true); @@ -141,8 +139,7 @@ public void shouldHandleCallbacksIntoJsonIfAtLeastOneCannotBeDoneInternally() JsonValue jsonCallback2 = new JsonValue(new LinkedHashMap()); jsonCallback2.put("KEY2", "VALUE2"); - given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())) + given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler(any())) .willReturn(restAuthCallbackHandler1).willReturn(restAuthCallbackHandler2) .willReturn(restAuthCallbackHandler1).willReturn(restAuthCallbackHandler2); given(restAuthCallbackHandler1.updateCallbackFromRequest(request, response, callback1)) @@ -184,8 +181,7 @@ public void shouldHandleJsonCallbacks() throws RestAuthException { given(jsonCallbacks.size()).willReturn(2); given(jsonCallbacks.get(0)).willReturn(jsonCallback1); given(jsonCallbacks.get(1)).willReturn(jsonCallback2); - given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())) + given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler(any())) .willReturn(restAuthCallbackHandler1) .willReturn(restAuthCallbackHandler2); given(restAuthCallbackHandler1.getCallbackClassName()).willReturn("CALLBACK1"); @@ -224,8 +220,7 @@ public void shouldHandleJsonCallbacksMixedUp() throws RestAuthException { JsonValue jsonCallback2Type = mock(JsonValue.class); - given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())) + given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler(any())) .willReturn(restAuthCallbackHandler1) .willReturn(restAuthCallbackHandler2); given(restAuthCallbackHandler1.getCallbackClassName()).willReturn("CALLBACK1"); @@ -269,8 +264,7 @@ public void shouldFailToHandleJsonCallbacksWithMissingJSONCallback() throws Rest JsonValue jsonCallback2Type = mock(JsonValue.class); - given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())) + given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler(any())) .willReturn(restAuthCallbackHandler1) .willReturn(restAuthCallbackHandler2) .willReturn(restAuthCallbackHandler3); diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandlerTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandlerTest.java index 6cbff59fd1..ad93e5c479 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandlerTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandlerTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandlerTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandlerTest.java index c92cba69f1..c5fcac3d24 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandlerTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandlerTest.java @@ -18,6 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -31,7 +32,6 @@ import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthResponseException; import org.forgerock.openam.utils.JsonValueBuilder; -import org.mockito.Matchers; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -92,7 +92,7 @@ public void shouldFailToUpdateCallbackFromRequestWhenPasswordIsNull() passwordCallback); //Then - verify(passwordCallback, never()).setPassword(Matchers.anyObject()); + verify(passwordCallback, never()).setPassword(any()); assertThat(updated).isFalse(); } @@ -112,7 +112,7 @@ public void shouldFailToUpdateCallbackFromRequestWhenPasswordIsEmptyString() passwordCallback); //Then - verify(passwordCallback, never()).setPassword(Matchers.anyObject()); + verify(passwordCallback, never()).setPassword(any()); assertThat(updated).isFalse(); } diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthX509CallbackHandlerTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthX509CallbackHandlerTest.java index b081bdb5da..c8b626c029 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthX509CallbackHandlerTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthX509CallbackHandlerTest.java @@ -16,6 +16,7 @@ package org.forgerock.openam.core.rest.authn.callbackhandlers; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -31,7 +32,7 @@ import org.forgerock.json.JsonValue; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthResponseException; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -120,7 +121,7 @@ public void shouldNotUpdateCallbackFromRequestWithNoX509Certificate() x509CertificateCallback); //Then - verify(x509CertificateCallback, never()).setCertificate(Matchers.anyObject()); + verify(x509CertificateCallback, never()).setCertificate(any()); assertTrue(updated); } diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticatorTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticatorTest.java index 1454f4f364..565923b561 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticatorTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticatorTest.java @@ -39,7 +39,7 @@ import org.forgerock.openam.core.rest.authn.core.wrappers.AuthContextLocalWrapper; import org.forgerock.openam.core.rest.authn.core.wrappers.CoreServicesWrapper; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -74,7 +74,7 @@ public void shouldGetLoginProcessForInitialRequestWithNoAuthIndexType() throws A .indexValue(authIndexValue); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -83,7 +83,7 @@ public void shouldGetLoginProcessForInitialRequestWithNoAuthIndexType() throws A //Then verify(authContextLocalWrapper).login(); - verify(coreServicesWrapper).getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + verify(coreServicesWrapper).getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false)); assertNotNull(loginProcess); } @@ -106,7 +106,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexType() throws Aut .indexValue(authIndexValue); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -115,7 +115,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexType() throws Aut //Then verify(authContextLocalWrapper).login(AuthContext.IndexType.MODULE_INSTANCE, "INDEX_VALUE"); - verify(coreServicesWrapper).getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + verify(coreServicesWrapper).getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false)); assertNotNull(loginProcess); } @@ -139,7 +139,7 @@ public void shouldGetLoginProcessForInitialRequestWithResourceAuthIndexType() th .indexValue(authIndexValue); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); given(coreServicesWrapper.getEnvMap(request)).willReturn(envMap); @@ -149,7 +149,7 @@ public void shouldGetLoginProcessForInitialRequestWithResourceAuthIndexType() th //Then verify(authContextLocalWrapper).login(AuthContext.IndexType.RESOURCE, "INDEX_VALUE", envMap, null); - verify(coreServicesWrapper).getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + verify(coreServicesWrapper).getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false)); assertNotNull(loginProcess); } @@ -171,7 +171,7 @@ public void shouldGetLoginProcessForSubsequentRequest() throws Exception { .indexValue(authIndexValue); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("/ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(false); @@ -179,14 +179,14 @@ public void shouldGetLoginProcessForSubsequentRequest() throws Exception { LoginProcess loginProcess = loginAuthenticator.getLoginProcess(loginConfiguration); //Then - verifyZeroInteractions(authContextLocalWrapper); + verifyNoInteractions(authContextLocalWrapper); assertNotNull(loginProcess); - verify(coreServicesWrapper).getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + verify(coreServicesWrapper).getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false)); verify(coreServicesWrapper).isNewRequest(authContextLocalWrapper); verify(coreServicesWrapper).getDomainNameByRequest(request); verify(coreServicesWrapper).isOrganizationActive("/ORG_DN"); - verify(coreServicesWrapper).getExistingValidSSOToken(Matchers.anyObject()); + verify(coreServicesWrapper).getExistingValidSSOToken(any()); verifyNoMoreInteractions(coreServicesWrapper); } @@ -211,7 +211,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeNoneWithSessi .sessionUpgrade(ssoTokenId); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -247,7 +247,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeUserWithSessi given(ssoToken.getProperty("UserToken")).willReturn("INDEX_VALUE"); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -283,7 +283,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeRoleWithSessi given(ssoToken.getProperty("Role")).willReturn("INDEX_VALUE"); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -321,7 +321,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeServiceWithSe given(ssoToken.getProperty("Service")).willReturn("INDEX_VALUE"); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -359,7 +359,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeModuleWithSes given(ssoToken.getProperty("AuthType")).willReturn("INDEX_VALUE"); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -397,7 +397,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeLevelWithSess given(ssoToken.getProperty("AuthLevel")).willReturn("10"); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(false), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -435,7 +435,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeUserWithSessi given(ssoToken.getProperty("UserToken")).willReturn("INDEX_VALUE"); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(true), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -471,7 +471,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeRoleWithSessi given(ssoToken.getProperty("Role")).willReturn("INDEX_VALUE"); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(true), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -509,7 +509,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeServiceWithSe given(ssoToken.getProperty("Service")).willReturn("INDEX_VALUE"); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(true), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -547,7 +547,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeModuleWithSes given(ssoToken.getProperty("AuthType")).willReturn("INDEX_VALUE"); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(true), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -585,7 +585,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeLevelWithSess given(ssoToken.getProperty("AuthLevel")).willReturn("10"); given(coreServicesWrapper.getDomainNameByRequest(request)).willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), (SessionID) anyObject(), + given(coreServicesWrapper.getAuthContext(eq(request), eq((HttpServletResponse) null), any(SessionID.class), eq(true), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -621,10 +621,10 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeCompositeWith .indexValue(authIndexValue) .sessionUpgrade(ssoTokenId); - given(coreServicesWrapper.getDomainNameByRequest(Matchers.anyObject())) + given(coreServicesWrapper.getDomainNameByRequest(any())) .willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext((HttpServletRequest) anyObject(), eq((HttpServletResponse) null), - (SessionID) anyObject(), eq(true), eq(false))).willReturn(authContextLocalWrapper); + given(coreServicesWrapper.getAuthContext(any(HttpServletRequest.class), eq((HttpServletResponse) null), + any(SessionID.class), eq(true), eq(false))).willReturn(authContextLocalWrapper); given(authContextLocalWrapper.isSessionUpgrade()).willReturn(true); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); @@ -657,10 +657,10 @@ public void shouldGetLoginProcessForSubsequentRequestWithAuthIndexTypeCompositeA .indexValue(authIndexValue) .sessionUpgrade(ssoTokenId); - given(coreServicesWrapper.getDomainNameByRequest(Matchers.anyObject())) + given(coreServicesWrapper.getDomainNameByRequest(any())) .willReturn("ORG_DN"); - given(coreServicesWrapper.getAuthContext((HttpServletRequest) anyObject(), eq((HttpServletResponse) null), - (SessionID) anyObject(), eq(false), eq(false))).willReturn(authContextLocalWrapper); + given(coreServicesWrapper.getAuthContext(any(HttpServletRequest.class), eq((HttpServletResponse) null), + any(SessionID.class), eq(false), eq(false))).willReturn(authContextLocalWrapper); given(coreServicesWrapper.getExistingValidSSOToken(eq(new SessionID("SSO_TOKEN_ID")))).willReturn(ssoToken); given(coreServicesWrapper.isNewRequest(authContextLocalWrapper)).willReturn(true); given(authContextLocalWrapper.isSessionUpgrade()).willReturn(true); diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/deviceprint/TrustedDevicesResourceTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/deviceprint/TrustedDevicesResourceTest.java index b8588befaf..7613f93cb1 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/deviceprint/TrustedDevicesResourceTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/deviceprint/TrustedDevicesResourceTest.java @@ -20,7 +20,7 @@ import static org.forgerock.json.JsonValue.*; import static org.forgerock.json.resource.Resources.*; import static org.forgerock.openam.utils.Time.newDate; -import static org.mockito.BDDMockito.anyObject; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.*; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; @@ -48,7 +48,7 @@ import org.forgerock.services.context.ClientContext; import org.forgerock.services.context.Context; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -69,7 +69,7 @@ public void setUp() throws Exception { resource = new TrustedDevicesResource(dao, contextHelper); - given(contextHelper.getUserId((Context) anyObject())).willReturn("demo"); + given(contextHelper.getUserId(any(Context.class))).willReturn("demo"); realmTestHelper = new RealmTestHelper(); realmTestHelper.setupRealmClass(); @@ -103,7 +103,7 @@ public void shouldQueryDevices() throws ResourceException { connection.query(ctx(), request, handler); //Then - verify(handler, times(2)).handleResource(Matchers.anyObject()); + verify(handler, times(2)).handleResource(any()); } @Test diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/push/PushDevicesResourceTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/push/PushDevicesResourceTest.java index 21c697b546..2d82e32ee7 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/push/PushDevicesResourceTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/push/PushDevicesResourceTest.java @@ -23,9 +23,8 @@ import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; import static org.forgerock.openam.utils.Time.newDate; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; import java.util.ArrayList; @@ -91,7 +90,7 @@ public void setUp() throws Exception { MockitoAnnotations.initMocks(this); resource = new PushDevicesResourceTestClass(dao, contextHelper, debug, pushServiceFactory); - given(contextHelper.getUserId((Context) anyObject())).willReturn(USER_ID); + given(contextHelper.getUserId(any(Context.class))).willReturn(USER_ID); given(pushServiceFactory.create(anyString())).willReturn(pushService); realmTestHelper = new RealmTestHelper(); diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceV2Test.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceV2Test.java index 0107a441aa..33d300a1de 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceV2Test.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceV2Test.java @@ -24,7 +24,7 @@ import static org.forgerock.openam.core.rest.session.SessionResourceV2.REFRESH_ACTION_ID; import static org.forgerock.openam.session.SessionConstants.*; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModuleTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModuleTest.java index 173232011d..aba2dc1c72 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModuleTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModuleTest.java @@ -17,7 +17,7 @@ import static org.forgerock.util.test.assertj.AssertJPromiseAssert.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.testng.AssertJUnit.*; diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/query/SessionQueryManagerTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/query/SessionQueryManagerTest.java index 805bd75791..6164466e79 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/query/SessionQueryManagerTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/query/SessionQueryManagerTest.java @@ -27,7 +27,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.testng.Assert.assertEquals; diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsJsonConverterTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsJsonConverterTest.java index 2f6c6ea211..142e238983 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsJsonConverterTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsJsonConverterTest.java @@ -34,7 +34,6 @@ import org.forgerock.json.JsonValue; import org.forgerock.json.resource.BadRequestException; import org.forgerock.json.test.assertj.AssertJJsonValueAssert; -import org.mockito.Matchers; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -173,7 +172,7 @@ private HashSet getHashSet(String... strings) { @Test public void convertFromJson() throws Exception { //Given - given(serviceSchema.validateAttributes(Matchers.anyObject())).willReturn(true); + given(serviceSchema.validateAttributes(any())).willReturn(true); //When Map> result = converter.fromJson(jsonRepresentation); @@ -186,7 +185,7 @@ public void convertFromJson() throws Exception { @Test public void convertToJson() throws SMSException { //Given - given(serviceSchema.validateAttributes(Matchers.anyObject())).willReturn(true); + given(serviceSchema.validateAttributes(any())).willReturn(true); //When JsonValue result = converter.toJson(mapRepresentation, true); @@ -229,7 +228,7 @@ public void convertToJson() throws SMSException { @Test(expectedExceptions = JsonException.class) public void invalidValuesToJson() throws SMSException { //Given - given(serviceSchema.validateAttributes(Matchers.anyObject())).willReturn(false); + given(serviceSchema.validateAttributes(any())).willReturn(false); //When converter.toJson(mapRepresentation, true); @@ -238,7 +237,7 @@ public void invalidValuesToJson() throws SMSException { @Test(expectedExceptions = JsonException.class) public void invalidValuesToMap() throws Exception { //Given - given(serviceSchema.validateAttributes(Matchers.anyObject())).willReturn(false); + given(serviceSchema.validateAttributes(any())).willReturn(false); //When converter.fromJson(jsonRepresentation); diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsRealmProviderTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsRealmProviderTest.java index 195ec43bcd..cefd298418 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsRealmProviderTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsRealmProviderTest.java @@ -19,7 +19,7 @@ import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; import static org.forgerock.openam.core.rest.sms.SmsRealmProvider.*; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/tree/SmsRouteTreeTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/tree/SmsRouteTreeTest.java index 7f64f67614..69b1bc8245 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/tree/SmsRouteTreeTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/tree/SmsRouteTreeTest.java @@ -26,7 +26,7 @@ import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/openam-core/pom.xml b/openam-core/pom.xml index d964641491..e914ed15e9 100755 --- a/openam-core/pom.xml +++ b/openam-core/pom.xml @@ -13,29 +13,28 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> 4.0.0 - - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT - + openam-core + Wren:AM - Core Wren:AM Core Components - openam-core - org.apache.maven.plugins maven-jar-plugin + @@ -48,63 +47,88 @@ src/main/resources + **/* + *_*/* + true + src/main/resources/de_DE + * + true + src/main/resources/es_ES + * + true + src/main/resources/fr_FR + * + true + src/main/resources/ja_JP + * + true + src/main/resources/ko_KR + * + true + src/main/resources/zh_CN + * + true + src/main/resources/zh_TW + * + true + ${project.build.directory}/generated-resources @@ -113,96 +137,125 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-license-servlet + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-shared + - org.forgerock.openam + org.wrensecurity.wrenam openam-audit-context + - org.forgerock.openam + org.wrensecurity.wrenam openam-audit-core + - org.forgerock.openam + org.wrensecurity.wrenam openam-coretoken + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-idsvcs-schema + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-mib-schema + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-xacml3-schema + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-ldap-utils + - org.forgerock.openam + org.wrensecurity.wrenam openam-annotations + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-license-manager-cli + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-notifications + ${project.version} + org.wrensecurity.commons json-web-token + org.wrensecurity.commons json-resource-http + org.wrensecurity.commons forgerock-util + - org.forgerock.openam + org.wrensecurity.wrenam openam-tokens + ${project.version} + - org.forgerock.commons + org.wrensecurity.commons forgerock-bloomfilter-core + - org.forgerock.commons + org.wrensecurity.commons forgerock-bloomfilter-monitoring + org.wrensecurity.commons forgerock-test-utils test - org.wrensecurity.wrends opendj-server + org.wrensecurity.wrends opendj-core + org.wrensecurity.wrends opendj-grizzly + org.wrensecurity.wrends opendj-server-legacy @@ -295,12 +348,6 @@ FastInfoset - - - com.sleepycat - je - - com.sun.jersey jersey-bundle @@ -342,11 +389,13 @@ external jdmkrt + com.google.inject guice no_aop + org.wrensecurity.commons wrensec-guice-core @@ -356,44 +405,54 @@ org.testng testng + org.mockito mockito-core + org.easytesting fest-assert - + + org.powermock powermock-api-mockito2 + org.powermock powermock-core + org.powermock powermock-reflect + org.powermock powermock-module-testng + org.powermock powermock-module-testng-common + org.hdrhistogram HdrHistogram + org.wrensecurity.commons wrensec-guice-test + - org.forgerock.openam + org.wrensecurity.wrenam openam-i18n diff --git a/openam-core/src/license/THIRD-PARTY.properties b/openam-core/src/license/THIRD-PARTY.properties deleted file mode 100644 index 584299ffb2..0000000000 --- a/openam-core/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:38:44 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-core/src/main/java/org/forgerock/openam/blacklist/BloomFilterBlacklist.java b/openam-core/src/main/java/org/forgerock/openam/blacklist/BloomFilterBlacklist.java index 2c12082135..158a4f04c3 100644 --- a/openam-core/src/main/java/org/forgerock/openam/blacklist/BloomFilterBlacklist.java +++ b/openam-core/src/main/java/org/forgerock/openam/blacklist/BloomFilterBlacklist.java @@ -24,9 +24,9 @@ import org.forgerock.bloomfilter.BloomFilters; import org.forgerock.bloomfilter.ConcurrencyStrategy; import org.forgerock.bloomfilter.ExpiryStrategy; -import org.forgerock.guava.common.hash.Funnel; -import org.forgerock.guava.common.hash.Funnels; -import org.forgerock.guava.common.hash.PrimitiveSink; +import org.wrensecurity.guava.common.hash.Funnel; +import org.wrensecurity.guava.common.hash.Funnels; +import org.wrensecurity.guava.common.hash.PrimitiveSink; import org.forgerock.openam.utils.StringUtils; import org.forgerock.util.Reject; import org.forgerock.util.annotations.VisibleForTesting; diff --git a/openam-core/src/main/resources/amConfigurator.properties b/openam-core/src/main/resources/amConfigurator.properties index 6252dbd8a4..97d0ff70b6 100644 --- a/openam-core/src/main/resources/amConfigurator.properties +++ b/openam-core/src/main/resources/amConfigurator.properties @@ -27,13 +27,14 @@ # Portions Copyrighted 2010-2016 ForgeRock AS. # Portions Copyrighted 2012 Open Source Solution Technology Corporation # Portions Copyright 2016 Nomura Research Institute, Ltd. +# Portions Copyright 2023 Wren Security -// response codes +// response codes 400=Bad Request - userid/passwd param missing 401=Unauthorized - Invalid Credentials 405=Method Not Allowed - only POST is honored 408=Request Timeout - requested timed out -500=Internal Server Error +500=Internal Server Error 701=File Not Found - incorrect deployuri/server 702=Connection Error - Invalid URL specified @@ -53,43 +54,43 @@ configurator.invalidsuffix=Invalid Suffix. configurator.ldiferror=Error in creating LDIF record. configurator.filesystem=File System configurator.dirsvr=Directory Server -configurator.embedded=OpenAM User Data Store +configurator.embedded=Wren:AM User Data Store configurator.remote=Other User Data Store -configurator.opends=OpenAM data store +configurator.opends=Wren:AM data store configurator.activedir=Active Directory configurator.configsmsdatasuffix=Suffix to store Service Management configuration data: -configurator.embReplFlag=Select if you are using OpenAM configuration store and you intend sharing config data between multiple servers : -emb.startemb=Starting OpenAM configuration store +configurator.embReplFlag=Select if you are using Wren:AM configuration store and you intend sharing config data between multiple servers : +emb.startemb=Starting Wren:AM configuration store emb.success=...Success. emb.success.param=...Success {0}. emb.failed=...Failed. emb.failed.param=...Failed {0}. -emb.installingemb.null=Installing OpenAM configuration store -emb.installingemb=Installing OpenAM configuration store in {0} +emb.installingemb.null=Installing Wren:AM configuration store +emb.installingemb=Installing Wren:AM configuration store in {0} emb.done=...Done -emb.waitingforstarted=...Waiting for OpenAM configuration store to be started -emb.creatingreplica=Creating OpenAM configuration store replica -emb.creatingfamsuffix=Creating OpenAM suffix -emb.creatingamsessiondbsuffix=Creating OpenAM Session Persistence suffix +emb.waitingforstarted=...Waiting for Wren:AM configuration store to be started +emb.creatingreplica=Creating Wren:AM configuration store replica +emb.creatingfamsuffix=Creating Wren:AM suffix +emb.creatingamsessiondbsuffix=Creating Wren:AM Session Persistence suffix emb.replcommand=Replication command: {0} emb.registerservice=Registering service {0} emb.loadingschema=Loading Schema {0} emb.checkingbasedir=Checking configuration directory {0}. emb.basedirfailed=....Failed. Found existing config data. -emb.opends.start=Extracting OpenDJ, please wait... +emb.opends.start=Extracting Wren:DJ, please wait... emb.opends.stop=Complete -emb.setupopends=Running OpenDJ setup +emb.setupopends=Running Wren:DJ setup emb.setupopends.success=...Success emb.setupopends.failed.param=...Failed {0} emb.setupcommand=Setup command: {0} emb.creatingfamsuffix.success=...Success -emb.creatingfamsuffix.failure=Error loading OpenAM suffix {0} +emb.creatingfamsuffix.failure=Error loading Wren:AM suffix {0} emb.creatingamsessiondbsuffix.success=...Success -emb.creatingamsessiondbsuffix.failure=Error loading OpenAM Session Persistence suffix {0} -emb.rebuildindex.failed=Rebuilding OpenDJ indexes +emb.creatingamsessiondbsuffix.failure=Error loading Wren:AM Session Persistence suffix {0} +emb.rebuildindex.failed=Rebuilding Wren:DS indexes emb.rebuildindex.failedmsg=...Failed {0} -copy.jar.files=Copying jar files from +copy.jar.files=Copying jar files from copy.jar.complete=Copy of jars complete copy.class.files=Copying class files from copy.classes.complete=Copy of classes complete @@ -127,7 +128,7 @@ cancel.button=Cancel create.button=Create Configuration config.complete.title=Configuration Complete -config.complete.message=Configuration of OpenAM was successful! +config.complete.message=Configuration of Wren:AM was successful! next.step.question=What would you like to do next? launch.console=Login to the admin console... @@ -154,7 +155,7 @@ default.user.name=Default User [amAdmin] agent.user.name=Default Policy Agent [UrlAccessAgent] #opensso\products\amserver\war\config\config\wizard\step1.htm -step1.title=Step 1: General +step1.title=Step 1: General step1.description=Enter the password for the default user, amAdmin. The password must be at least 8 characters in length. If this configuration will be part of an existing deployment, the password you enter must match that of the original deployment. step1.subtitle=Default User Password step1.admin.user.name=Default User [amAdmin] @@ -171,20 +172,20 @@ step2.cookie.domain.help=The cookie domain must not be a top level domain. Leave step2.server.url=Server URL step2.server.settings=Server Settings -configuration.wizard.step2.noOption=No, this is the first OpenAM instance of a new deployment +configuration.wizard.step2.noOption=No, this is the first Wren:AM instance of a new deployment configuration.wizard.step2.yesOption=Yes, there are one or more existing sites configuration.wizard.step2.instanceURL=New Instance URL configuration.wizard.step2.tooltip=Please specify a url. -configuration.wizard.step2.serverFound=OpenAM Server found. +configuration.wizard.step2.serverFound=Wren:AM Server found. configuration.wizard.step2.no.write.permission.to.basedir=Do not have write permission to this directory. configuration.wizard.step2.basedir.already.has.content=Directory is not empty configuration.wizard.step2.mismatched.cookie.domain=Cookie domain is not a part of the server URL #opensso\products\amserver\war\config\config\wizard\step3.htm step3.title=Step 3: Configuration Data Store Settings -step3.description=If no other OpenAM instance already exists in the environment, then choose First Instance. If one or more OpenAM instances already exist in the environment, choose Add to Existing Deployment. -step3.embedded.option=OpenAM -step3.external.option=OpenDJ +step3.description=If no other Wren:AM instance already exists in the environment, then choose First Instance. If one or more Wren:AM instances already exist in the environment, choose Add to Existing Deployment. +step3.embedded.option=Wren:AM +step3.external.option=Wren:DS step3.sub.title=Configuration Store Details root.suffix.label=Root Suffix port.label=Port @@ -210,35 +211,35 @@ existing.replication.port=Replication Port login.id.label=Login ID load.schema.label=Load User Schema validating.url.string=validating url... -url.server.help=URL of the existing OpenAM server. ex: http://server.co.com:8080/openam -local.port.values=New OpenAM instance port settings -existing.port.values.noreplication=The existing OpenAM instance is not set up for replication. The following ports will be used -existing.port.values.replication=The existing OpenAM instance is already set up for replication on the following ports -existing.port.values.external=Existing OpenAM instance port settings +url.server.help=URL of the existing Wren:AM server. ex: http://server.co.com:8080/openam +local.port.values=New Wren:AM instance port settings +existing.port.values.noreplication=The existing Wren:AM instance is not set up for replication. The following ports will be used +existing.port.values.replication=The existing Wren:AM instance is already set up for replication on the following ports +existing.port.values.external=Existing Wren:AM instance port settings configurator.embreplfailed=Replication connection failed config.data.already.exist=Config data already exists under root suffix in this host # step4.htm - user configuration store page step4.title=Step 4: User Data Store Settings -step4.description=You can use the data store that comes with the OpenAM configuration data store, or you can use a different user data store. A good practice for setting up production environments is to use an external user data store, one that is different than the OpenAM user data store. Please note that Policy Service and LDAP Authentication Module shall be configured to use the Directory Administrator DN and Password provided here. +step4.description=You can use the data store that comes with the Wren:AM configuration data store, or you can use a different user data store. A good practice for setting up production environments is to use an external user data store, one that is different than the Wren:AM user data store. Please note that Policy Service and LDAP Authentication Module shall be configured to use the Directory Administrator DN and Password provided here. step4.sub.title=User Store Details copy.config.settings=Use Configuration Store Settings store.type.label=User Data Store Type -am.ldap.schema=LDAP with OpenAM Schema -generic.ldap.schema=Generic LDAP (no OpenAM Schema) -embedded.user.message=The OpenAM user data store is not recommended for large scale production environments or deployments with a complex topology. -cannot.connect.to.UM.datastore=Cannot resolve Active Directory domain name, please ensure the OpenAM host is using the Active Directory infrastructure for DNS. +am.ldap.schema=LDAP with Wren:AM Schema +generic.ldap.schema=Generic LDAP (no Wren:AM Schema) +embedded.user.message=The Wren:AM user data store is not recommended for large scale production environments or deployments with a complex topology. +cannot.connect.to.UM.datastore=Cannot resolve Active Directory domain name, please ensure the Wren:AM host is using the Active Directory infrastructure for DNS. cannot.connect.to.SM.datastore=Unable to authenticate to datastore activedirectory.ldap.schema=Active Directory with Host and Port activedirectoryfordomainname.ldap.schema=AD with Domain Name odsee.ldap.schema=Oracle Directory Server Enterprise Edition adam.ldap.schema=Active Directory Application Mode -opends.ldap.schema=OpenDJ +opends.ldap.schema=Wren:DS tivoli.ldap.schema=IBM Tivoli Directory Server # step3.htm and step4.htm - ldap error messaging invalid.dn=Invalid Distinguished Name -ldap.connect.error=Could not connect to the server +ldap.connect.error=Could not connect to the server ldap.server.down=The server cannot be contacted ldap.invalid.dn=The specified DN uses invalid syntax ldap.nosuch.object=The specified user or root suffix does not exist @@ -251,7 +252,7 @@ ldap.constraint=Exceed password retry limit step5.title=Step 5: Site Configuration step5.description=Will this instance be deployed behind a load balancer as part of a site configuration? step5.sub.title=Site Configuration Details -step5.help.message=This is the first instance of OpenAM, and no site configurations currently exist. To create a new site configuration, provide the following information +step5.help.message=This is the first instance of Wren:AM, and no site configurations currently exist. To create a new site configuration, provide the following information configuration.wizard.step5.balanceTitle=Load Balancer Details site.name.label=Site Name primary.url.label=Load Balancer URL @@ -264,7 +265,7 @@ session.ha.sfo.enabled.label=Enable Session HA Persistence and Failover # agent user page agent.step.title=Step 6: Default Policy Agent User -agent.step.description=These settings are used by OpenAM policy agents for retrieving policy agent properties. +agent.step.description=These settings are used by Wren:AM policy agents for retrieving policy agent properties. agent.step.subtitle=Policy Agent User Password missing.base.dn=Missing Base DN @@ -292,9 +293,9 @@ default.user.store=Using Configuration Store Settings site.configure.label=This instance is not setup behind a load balancer step6.title=Summary step6.description=Please take a moment to confirm that your settings are correct. -configuration.wizard.step6.summaryPanel.step2.title=OpenAM Association +configuration.wizard.step6.summaryPanel.step2.title=Wren:AM Association configuration.wizard.step6.summaryPanel.step2.existingInstance=This instance is being added to the existing site as -configuration.wizard.step6.summaryPanel.step2.newInstance=This is the first OpenAM instance of a new deployment. +configuration.wizard.step6.summaryPanel.step2.newInstance=This is the first Wren:AM instance of a new deployment. configuration.wizard.step6.summaryPanel.step3.title=Configuration Store Details configuration.wizard.step6.summaryPanel.step3.default=Default Configuration configuration.wizard.step6.summaryPanel.step3.custom=Previously configured @@ -537,19 +538,19 @@ configuration.options.option3.description= configuration.options.option3.link=Add to an Existing Configuration cannot.continue.header=Cannot Continue -cannot.continue.body=The OpenAM setup wizard has detected an existing configuration directory containing an older version of the embedded configuration repository (OpenDJ). -cannot.continue.text1=The OpenAM setup wizard cannot be used to automatically upgrade a previous installation of OpenAM to the latest version, if the embedded configuration store was used. This version of OpenAM introduces a new version of OpenDJ and this must be manually upgraded before the setup wizard can continue. +cannot.continue.body=The Wren:AM setup wizard has detected an existing configuration directory containing an older version of the embedded configuration repository (Wren:DS). +cannot.continue.text1=The Wren:AM setup wizard cannot be used to automatically upgrade a previous installation of Wren:AM to the latest version, if the embedded configuration store was used. This version of Wren:AM introduces a new version of Wren:DS and this must be manually upgraded before the setup wizard can continue. cannot.continue.text2=Existing Configuration Directory location -cannot.continue.text3=Please refer to the upgrade documentation to update your configuration before attempting to re-run the OpenAM setup wizard. +cannot.continue.text3=Please refer to the upgrade documentation to update your configuration before attempting to re-run the Wren:AM setup wizard. # upgrade options upgrade.available=Upgrade Available upgrade.available.option=An older version of configuration has been found -upgrade.title=Upgrade to OpenAM ${project.version} +upgrade.title=Upgrade to Wren:AM ${project.version} upgrade.description=

Please read the release notes before upgrading.

NOTE: you should NOT upgrade if you are running OpenAM version 9.0 or older.

-upgrade.link=Upgrade to OpenAM ${project.version} +upgrade.link=Upgrade to Wren:AM ${project.version} upgrade.existing.title=Restore configuration -upgrade.existing.description=Restore your OpenAM instance from an configuration backup file. +upgrade.existing.description=Restore your Wren:AM instance from an configuration backup file. upgrade.existing.link=Restore configuration upgrade.older.title=Upgrade from an older version upgrade.older.description=

If your previous deployment is OpenAM 9.0 or older you will need to upgrade to OpenAM 9.5 since in flight upgrade is not supported.

@@ -564,12 +565,12 @@ upgrade.confirm.no=No, I am not sure. I should check before I ruin everything. upgrade.confirm.no.link=Show me the other options again. upgrade.option.complete.title=Upgrade Complete! -upgrade.option.complete.description=

You will not be able to have the full OpenAM ${project.version} functionality until the shared configuration is complete.

-upgrade.option.complete.body=Upgrade to OpenAM ${project.version} Successful +upgrade.option.complete.description=

You will not be able to have the full Wren:AM ${project.version} functionality until the shared configuration is complete.

+upgrade.option.complete.body=Upgrade to Wren:AM ${project.version} Successful download.instructions.link=Download these instructions launch.console.link=Launch the console -upgrade.custom.title=Start and Review the OpenAM upgrade process. +upgrade.custom.title=Start and Review the Wren:AM upgrade process. save.button=Save upgrade.complete.title=Upgrade Complete @@ -582,7 +583,7 @@ configuration.default_summary.user_store_details=User Store Details configuration.default_summary.user_store_details.default_configuration=Default Configuration configuration.default_summary.data_store_details=Data Store Details configuration.default_summary.data_store_details.default_configuration=Default Configuration -configuration.default_summary.text1=

This demo is for evaluation purposes. OpenAM will automatically configure the config store and the user store to your local system.

If you intend on placing this on a production server then you should return to the +configuration.default_summary.text1=

This demo is for evaluation purposes. Wren:AM will automatically configure the config store and the user store to your local system.

If you intend on placing this on a production server then you should return to the configuration.default_summary.text.link=configuration options page configuration.default_summary.text2= and click Create a New Configuration instead.

configuration.default_summary.button.back=Back @@ -593,7 +594,7 @@ configuration.default_summary.configuration_complete.link=Launch the console configuration.default_summary.writing_configuration.message=Writing configuration. Please wait... next.step.message=What would you like to do next? go.to.login.screen=Proceed to Login -create.another.instance=Create Another OpenAM Instance +create.another.instance=Create Another Wren:AM Instance # opensso/config/commonTasks.htm configuration.common_tasks.title=Common Tasks @@ -609,7 +610,7 @@ configuration.common_tasks.add_instance=Add another instance configuration.common_tasks.federation=Federation configuration.common_tasks.configure_service_provider=Configure this system as a service provider configuration.common_tasks.configure_identity_provider=Configure this system as an identity provider -configuration.common_tasks.shortcuts_header=Shortcuts to modify your existing OpenAM settings. +configuration.common_tasks.shortcuts_header=Shortcuts to modify your existing Wren:AM settings. configuration.common_tasks.select_configuration=Select a configuration: # opensso/config/realm/create.htm @@ -658,13 +659,13 @@ configurator.urlaccessagent.passwd.match.amadmin.pwd=Default Agent Password cann configuration.failed.error=Configuration did not succeed. Check the error logs for more information. -product.name=OpenAM +product.name=Wren:AM setupprogress.timeout=Progress Log timed out product.copyrights=Copyright \u00a9 Wren Security configurator.cannot.bootstrap=Cannot bootstrap. Check to see that the configuration directory server is running. #Upgrade Properties -upgrade.main.title=Upgrading OpenAM +upgrade.main.title=Upgrading Wren:AM upgrade.init.error=An unknown error occurred while initializing upgrade, check debug logs for more information. upgrade.current.version=Current Version: upgrade.new.version=New Version: diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/SessionTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/SessionTest.java index 49a70392b2..a34a1976ec 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/SessionTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/SessionTest.java @@ -22,7 +22,7 @@ import java.util.List; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/MonitoredOperationsTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/MonitoredOperationsTest.java index cab6219341..ce1565e310 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/MonitoredOperationsTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/MonitoredOperationsTest.java @@ -18,8 +18,8 @@ import com.iplanet.dpro.session.Session; import com.iplanet.dpro.session.SessionException; import com.iplanet.dpro.session.operations.SessionOperations; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/SessionMonitoringStoreTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/SessionMonitoringStoreTest.java index 57368eaad6..e47a23254d 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/SessionMonitoringStoreTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/SessionMonitoringStoreTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/operations/ServerSessionOperationStrategyTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/operations/ServerSessionOperationStrategyTest.java index 13c2d3c9e4..5957b43350 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/operations/ServerSessionOperationStrategyTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/operations/ServerSessionOperationStrategyTest.java @@ -17,7 +17,7 @@ import static org.fest.assertions.Assertions.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import org.forgerock.openam.sso.providers.stateless.StatelessSessionManager; diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/operations/strategies/StatelessOperationsTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/operations/strategies/StatelessOperationsTest.java index a4cd98f9a3..a8245a93d1 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/operations/strategies/StatelessOperationsTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/operations/strategies/StatelessOperationsTest.java @@ -171,7 +171,7 @@ public void shouldNotBlacklistSessionOnDestroyIfNotAllowed() throws Exception { statelessOperations.destroy(requester, mockSession); } finally { // Then - verifyZeroInteractions(mockSessionBlacklist); + verifyNoInteractions(mockSessionBlacklist); } } } \ No newline at end of file diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionAuditorTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionAuditorTest.java index 65bea8a139..afdaa67a92 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionAuditorTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionAuditorTest.java @@ -248,7 +248,7 @@ public void shouldIgnoreQuotaExhaustedEvent() { System.currentTimeMillis())); // Then - verifyZeroInteractions(auditEventPublisher); + verifyNoInteractions(auditEventPublisher); } @Test @@ -260,7 +260,7 @@ public void shouldIgnoreProtectedPropertyEvent() { System.currentTimeMillis())); // Then - verifyZeroInteractions(auditEventPublisher); + verifyNoInteractions(auditEventPublisher); } @Test diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionNotificationPublisherTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionNotificationPublisherTest.java index 3375fe6682..3d6c09d061 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionNotificationPublisherTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionNotificationPublisherTest.java @@ -21,7 +21,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import java.util.LinkedHashMap; import java.util.List; @@ -152,7 +152,7 @@ private void assertIgnoresSessionEvent(SessionEventType sessionEventType) { System.currentTimeMillis())); // Then - verifyZeroInteractions(notificationBroker); + verifyNoInteractions(notificationBroker); } private List fireSessionEvent(SessionEventType sessionEventType) { diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionServerConfigTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionServerConfigTest.java index 2ea68492ec..55a373a195 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionServerConfigTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionServerConfigTest.java @@ -12,7 +12,7 @@ import static org.fest.assertions.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @PrepareForTest({ SystemProperties.class, WebtopNaming.class }) diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/service/WebtopNamingSiteUtilsTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/service/WebtopNamingSiteUtilsTest.java index 754375e0f6..244f5c4365 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/service/WebtopNamingSiteUtilsTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/service/WebtopNamingSiteUtilsTest.java @@ -28,8 +28,8 @@ import static org.fest.assertions.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/utils/SessionInfoFactoryTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/utils/SessionInfoFactoryTest.java index cd7e6eff92..5322c59a4f 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/utils/SessionInfoFactoryTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/utils/SessionInfoFactoryTest.java @@ -18,7 +18,7 @@ import static org.fest.assertions.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import java.util.Hashtable; diff --git a/openam-core/src/test/java/com/sun/identity/authentication/service/DefaultSessionActivatorTest.java b/openam-core/src/test/java/com/sun/identity/authentication/service/DefaultSessionActivatorTest.java index 0349d88cfd..718360dde7 100644 --- a/openam-core/src/test/java/com/sun/identity/authentication/service/DefaultSessionActivatorTest.java +++ b/openam-core/src/test/java/com/sun/identity/authentication/service/DefaultSessionActivatorTest.java @@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import java.util.Arrays; diff --git a/openam-core/src/test/java/com/sun/identity/setup/AMSetupFilterTest.java b/openam-core/src/test/java/com/sun/identity/setup/AMSetupFilterTest.java index 9c40ae9c49..b5fed53bc9 100644 --- a/openam-core/src/test/java/com/sun/identity/setup/AMSetupFilterTest.java +++ b/openam-core/src/test/java/com/sun/identity/setup/AMSetupFilterTest.java @@ -23,7 +23,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.testng.Assert.fail; import java.io.File; @@ -104,7 +104,7 @@ public void initShouldNotSetEncryptionPasswordIfConfigured() throws Exception { setupFilter.init(config); //Then - verifyZeroInteractions(context); + verifyNoInteractions(context); } @Test @@ -151,7 +151,7 @@ public void filterShouldRedirectSetupRequestsIfConfigured(String requestUri) thr //Then verify(response).sendRedirect("SCHEME://SERVER_NAME:8080/CONTEXT_PATH"); - verifyZeroInteractions(chain); + verifyNoInteractions(chain); } @Test @@ -171,7 +171,7 @@ public void filterShouldRedirectRequestsIfUpgradeInProgressButConfigStoreIsDown( //Then verify(response).sendRedirect("CONFIG_STORE_DOWN_REDIRECT_URI"); - verifyZeroInteractions(chain); + verifyNoInteractions(chain); } @Test @@ -194,7 +194,7 @@ public void filterShouldThrowConfigurationExceptionIfUpgradeInProgressAndConfigS } catch (ServletException e) { //Then assertThat(e.getCause()).isInstanceOf(ConfigurationException.class); - verifyZeroInteractions(response, chain); + verifyNoInteractions(response, chain); } } @@ -233,7 +233,7 @@ public void filterShouldRedirectRequestsToSetupPageIfNotConfigured() throws Exce //Then verify(response).sendRedirect("SCHEME://SERVER_NAME:8080/CONTEXT_PATH/config/options.htm"); - verifyZeroInteractions(chain); + verifyNoInteractions(chain); } @Test @@ -256,7 +256,7 @@ public void filterShouldThrowExceptionIfNotConfiguredAndCannotWriteToUserHomeDir } catch (ServletException e) { //Then assertThat(e.getCause()).isInstanceOf(ConfigurationException.class); - verifyZeroInteractions(response, chain); + verifyNoInteractions(response, chain); } } diff --git a/openam-core/src/test/java/org/forgerock/openam/agent/TokenRestrictionResolverTest.java b/openam-core/src/test/java/org/forgerock/openam/agent/TokenRestrictionResolverTest.java index fbe342e2d4..c357afc005 100644 --- a/openam-core/src/test/java/org/forgerock/openam/agent/TokenRestrictionResolverTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/agent/TokenRestrictionResolverTest.java @@ -16,8 +16,8 @@ package org.forgerock.openam.agent; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/openam-core/src/test/java/org/forgerock/openam/blacklist/CTSBlacklistTest.java b/openam-core/src/test/java/org/forgerock/openam/blacklist/CTSBlacklistTest.java index 6115a41727..48625131a7 100644 --- a/openam-core/src/test/java/org/forgerock/openam/blacklist/CTSBlacklistTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/blacklist/CTSBlacklistTest.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.willThrow; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import java.util.concurrent.ScheduledExecutorService; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/CTSPersistentStoreImplTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/CTSPersistentStoreImplTest.java index 34b52b0108..f0a39b626d 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/CTSPersistentStoreImplTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/CTSPersistentStoreImplTest.java @@ -25,9 +25,9 @@ import static org.fest.assertions.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SAMLAdapterTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SAMLAdapterTest.java index 526268a414..bc97d81384 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SAMLAdapterTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SAMLAdapterTest.java @@ -19,7 +19,7 @@ import static org.forgerock.openam.utils.Time.*; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import org.forgerock.openam.cts.TokenTestUtils; import org.forgerock.openam.tokens.TokenType; @@ -95,7 +95,7 @@ public void shouldNotStoreSecondaryKeyIfNull() { SAMLToken samlToken = new SAMLToken("primary", null, 12345, ""); given(tokenIdFactory.toSAMLPrimaryTokenId(anyString())).willReturn("id"); - given(serialisation.serialise(anyObject())).willReturn(""); + given(serialisation.serialise(any())).willReturn(""); // When Token token = adapter.toToken(samlToken); diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/LDAPConfigTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LDAPConfigTest.java index 2347c22176..b3d4837c60 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/LDAPConfigTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LDAPConfigTest.java @@ -26,7 +26,7 @@ import static org.fest.assertions.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java index 7a2ca05e66..7976e3d42e 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java @@ -548,7 +548,7 @@ public void shouldQuery() throws Exception { // Given final QueryBuilder mockBuilder = mock(QueryBuilder.class); given(mockBuilder.withFilter(any(Filter.class))).willReturn(mockBuilder); - given(mockBuilder.returnTheseAttributes(anySetOf(CoreTokenField.class))).willReturn(mockBuilder); + given(mockBuilder.returnTheseAttributes(anySet())).willReturn(mockBuilder); given(mockBuilder.limitResultsTo(anyInt())).willReturn(mockBuilder); given(mockBuilder.within(any(Duration.class))).willReturn(mockBuilder); given(mockBuilder.execute(any(Connection.class))) @@ -574,7 +574,7 @@ public void shouldPartialQuery() throws Exception { // Given final QueryBuilder mockBuilder = mock(QueryBuilder.class); given(mockBuilder.withFilter(any(Filter.class))).willReturn(mockBuilder); - given(mockBuilder.returnTheseAttributes(anySetOf(CoreTokenField.class))).willReturn(mockBuilder); + given(mockBuilder.returnTheseAttributes(anySet())).willReturn(mockBuilder); given(mockBuilder.limitResultsTo(anyInt())).willReturn(mockBuilder); given(mockBuilder.within(any(Duration.class))).willReturn(mockBuilder); diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerPastExpiryDateQueryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerPastExpiryDateQueryTest.java index ad1fdd62ac..706cf8a901 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerPastExpiryDateQueryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerPastExpiryDateQueryTest.java @@ -16,8 +16,8 @@ package org.forgerock.openam.cts.impl.query.worker.queries; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import java.util.Calendar; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/MaxSessionTimeExpiredQueryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/MaxSessionTimeExpiredQueryTest.java index 3f3bf439da..5ecf7204dc 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/MaxSessionTimeExpiredQueryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/MaxSessionTimeExpiredQueryTest.java @@ -17,8 +17,8 @@ package org.forgerock.openam.cts.impl.query.worker.queries; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import java.util.Calendar; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandlerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandlerTest.java index 65d8d203c0..3991a5f551 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandlerTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandlerTest.java @@ -65,8 +65,7 @@ public void shouldInvokeDeleteForEachHitEvenIfThereWasAnException() throws Excep Collection hits = getHits(5); handler.processResults(hits); - willThrow(new CoreTokenException("")).willNothing().given(mockTaskDispatcher) - .delete(anyString(), any(ResultHandler.class)); + willThrow(new CoreTokenException("")).given(mockTaskDispatcher).delete(anyString(), any()); for (PartialToken hit : hits) { verify(mockTaskDispatcher).delete(eq(hit.getValue(CoreTokenField.TOKEN_ID)), any()); diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/config/CTSQueueConfigurationTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/config/CTSQueueConfigurationTest.java index 28c6633011..f26a7adb18 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/config/CTSQueueConfigurationTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/config/CTSQueueConfigurationTest.java @@ -16,9 +16,8 @@ package org.forgerock.openam.cts.impl.queue.config; import static org.fest.assertions.Assertions.assertThat; -import static org.mockito.BDDMockito.anyObject; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import java.util.Map; @@ -48,7 +47,7 @@ public void setup() throws InvalidConfigurationException { LdapDataLayerConfiguration dataLayerConfiguration = mock(LdapDataLayerConfiguration.class); given(dataLayerConfiguration.getStoreMode()).willReturn(StoreMode.DEFAULT); Map configMap = mock(Map.class); - given(configMap.get(anyObject())).willReturn(dataLayerConfiguration); + given(configMap.get(any())).willReturn(dataLayerConfiguration); config = new CTSQueueConfiguration(mockConfigFactory, mock(Debug.class)); } diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/CTSMonitoringStoreImplTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/CTSMonitoringStoreImplTest.java index 6555f04f31..66f7949997 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/CTSMonitoringStoreImplTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/CTSMonitoringStoreImplTest.java @@ -24,7 +24,7 @@ import org.forgerock.openam.cts.monitoring.impl.connections.ConnectionStore; import org.forgerock.openam.cts.monitoring.impl.operations.TokenOperationsStore; import org.forgerock.openam.cts.monitoring.impl.reaper.ReaperMonitor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.testng.annotations.BeforeMethod; @@ -34,7 +34,7 @@ import java.util.concurrent.ExecutorService; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import static org.testng.Assert.assertEquals; @@ -85,7 +85,7 @@ public void shouldNotAddTokenOperationForSpecificTokenTypeIfTokenIsNull() throws ctsOperationsMonitoringStore.addTokenOperation(token, operation, successful); //Then - verify(tokenOperationsStore, never()).addTokenOperation(Matchers.anyObject(), eq(operation), eq(successful)); + verify(tokenOperationsStore, never()).addTokenOperation(any(), eq(operation), eq(successful)); } @Test diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/connections/MonitoredCTSConnectionFactoryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/connections/MonitoredCTSConnectionFactoryTest.java index 9d5a615cba..aeb3ac0115 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/connections/MonitoredCTSConnectionFactoryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/connections/MonitoredCTSConnectionFactoryTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; -import static org.mockito.BDDMockito.verifyZeroInteractions; +import static org.mockito.BDDMockito.verifyNoInteractions; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -88,7 +88,7 @@ public void shouldWrapHandlerWhenCalledAsync() { //then verify(connectionFactory).createAsync(); - verifyZeroInteractions(monitoringStore); + verifyNoInteractions(monitoringStore); promise.handleException(new DataLayerException("reason")); verify(monitoringStore).addConnection(false); } diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationStoreTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationStoreTest.java index 23bce6dba5..ba69cd7251 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationStoreTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationStoreTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -76,7 +76,7 @@ public void shouldAddOperationToExistingOperationStore() { operationStore.add(operation); //Then - verifyZeroInteractions(operationRateFactory); + verifyNoInteractions(operationRateFactory); verify(opRate).increment(); } diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/operations/TokenOperationsStoreTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/operations/TokenOperationsStoreTest.java index 057c2e60de..fd64a61edc 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/operations/TokenOperationsStoreTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/operations/TokenOperationsStoreTest.java @@ -93,7 +93,7 @@ public void shouldAddTokenOperationForSpecificTokenTypeToExistingOperationStore( tokenOperationsStore.addTokenOperation(tokenType, operation, true); //Then - verifyZeroInteractions(operationStoreFactory); + verifyNoInteractions(operationStoreFactory); verify(typeOperationStore).add(operation); } diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsMonitorTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsMonitorTest.java index 0a13b43320..3c601797f7 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsMonitorTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsMonitorTest.java @@ -24,7 +24,7 @@ import static org.fest.assertions.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.testng.AssertJUnit.assertEquals; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandlerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandlerTest.java index 83a1b3b720..2550739fe8 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandlerTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandlerTest.java @@ -25,7 +25,7 @@ import static org.mockito.BDDMockito.mock; import static org.mockito.BDDMockito.verify; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; public class DefaultMonitoringResultHandlerTest { diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandlerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandlerTest.java index 976d577545..4af2a21d94 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandlerTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandlerTest.java @@ -23,7 +23,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobUtilsTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobUtilsTest.java index fa541123f2..c957702966 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobUtilsTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobUtilsTest.java @@ -27,7 +27,7 @@ import static org.mockito.BDDMockito.verify; import static org.mockito.BDDMockito.mock; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; public class TokenBlobUtilsTest { diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/worker/CTSWorkerManagerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/worker/CTSWorkerManagerTest.java index df28aef882..15d5df2497 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/worker/CTSWorkerManagerTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/worker/CTSWorkerManagerTest.java @@ -18,8 +18,8 @@ import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.times; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.*; import java.util.Arrays; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcessTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcessTest.java index 933653d8ec..c4711c2994 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcessTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcessTest.java @@ -17,7 +17,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.verify; -import static org.mockito.Matchers.anyCollection; +import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcessTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcessTest.java index c3258bed16..3a52b862d2 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcessTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcessTest.java @@ -17,8 +17,8 @@ import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.verify; -import static org.mockito.Matchers.anyCollection; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyCollection; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import java.util.Arrays; diff --git a/openam-core/src/test/java/org/forgerock/openam/services/email/MailServerImplTest.java b/openam-core/src/test/java/org/forgerock/openam/services/email/MailServerImplTest.java index 8506825170..39fa2d842a 100644 --- a/openam-core/src/test/java/org/forgerock/openam/services/email/MailServerImplTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/services/email/MailServerImplTest.java @@ -42,9 +42,9 @@ import java.util.Map; import java.util.Set; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/caching/InMemoryInternalSessionCacheStepTest.java b/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/caching/InMemoryInternalSessionCacheStepTest.java index 444170b070..fef7dfddbd 100644 --- a/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/caching/InMemoryInternalSessionCacheStepTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/caching/InMemoryInternalSessionCacheStepTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/org/forgerock/openam/session/stateless/StatelessConfigTest.java b/openam-core/src/test/java/org/forgerock/openam/session/stateless/StatelessConfigTest.java index 312cfc26bd..caf47947ad 100644 --- a/openam-core/src/test/java/org/forgerock/openam/session/stateless/StatelessConfigTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/session/stateless/StatelessConfigTest.java @@ -22,8 +22,8 @@ import static org.fest.assertions.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; public class StatelessConfigTest { diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/SMSConfigurationFactoryTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/SMSConfigurationFactoryTest.java index e479afea13..650857331f 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/SMSConfigurationFactoryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/SMSConfigurationFactoryTest.java @@ -25,8 +25,8 @@ import static org.fest.assertions.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; public class SMSConfigurationFactoryTest { diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/ServerConfigurationFactoryTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/ServerConfigurationFactoryTest.java index 9f8adb1a62..a2151d0623 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/ServerConfigurationFactoryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/ServerConfigurationFactoryTest.java @@ -26,8 +26,8 @@ import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; /** diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/PooledTaskExecutorTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/PooledTaskExecutorTest.java index f717772a3d..2798a3044a 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/PooledTaskExecutorTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/PooledTaskExecutorTest.java @@ -102,7 +102,7 @@ public SimpleTaskExecutor answer(InvocationOnMock invocation) throws Throwable { debug("Task 3 now queued on semaphore"); // Then - verifyZeroInteractions(task3.task); + verifyNoInteractions(task3.task); // When debug("Unblocking task 2"); diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfigTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfigTest.java index 5771ee1e5b..b492874652 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfigTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfigTest.java @@ -19,9 +19,9 @@ import static org.fest.assertions.Assertions.*; import static org.forgerock.openam.utils.CollectionUtils.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilderTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilderTest.java index 388adc1b6a..347aabde57 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilderTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilderTest.java @@ -93,7 +93,7 @@ public void shouldUseHandlerToPerformSearch() throws CoreTokenException, IOExcep Iterator iterator = builder.executeRawResults(mockConnection, PartialToken.class); // Then - verifyZeroInteractions(searchHandler); + verifyNoInteractions(searchHandler); iterator.next(); verify(searchHandler).performSearch(eq(mockConnection), any(SearchRequest.class), any(Collection.class)); } @@ -122,7 +122,7 @@ public Object answer(InvocationOnMock invocationOnMock) throws Throwable { Iterator> results = builder.execute(mockConnection); // Then - verifyZeroInteractions(tokenEntryConverter); + verifyNoInteractions(tokenEntryConverter); assertThat(results.next().size()).isEqualTo(entries.size()); verify(tokenEntryConverter, times(2)).convert(any(Entry.class), any(String[].class)); } diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/CreateTaskTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/CreateTaskTest.java index 2786fa68ab..afa79885ad 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/CreateTaskTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/CreateTaskTest.java @@ -16,8 +16,8 @@ package org.forgerock.openam.sm.datalayer.impl.tasks; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import org.forgerock.openam.cts.api.tokens.Token; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/store/TokenDataStoreTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/store/TokenDataStoreTest.java index 2b6a7b6035..c36c1935c4 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/store/TokenDataStoreTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/store/TokenDataStoreTest.java @@ -59,7 +59,7 @@ public void setup() throws Exception { public void testCreate() throws Exception { // Given Token token = new Token("123", TokenType.GENERIC); - when(adapter.toToken(anyObject())).thenReturn(token); + when(adapter.toToken(any())).thenReturn(token); Task task = givenCreateTaskCompletesSuccessfully(); // When @@ -74,7 +74,7 @@ public void testCreate() throws Exception { public void testCreateError() throws Exception { // Given Token token = new Token("123", TokenType.GENERIC); - when(adapter.toToken(anyObject())).thenReturn(token); + when(adapter.toToken(any())).thenReturn(token); givenCreateTaskFailsToComplete(); // When @@ -88,7 +88,7 @@ public void testCreateExecutorError() throws Exception { // Given Token token = new Token("123", TokenType.GENERIC); final Task task = mock(Task.class); - when(adapter.toToken(anyObject())).thenReturn(token); + when(adapter.toToken(any())).thenReturn(token); when(taskFactory.create(any(Token.class), any(Options.class), any(ResultHandler.class))).thenReturn(task); doThrow(DataLayerException.class).when(taskExecutor).execute("123", task); @@ -156,7 +156,7 @@ public void testReadExecutorError() throws Exception { public void testUpdate() throws Exception { // Given final Token token = new Token("123", TokenType.GENERIC); - when(adapter.toToken(anyObject())).thenReturn(token); + when(adapter.toToken(any())).thenReturn(token); Task readTask = givenReadTaskCompletesSuccessfully("123", token); Task updateTask = givenUpdateTaskCompletesSuccessfully(token); @@ -173,7 +173,7 @@ public void testUpdate() throws Exception { public void testUpdateNotExisting() throws Exception { // Given final Token token = new Token("123", TokenType.GENERIC); - when(adapter.toToken(anyObject())).thenReturn(token); + when(adapter.toToken(any())).thenReturn(token); givenReadTaskCompletesSuccessfully("123", null); // When diff --git a/openam-coretoken/pom.xml b/openam-coretoken/pom.xml index b09175a528..787b715790 100755 --- a/openam-coretoken/pom.xml +++ b/openam-coretoken/pom.xml @@ -13,23 +13,21 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT - - Wren:AM - Core Token - Wren:AM CoreToken Services openam-coretoken - jar + + Wren:AM - Core Token + Wren:AM Core Token Services diff --git a/openam-dashboard/pom.xml b/openam-dashboard/pom.xml index d69065af0a..1101f21548 100755 --- a/openam-dashboard/pom.xml +++ b/openam-dashboard/pom.xml @@ -13,42 +13,44 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> 4.0.0 - - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT - - Wren:AM - Dashboard - Wren:AM Dashboard Services openam-dashboard jar + Wren:AM - Dashboard + Wren:AM Dashboard Services + - org.forgerock.openam + org.wrensecurity.wrenam openam-shared + - org.forgerock.openam + org.wrensecurity.wrenam openam-core - + org.wrensecurity.commons json-resource + org.wrensecurity.commons json-resource-http + javax.servlet javax.servlet-api diff --git a/openam-dashboard/src/license/THIRD-PARTY.properties b/openam-dashboard/src/license/THIRD-PARTY.properties deleted file mode 100644 index 958921d069..0000000000 --- a/openam-dashboard/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:39:53 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-datastore/pom.xml b/openam-datastore/pom.xml index 36ac6ceb62..baed7b27b7 100755 --- a/openam-datastore/pom.xml +++ b/openam-datastore/pom.xml @@ -13,44 +13,48 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT openam-datastore - jar + Wren:AM - User Data Store Wren:AM User Data Store - org.forgerock.openam + org.wrensecurity.wrenam openam-core + - org.forgerock.openam + org.wrensecurity.wrenam openam-ldap-utils + org.testng testng + org.powermock powermock-api-mockito2 + org.powermock powermock-module-testng + org.easytesting fest-assert diff --git a/openam-datastore/src/license/THIRD-PARTY.properties b/openam-datastore/src/license/THIRD-PARTY.properties deleted file mode 100644 index 629c95a882..0000000000 --- a/openam-datastore/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License, Version 2.0 -# - Apache Software Licenses -# - BSD -# - CC BY-NC-ND 3.0 -# - Common Development and Distribution License 1.0 -# - Common Development and Distribution License 1.1 -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Dual licensed (CDDL and GPL) -# - Dual licensed (CDDL and GPLv2+CE) -# - Public Domain, per Creative Commons CC0 -# - SleepyCat -# - The GNU Lesser General Public License, version 2.0 with Classpath Exception -# - The GNU Lesser General Public License, version 2.1 -# - The GNU Lesser General Public License, version 3.0 -# - The MIT License -# - provided without support or warranty -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Wed May 25 11:39:55 BST 2016 -com.iplanet.jato--jato--2005-05-04=CDDL -com.sleepycat--je--5.0.104=SleepyCat -com.sun.msv.datatype.xsd--xsdlib--20060615=CDDL -com.sun.web.ui--cc--2008-08-08=CDDL -com.sun.xml.bind--jaxb-libs--1.0.6=CDDL -com.sun.xml.bind--jaxb1-impl--2.0.2=CDDL -com.sun.xml.rpc--jaxrpc-spi--1.1.3_01=CDDL -external--esapiport--2013-12-04=BSD -external--jaxrpc-impl--1.1.3_01-041406=CDDL -external--jdmkrt--2007-01-10=CDDL -isorelax--isorelax--20030108=MIT -javax.servlet--jstl--1.1.2=Apache 2.0 -javax.xml--jaxrpc-api--1.1=CDDL -javax.xml.parsers--jaxp-api--1.4.2=CDDL -relaxngDatatype--relaxngDatatype--20020414=BSD diff --git a/openam-distribution/openam-distribution-fedlet-unconfigured/README b/openam-distribution/openam-distribution-fedlet-unconfigured/README deleted file mode 100644 index c86d90ff6d..0000000000 --- a/openam-distribution/openam-distribution-fedlet-unconfigured/README +++ /dev/null @@ -1,2 +0,0 @@ -OpenAM - diff --git a/openam-distribution/openam-distribution-fedlet-unconfigured/pom.xml b/openam-distribution/openam-distribution-fedlet-unconfigured/pom.xml index 7920b0c28b..bc463c0df0 100755 --- a/openam-distribution/openam-distribution-fedlet-unconfigured/pom.xml +++ b/openam-distribution/openam-distribution-fedlet-unconfigured/pom.xml @@ -13,41 +13,44 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-distribution - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - - Wren:AM - Distribution Fedlet UnConfigured - Wren:AM Distribution Fedlet UnConfigured openam-distribution-fedlet-unconfigured pom - + Wren:AM - Distribution Fedlet UnConfigured + Wren:AM Distribution Fedlet UnConfigured + Fedlet-${project.version} + org.apache.maven.plugins maven-assembly-plugin + fedlet-assembly package + single + false gnu + src/main/assembly/openAMFedlet_ZIP_Assembly_Descriptor.xml @@ -60,10 +63,10 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-fedlet-unconfigured-war + ${project.version} war - diff --git a/openam-distribution/openam-distribution-fedlet-unconfigured/src/main/assembly/openAMFedlet_ZIP_Assembly_Descriptor.xml b/openam-distribution/openam-distribution-fedlet-unconfigured/src/main/assembly/openAMFedlet_ZIP_Assembly_Descriptor.xml index 92139f6008..0b647b800a 100644 --- a/openam-distribution/openam-distribution-fedlet-unconfigured/src/main/assembly/openAMFedlet_ZIP_Assembly_Descriptor.xml +++ b/openam-distribution/openam-distribution-fedlet-unconfigured/src/main/assembly/openAMFedlet_ZIP_Assembly_Descriptor.xml @@ -35,7 +35,7 @@ - org.forgerock.openam:openam-fedlet-unconfigured-war:war + org.wrensecurity.wrenam:openam-fedlet-unconfigured-war:war fedlet.war false @@ -60,4 +60,3 @@ - diff --git a/openam-distribution/openam-distribution-kit/pom.xml b/openam-distribution/openam-distribution-kit/pom.xml index a95bc46a0a..acdebf8e0a 100755 --- a/openam-distribution/openam-distribution-kit/pom.xml +++ b/openam-distribution/openam-distribution-kit/pom.xml @@ -14,69 +14,42 @@ * * Copyright 2011-2016 ForgeRock AS. * Portions Copyrighted 2016 Agile Digital Engineering - * Portions Copyright 2018 Wren Security. + * Portions Copyright 2018-2023 Wren Security. --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-distribution - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - - Wren:AM - Distribution Kit - Wren:AM Distribution Kit, containing all distributable artifacts. openam-distribution-kit pom - + Wren:AM - Distribution Kit + Wren:AM Distribution Kit, containing all distributable artifacts. + - - - org.apache.maven.plugins - maven-dependency-plugin - - - Copy license - prepare-package - - copy - - - - - ${forgerock.license.groupId} - ${forgerock.license.artifactId} - ${forgerock.license.version} - txt - true - ${project.build.directory}/legal-notices - license.txt - - - - - - - org.apache.maven.plugins maven-assembly-plugin - admintools-assembly + kit-assembly package + single + WrenAM-${project.version} false gnu + src/main/assembly/openAM_KitAssembly_Descriptor.xml @@ -84,95 +57,77 @@ - - - - org.apache.maven.plugins - maven-antrun-plugin - - - post-packaging - package - - - - - - - - - - - - - - - - - - - - - run - - - - - - org.forgerock.openam + org.wrensecurity.wrenam openam-server + ${project.version} war + - org.forgerock.openam + org.wrensecurity.wrenam openam-server-only + ${project.version} war + - org.forgerock.openam + org.wrensecurity.wrenam openam-clientsdk - jar + ${project.version} + - org.forgerock.openam + org.wrensecurity.wrenam openam-distribution-fedlet-unconfigured + ${project.version} zip + - org.forgerock.openam + org.wrensecurity.wrenam openam-distribution-ssoadmintools + ${project.version} zip + - org.forgerock.openam + org.wrensecurity.wrenam openam-example-clientsdk-cli + ${project.version} zip + - org.forgerock.openam + org.wrensecurity.wrenam openam-example-clientsdk-war + ${project.version} war + - org.forgerock.openam + org.wrensecurity.wrenam openam-idpdiscovery-war + ${project.version} war + - org.forgerock.openam + org.wrensecurity.wrenam openam-distribution-ssoconfiguratortools + ${project.version} zip + - org.forgerock.openam + org.wrensecurity.wrenam openam-soap-sts-server + ${project.version} war - diff --git a/openam-distribution/openam-distribution-kit/src/main/assembly/openAM_KitAssembly_Descriptor.xml b/openam-distribution/openam-distribution-kit/src/main/assembly/openAM_KitAssembly_Descriptor.xml index 243e459926..1d535b0629 100644 --- a/openam-distribution/openam-distribution-kit/src/main/assembly/openAM_KitAssembly_Descriptor.xml +++ b/openam-distribution/openam-distribution-kit/src/main/assembly/openAM_KitAssembly_Descriptor.xml @@ -40,39 +40,27 @@ ${artifact.build.finalName}.${artifact.extension} - org.forgerock.openam:openam-server:war - org.forgerock.openam:openam-clientsdk:jar - org.forgerock.openam:openam-distauth:war - org.forgerock.openam:openam-example-clientsdk-cli:zip - org.forgerock.openam:openam-example-clientsdk-war:war - org.forgerock.openam:openam-distribution-fedlet-unconfigured:zip - org.forgerock.openam:openam-distribution-ssoadmintools:zip - org.forgerock.openam:openam-distribution-ssoconfiguratortools:zip - org.forgerock.openam:openam-idpdiscovery-war:war - org.forgerock.openam:openam-soap-sts-server:war + org.wrensecurity.wrenam:openam-server:war + org.wrensecurity.wrenam:openam-clientsdk:jar + org.wrensecurity.wrenam:openam-distauth:war + org.wrensecurity.wrenam:openam-example-clientsdk-cli:zip + org.wrensecurity.wrenam:openam-example-clientsdk-war:war + org.wrensecurity.wrenam:openam-distribution-fedlet-unconfigured:zip + org.wrensecurity.wrenam:openam-distribution-ssoadmintools:zip + org.wrensecurity.wrenam:openam-distribution-ssoconfiguratortools:zip + org.wrensecurity.wrenam:openam-idpdiscovery-war:war + org.wrensecurity.wrenam:openam-soap-sts-server:war legal-notices - ${project.build.directory}/legal-notices - - license.txt - - - - legal-notices - ../../legal - - - legal-notices - ../../license + ../../legal-notices ldif ../../openam-federation/OpenFM/src/main/ldif - diff --git a/openam-distribution/openam-distribution-ssoadmintools/README b/openam-distribution/openam-distribution-ssoadmintools/README deleted file mode 100644 index c86d90ff6d..0000000000 --- a/openam-distribution/openam-distribution-ssoadmintools/README +++ /dev/null @@ -1,2 +0,0 @@ -OpenAM - diff --git a/openam-distribution/openam-distribution-ssoadmintools/pom.xml b/openam-distribution/openam-distribution-ssoadmintools/pom.xml index 75e28e3065..b363c68a49 100755 --- a/openam-distribution/openam-distribution-ssoadmintools/pom.xml +++ b/openam-distribution/openam-distribution-ssoadmintools/pom.xml @@ -13,24 +13,23 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyright 2018-2022 Wren Security + * Portions Copyright 2018-2023 Wren Security --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-distribution - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - - Wren:AM - Distribution SSO Admin Tools - Wren:AM Distribution SSO Admin Tools Kit. - openam-distribution-ssoadmintools pom + + Wren:AM - Distribution SSO Admin Tools + Wren:AM Distribution SSO Admin Tools Kit. + opendj-server,forgerock-util,json,xmlsec,openam-core, @@ -40,47 +39,27 @@ slf4j-api,slf4j-nop,opendj-core,opendj-grizzly,i18n-core,openam-ldap-utils,grizzly-framework, forgerock-audit-core,openam-audit-configuration,i18n-slf4j, opendj-server-legacy,opendj-config,opendj-cli,chf-http-core,joda-time, - jackson-core,jackson-databind,jackson-annotations + jackson-core,jackson-databind,jackson-annotations,jaxb-api - - SSOAdminTools-${project.version} + - org.apache.maven.plugins maven-dependency-plugin - 2.10 + - - Copy license - prepare-package - - copy - - - - - ${forgerock.license.groupId} - ${forgerock.license.artifactId} - ${forgerock.license.version} - txt - true - ${project.build.directory}/legal-notices - license.txt - - - - Copy JARs prepare-package + copy-dependencies + ${project.build.directory}/lib false @@ -89,12 +68,15 @@ ${forgerock.license.artifactId},openam-rest,openam-installtools,openam-slf4j + Unix setup classpath prepare-package + build-classpath + / : @@ -103,12 +85,15 @@ unix.setup.classpath + Windows setup classpath prepare-package + build-classpath + \ ; @@ -124,13 +109,14 @@ org.apache.maven.plugins maven-antrun-plugin + zip-pre-packaging compile + - @@ -143,8 +129,8 @@ - - + + @@ -154,6 +140,7 @@ + run @@ -168,15 +155,19 @@ admintools-assembly package + single + false gnu + src/main/assembly/openAMToolsAssembly_Descriptor.xml + \ @@ -187,62 +178,71 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-entitlements - org.forgerock.openam + org.wrensecurity.wrenam openam-installtools + ${project.version} - org.forgerock.openam + org.wrensecurity.wrenam openam-core - org.forgerock.openam + org.wrensecurity.wrenam openam-cli-definitions + ${project.version} - org.forgerock.openam + org.wrensecurity.wrenam openam-cli-impl + ${project.version} - org.forgerock.openam + org.wrensecurity.wrenam openam-federation-library + ${project.version} - org.forgerock.openam + org.wrensecurity.wrenam OpenFM + ${project.version} - org.forgerock.openam + org.wrensecurity.wrenam openam-dtd-schema + ${project.version} - org.forgerock.openam + org.wrensecurity.wrenam openam-jaxrpc-schema + ${project.version} - org.forgerock.openam + org.wrensecurity.wrenam openam-saml2-schema + ${project.version} - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-scripted + ${project.version} - org.forgerock.openam + org.wrensecurity.wrenam openam-scripting @@ -253,8 +253,9 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-license-manager-cli + ${project.version} @@ -278,8 +279,9 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-slf4j + ${project.version} runtime @@ -299,8 +301,9 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-auth-fr-oath + ${project.version} diff --git a/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml b/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml index db7d888138..4a1468ca48 100644 --- a/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml +++ b/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml @@ -38,29 +38,29 @@ ${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} lib - org.forgerock.openam:openam-shared - org.forgerock.openam:openam-core - org.forgerock.openam:openam-cli-definitions - org.forgerock.openam:openam-cli-impl - org.forgerock.openam:openam-entitlements - org.forgerock.openam:openam-federation-library - org.forgerock.openam:OpenFM - org.forgerock.openam:openam-dtd-schema - org.forgerock.openam:openam-jaxrpc-schema - org.forgerock.openam:openam-idsvcs-schema - org.forgerock.openam:openam-liberty-schema - org.forgerock.openam:openam-saml2-schema - org.forgerock.openam:openam-xacml3-schema - org.forgerock.openam:openam-wsfederation-schema + org.wrensecurity.wrenam:openam-shared + org.wrensecurity.wrenam:openam-core + org.wrensecurity.wrenam:openam-cli-definitions + org.wrensecurity.wrenam:openam-cli-impl + org.wrensecurity.wrenam:openam-entitlements + org.wrensecurity.wrenam:openam-federation-library + org.wrensecurity.wrenam:OpenFM + org.wrensecurity.wrenam:openam-dtd-schema + org.wrensecurity.wrenam:openam-jaxrpc-schema + org.wrensecurity.wrenam:openam-idsvcs-schema + org.wrensecurity.wrenam:openam-liberty-schema + org.wrensecurity.wrenam:openam-saml2-schema + org.wrensecurity.wrenam:openam-xacml3-schema + org.wrensecurity.wrenam:openam-wsfederation-schema org.forgerock.opendj:opendj-server org.forgerock.commons:forgerock-util - org.forgerock.openam:openam-license-manager-cli + org.wrensecurity.wrenam:openam-license-manager-cli org.forgerock.commons:forgerock-guice-core - org.forgerock.openam:openam-license-core - org.forgerock.openam:openam-auth-scripted - org.forgerock.openam:openam-scripting - org.forgerock.openam:openam-ldap-utils - org.forgerock.openam:openam-audit-context + org.wrensecurity.wrenam:openam-license-core + org.wrensecurity.wrenam:openam-auth-scripted + org.wrensecurity.wrenam:openam-scripting + org.wrensecurity.wrenam:openam-ldap-utils + org.wrensecurity.wrenam:openam-audit-context org.forgerock.commons:json-resource javax.inject:javax.inject com.google.inject:guice:jar:no_aop @@ -92,7 +92,7 @@ org.wrensecurity.commons:i18n-core org.forgerock.commons:forgerock-audit-core org.glassfish.grizzly:grizzly-framework - org.forgerock.openam:openam-auth-fr-oath + org.wrensecurity.wrenam:openam-auth-fr-oath @@ -112,14 +112,7 @@ legal-notices - ${project.build.directory}/legal-notices - - license.txt - - - - legal-notices - ${project.basedir}/../../license + ${project.basedir}/../../legal-notices **/** @@ -257,4 +250,3 @@ - diff --git a/openam-distribution/openam-distribution-ssoconfiguratortools/pom.xml b/openam-distribution/openam-distribution-ssoconfiguratortools/pom.xml index 8983bd9627..fa727bd183 100755 --- a/openam-distribution/openam-distribution-ssoconfiguratortools/pom.xml +++ b/openam-distribution/openam-distribution-ssoconfiguratortools/pom.xml @@ -13,56 +13,27 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2017 ForgeRock AS. - * Portions Copyright 2018 Wren Security + * Portions Copyright 2018-2023 Wren Security --> 4.0.0 - - org.forgerock.openam + org.wrensecurity.wrenam openam-distribution - 14.0.0-SNAPSHOT + 15.0.0-SNAPSHOT - - Wren:AM - Distribution SSO Configurator Tools - Wren:AM Distribution SSO Configurator Tools Kit. openam-distribution-ssoconfiguratortools pom - + Wren:AM - Distribution SSO Configurator Tools + Wren:AM Distribution SSO Configurator Tools Kit. + SSOConfiguratorTools-${project.version} - - - - org.apache.maven.plugins - maven-dependency-plugin - - - Copy license - prepare-package - - copy - - - - - ${forgerock.license.groupId} - ${forgerock.license.artifactId} - ${forgerock.license.version} - txt - true - ${project.build.directory}/legal-notices - license.txt - - - - - - + org.apache.maven.plugins maven-assembly-plugin @@ -70,15 +41,19 @@ openam-ssoconfiguratortools package + single + false gnu + src/main/assembly/openAMToolsAssembly_Descriptor.xml + \ @@ -89,17 +64,21 @@ - org.forgerock.openam + org.wrensecurity.wrenam openam-configurator-tool + ${project.version} + org.slf4j slf4j-nop runtime + - org.forgerock.openam + org.wrensecurity.wrenam openam-upgrade-tool + ${project.version} diff --git a/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml b/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml index 5f512c2b56..2a80bbfc07 100644 --- a/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml +++ b/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml @@ -3,6 +3,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2012-2017 ForgeRock AS. All Rights Reserved +* Portions Copyright 2023 Wren Security * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -23,56 +24,53 @@ * "Portions Copyrighted [year] [name of copyright owner]" * --> - + openam-ssoConfiguratorTools + zip + false ${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} lib + com.google.inject:guice:jar:no_aop - org.forgerock.commons:forgerock-guice-core - org.forgerock.openam:openam-license-manager-cli + org.wrensecurity.commons:wrensec-guice-core + org.wrensecurity.wrenam:openam-license-manager-cli org.apache.servicemix.bundles:org.apache.servicemix.bundles.javax-inject org.slf4j:slf4j-api org.slf4j:slf4j-nop commons-lang:commons-lang - org.forgerock.openam:openam-tools - org.forgerock.openam:openam-license-core - org.forgerock.openam:openam-installer-utils + org.wrensecurity.wrenam:openam-license-core + org.wrensecurity.wrenam:openam-installer-utils + + - org.forgerock.openam:openam-configurator-tool - org.forgerock.openam:openam-upgrade-tool + org.wrensecurity.wrenam:openam-configurator-tool + org.wrensecurity.wrenam:openam-upgrade-tool + legal-notices - ${project.build.directory}/legal-notices + ${project.basedir}/../../legal-notices license.txt - - legal-notices - ${project.basedir}/../../license - - **/** - - + ${basedir}/src/main/assembly/config @@ -80,4 +78,3 @@ - diff --git a/openam-distribution/pom.xml b/openam-distribution/pom.xml index c654c41877..2936393a13 100755 --- a/openam-distribution/pom.xml +++ b/openam-distribution/pom.xml @@ -20,9 +20,9 @@ - org.forgerock.openam - openam - 14.0.0-SNAPSHOT + org.wrensecurity.wrenam + wrenam-project + 15.0.0-SNAPSHOT @@ -39,4 +39,3 @@ openam-distribution-kit - diff --git a/openam-documentation/README.md b/openam-documentation/README.md deleted file mode 100644 index f16c7dd002..0000000000 --- a/openam-documentation/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Hand-written OpenAM project documentation has moved to -. - -These modules are for generating documentation sources from OpenAM code. diff --git a/openam-documentation/openam-doc-log-message-ref/pom.xml b/openam-documentation/openam-doc-log-message-ref/pom.xml deleted file mode 100644 index 9897a70238..0000000000 --- a/openam-documentation/openam-doc-log-message-ref/pom.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - 4.0.0 - - - org.forgerock.openam - openam-documentation - 14.0.0-SNAPSHOT - - - Wren:AM - Log Message Reference - openam-doc-log-message-ref - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - - org.codehaus.mojo - xml-maven-plugin - - - compile - - transform - - - - - ../.. - - - openam-schema/openam-dtd-schema/src/main/resources/com/sun/identity/log/messageid/AuthenticationLogMessageIDs.xml - openam-schema/openam-dtd-schema/src/main/resources/com/sun/identity/log/messageid/CLILogMessageIDs.xml - openam-schema/openam-dtd-schema/src/main/resources/com/sun/identity/log/messageid/ConsoleLogMessageIDs.xml - openam-schema/openam-dtd-schema/src/main/resources/com/sun/identity/log/messageid/CoreTokenLogMessageIDs.xml - openam-schema/openam-dtd-schema/src/main/resources/com/sun/identity/log/messageid/EntitlementLogMessageIDs.xml - openam-schema/openam-dtd-schema/src/main/resources/com/sun/identity/log/messageid/LoggingLogMessageIDs.xml - openam-schema/openam-dtd-schema/src/main/resources/com/sun/identity/log/messageid/OAuth2ProviderLogMessageIDs.xml - openam-schema/openam-dtd-schema/src/main/resources/com/sun/identity/log/messageid/PolicyLogMessageIDs.xml - openam-schema/openam-dtd-schema/src/main/resources/com/sun/identity/log/messageid/RestLogMessageIDs.xml - openam-schema/openam-dtd-schema/src/main/resources/com/sun/identity/log/messageid/SessionLogMessageIDs.xml - - - openam-federation/OpenFM/src/main/resources/com/sun/identity/log/messageid/COTLogMessageIDs.xml - openam-federation/OpenFM/src/main/resources/com/sun/identity/log/messageid/IDFFLogMessageIDs.xml - openam-federation/OpenFM/src/main/resources/com/sun/identity/log/messageid/LibertyLogMessageIDs.xml - openam-federation/OpenFM/src/main/resources/com/sun/identity/log/messageid/SAML2LogMessageIDs.xml - openam-federation/OpenFM/src/main/resources/com/sun/identity/log/messageid/SAMLLogMessageIDs.xml - openam-federation/OpenFM/src/main/resources/com/sun/identity/log/messageid/WebServicesSecurityLogMessageIDs.xml - openam-federation/OpenFM/src/main/resources/com/sun/identity/log/messageid/WSFederationLogMessageIDs.xml - - src/main/xslt/logs.xsl - - - omit-xml-declaration - yes - - - false - - - - src/main/xslt/catalog.xml - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - generate-log-message-ref - compile - false - - run - - - - -
- - - -