summaryrefslogtreecommitdiffstats
path: root/docs/submodules/sdc.git
AgeCommit message (Collapse)AuthorFilesLines
2020-04-30Update git submodulesBen David, Elad (eb7504)1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 31c64b3443fb1a76d1cfc7afc0db1e51f1ffda79 - HEAT to TOSCA VM Consolidation Change-Id: I00c9cf90d7486af33955acae7dfe653e14ceebdc Issue-ID: SDC-2997 Signed-off-by: Ben David, Elad (eb7504) <eb7504@intl.att.com>
2020-04-30Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8c5a1d6591d0faf2bdd0de528f42863ae1594c4f - Replace call to `get` with a call to `ifPresent` Issue-ID: SDC-2989 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I7fe273d869035f8852dbc398de60cc49dec2ce6e
2020-04-30Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 7dec12b47ec34baec6d31dac3f2961e90e721632 - Remove mockito from TypeUtilsTest - Remove the use of mockito verify from TypeUtilsTest Issue-ID: SDC-2993 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I42c9c972cead10afaa3ec299624cf3d26e4d04db
2020-04-30Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to d70091c786840042e7b56718115d1200410d9aed - Fix GAB ui test row and column count Change-Id: Ib9e4eb054cd23db9359b6d4db4ce079007c1e4e7 Issue-ID: SDC-2963 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-30Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 38ac58ba86b899f8d57c5e4b3d6b54a1092dc969 - Fix VFs and Service not visible in SDC Dashboard Change-Id: Ia42775388c3ad9539b7d0020476f0f7a91ce8bb9 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2938
2020-04-28Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 08cb42224a5d20783e525cadbab1b7ae40a86f72 - Handle null case in `GroupVersionUpdater` - change in the final condition of `isGenerateGroupUUID` - Added tests related to modified code Issue-ID: SDC-2913 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I22738f9f4922467209a16a4d6b3b78d7bfac11c9
2020-04-28Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 33a4512b6eb6204e2209a788b06153a889629f4e - Refactor CsarUtils::getEntryData Change-Id: I1732ae05cfbe93c1bef8c249e16088a0cad34106 Issue-ID: SDC-2812 Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
2020-04-28Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 76593bfbb1a233d76367abe903734c13b75f3a35 - Refactor CsarUtils::populateZip Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I136ebda0ff92d6c42368f102ccf2b10f37524808 Issue-ID: SDC-2812
2020-04-28Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 83df155640dd015d68f01f784dfab24d4c252af1 - Remove csvReportFilePath from ValidationConfigManager This commit aims to extract the csvReportFilePath field from ValidationConfigManager in order to improve testability. This commit contains multiple minor modifications resulting from bubbling up the csvReportFilePath static field to where it is actually set. Put differently, most of the modifications result from changing the signature of the functions which formerly relied on ValidationConfigManager.getCSVReportFilePath. Change-Id: I82c3b0fca8a0f407319e40ecfff45e89ec1d4323 Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Issue-ID: SDC-2499
2020-04-27Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 79ec04301a726e8c48f1275877cb852d2d74adc0 - Work around potential NullPointerExceptions in HeatTreeManagerUtil - Replace null return values with empty Map objects Issue-ID: SDC-2928 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I3357a8789a00201a7ffda1dbf0be5f08cbb9c33b
2020-04-27Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 4a4d45fadfbb61e8e147f2b62e5dab5ac55403e8 - Enabling JS in SonarCloud Configures jest test coverage and missing sonar properties for javascript file scan and report. Change-Id: I9170a176cc4e580ac14f669c334ee949942503f6 Issue-ID: SDC-2741 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-27Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to bebff57a6a661825d26a17813fe4a3230ac6f9db - Fix null pointer warning - Check name and value in method setToscaPresentationValue Issue-ID: SDC-2926 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I0d66b29c84139afff92065769bf1b79082959333
2020-04-27Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 3c80616437c89c14b3734a3876b48faafd2129e9 - Add null test to ComponentBusinessLogic - Added test in `getFilteredComponentInstanceProperties` for null value - Removed nested `if` statements in `isMatchingComplexPropertyByRecursively` Issue-ID: SDC-2907 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I13a47b0dfe7aa6dec845a856c58bba8be5c1eead
2020-04-26Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8ddc6c9609581167a35404289e5015097346fea9 - Update WORKFLOW Artifact Type configuration To add an operation with an existing Workflow in a RESOURCE, the Artifact Type WORKFLOW needs to support the extension "bpmn" and the component type "RESOURCE". Change-Id: Ic7eb9afe3ced0348f7aadcc43edf121a0bdcf015 Issue-ID: SDC-2954 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-26Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to c9e4d0ec9f9d3ac9f420c12573964e511baf8831 - Fix potential NPE in ArtifactsBusinessLogic Fixes potential NPE in ArtifactsBusinessLogic introduced by SDC-2754. Change-Id: If53915ffc41ddd0dbcf00ea318cdae6f1b5471ad Issue-ID: SDC-2959 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-23Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 3bb06374d5b6747d32ea9554259596d0a45fadc2 - Added early check for null value for `containerV` - Formatting code following project's code style - Added early check for null value for `containerV` Issue-ID: SDC-2905 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I648e9a4a04be3f2e7cd3e30a70c04de2257a99d3
2020-04-23Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to a994931dc349c93ba9b5c9bc7b517b9dd89a10cc - Minor cleanups for BasicAuthenticationFilter - Changed String representing encoding to Java's StandardCharsets.UTF_8 - Added explicit else condition in order to not rely on `abortWith`'s side effects Issue-ID: SDC-2917 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I81cb94c399ff1d810e85c7b63fde195928ab1b08
2020-04-23Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to c829bbcfc9505a3ebf6035b53274f8bf22c34cff - Add null tests - Change `isPropertiesListSizesNotEquals` to `isPropertiesListSizesEquals` - Added assertions to silence SonarCloud Issue-ID: SDC-2914 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I88003de54aea6c28575fecf0f41b4c5ef36ef154
2020-04-23Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8def03ae0703c3629fcb5ac023fbe9a1eaead4b7 - Fix null pointer exception warnings Issue-ID: SDC-2911 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Ic7f0ef631ed98e8baf2ea32b6bfc56a7142738f8
2020-04-23Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to cda9d2a5fa771830fa493bd3885178a4e4987c8c - Handle null condition in TopologyTemplateOperation - check if instanceId null in method isNotEmptyMapOfProperties Issue-ID: SDC-2920 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I70667142ed51834de638903ccae4ffcb896cccab
2020-04-22Update git submodulesBaumel, Dvir (db384r)1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to ef3165222d153feec6168a0544d75951c982dcad - Fix unit tests not running Change-Id: I06462b6180a1f1a310aae994f4e703a498f80247 Issue-ID: SDC-2933 Signed-off-by: Baumel, Dvir (db384r) <dvir.baumel@intl.att.com>
2020-04-22Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 333e6b47fcd6df91136ae1efa7eecca50bc50a04 - Used `configurationManager` instead of `getConfigurationManager` Issue-ID: SDC-2890 Change-Id: I1559ebc60076bd0884ae1136c9c904f7ab46e72e Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
2020-04-22Update git submodulesReo Inoue1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 27d169b34e81a9d42eaa0b7aab3797227a379f30 - Fix bug for class SwitchoverDetector Signed-off-by: Reo Inoue <inoue.reo@jp.fujitsu.com> Issue-ID: SDC-2931 Change-Id: I6b40f538ff9ce7eed22ce71c542b188a8c866f26
2020-04-22Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 60c01004daf199820825f9bf345a3ed8a96f8933 - Add null test to DistributionMonitoringBusinessLogic - Added test in `handleAuditingDaoResponse` for null value related to `resAuditingGenericEvent` Issue-ID: SDC-2909 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I422629cdbd4f05e10609cd78b7328c4e9f45538b
2020-04-22Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8a5065a44e64cd9eabbb2c16d262eb88be3d0c43 - Handle null condition in ResourceImportManager - check if parentResource null in methods setRequirements and setCapabilities Issue-ID: SDC-2912 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I1ea5a8cf26e3883b5d26fb970bc0abc4cbf1ee9a
2020-04-22Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 80a4b4a14a63509990bdbcb960538d30ae22a6e5 - Add null test in ArtifactsOperations - Added if statement in `updateArtifactOnGraph` to account for the case where variable `artifactInst` has not been properly initialized Issue-ID: SDC-2919 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I73fe3b3bcef59e5797a0f7cfe7b6894816d0d3fb
2020-04-22Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to c39f8ff9e9436d974f9d0021be04b0a925d6745d - Minor cleanups for JanusGraphDao - Fixed typo in a call to `logger.debug` - Modified if statement following recommendation from SonarCloud Issue-ID: SDC-2918 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I75d50d74703bf7c706b84723bb5d43760b8b7baf
2020-04-22Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to c78692e297c0127474d2af000f22316638991c1e - Add null test to test in `UpgradeBusinessLogic` Issue-ID: SDC-2915 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I4e6f27b707b1bdbbecf9a97606c9a655d834fe56
2020-04-22Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to c0e480a15a31efb9c0eaedd8d2033c363ccc8db9 - Add null tests in `createComponentExternal` Issue-ID: SDC-2916 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: Ieb0a79c8d3a891a08cd758e1a4ebab7679166476
2020-04-22Update git submodulesOfir Sonsino1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 4873d824e7b3fdb3d2e96e348822383efcdd3f7d - INFO.yaml update Change-Id: Ie410001eae688aa9d0c579f35eb57eeebfe9ae08 Issue-ID: SDC-2934 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2020-04-21Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 161b1a27cb2205d4b8e37b332a59ad5a417c0a1f - Fix catalog-ui dev proxy calls to uicache Fixes webpack dev server proxy to uicache removed in SDC-2843, Change Id: I9a6c89e45ea425eb9abf827906562e14a39cf1ff. Change-Id: I83aa842df4c7bf3d140216c93b48eb1cfec48656 Issue-ID: SDC-2944 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-21Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to ac26dc0d5c5f7fce65e214c31e26e7178e492d5b - Fix 404 in sdc-FE calls to workflow Fixes webpack workflow proxy configuration. Fixes FE proxy while rewriting URLs to workflow plugin. Fixes compilation problems to run locally the catalog-ui. Change-Id: I89f3f46bd8ce0159713b1d0d957a2e75f8a3d062 Issue-ID: SDC-2943 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-21Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 1b89157b86d89726e294f22416da965a095a2210 - Fix catalog-fe plugin online checking ESAPI encoder cannot be loaded due to a missing ESAPI.properties file in path, which causes an exception and breaks the online checking call. The plugin is always shown as offline. Change-Id: I05088d200e9a1bea1de2e00c07d5bbf6e3a67d41 Issue-ID: SDC-2945 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-20Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to c0b8bd2503b08f157f853683dbc993dc12603d09 - Remove props from ValidationConfigManager Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I1c3a845c44722010e8933876e59752cef00937f0 Issue-ID: SDC-2499
2020-04-20Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to e45d69b7da15226f88a8821a0d5ef55757e4a98a - Fix cs-init SchemaFileImport error file creation Fix issue in SdcSchemaFileImport "STDERR: Error in file creation : data, /tmp/sdctool/tosca/data-types/data.yml (No such file or directory)", during the cassandra init. Introduced by SDC-2898. Change-Id: Ifd2018fac456f15d03fc39ea766a6ae0c3eda081 Issue-ID: SDC-2939 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-20Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 3d10111e093b5498e6da654a04016d9ecb9a7281 - Fix GAB problem in ui-ci tests Generic Artifact Browser is failing in tests due to an assertion problem. Change-Id: Ib398d04f0a876ae7d531af14e129f0dc6838dd52 Issue-ID: SDC-2903 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-20Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to a0c6e45f2085ba1f26573f5823d37b55268a1191 - Added a try-with-resource to properly close a FileInputStream Issue-ID: SDC-2898 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I0a0163937ee2e760f3074d858dfc68a7b262ecd9
2020-04-20Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 659556d07ad5b928cb0032f040dc86fcb11944c8 - Added early check for null value for `containerV` - Formatting code following project's code style - Added early check for null value for `containerV` Issue-ID: SDC-2904 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: Ib8d7c1bf36608855c73d8a0df637e86aefce9377
2020-04-20Update git submodulesaribeiro1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8429c539b48ce851f98e086f5a722c13ebcdc151 - Fix Tosca properties declaration Remove duplicated entries Default value for Boolean type should not be a String According to the description for the keyname 'attachments:' it should be of type List rather than String Issue-ID: SDC-2870 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Iac2b4f89dac16a6aef9dcabea74def5cacff99a6
2020-04-19Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 615de28561aeb843e4fc18a1859b68a8164b17a4 - Validates artifact configuration Validates if all the SDC base artifacts are configured. The base artifacts are provided by the ArtifactTypeEnum. Change-Id: Iffa38d6ba276014940afad71f7472bc8d730fcf8 Issue-ID: SDC-2929 Signed-off-by: andre.schmid <andre.schmid@est.tech> - Configure a new Artifact Type Centralizes artifact configuration in one yaml entry. Allow the configuration of a new artifact type without the need of code changes. The configuration file now is used as a source of artifacts types instead the artifact type enum. The enum will be used as a source of base artifact types and also in hard coded business rules. Change-Id: Id0383d9fca9bce0519a4d52a4ecb3a68c8713f0f Issue-ID: SDC-2754 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-19Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to dc56692a4a307f378c827f017d2efbf754c223e0 - Max boundary check for instances relationships Considering the max boundary of a requirement during a component composition, allowing the correct number of the requirement relationships between instances. Change-Id: I82a1a6daeda8fadcf1c232b117d5b099db7b35d7 Issue-ID: SDC-2872 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-19Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 781e0930c17e5ae8fba643195abff5f4fc1cc6b8 - Fix non appearance VFCs on the Home tab Change-Id: I1543da25b76adbe426726444bd855393267fabe5 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2868
2020-04-19Update git submodulesDivyang Patel1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to b4daf8921090f3495b5f82b5cf16480f9de71496 - Added ui-ci test case for checking if hidden categories are not visible (USECASE: 3rd Party Operational Domain Manager) Issue-ID: SDC-2879 Signed-off-by: Divyang Patel <divyang.patel@team.telstra.com> Change-Id: Ic64b7de0f6ee70aef279ce13c3d2e18c194c6789
2020-04-19Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 1491bd0d20906819481c8d334e5d4d1639fadb8c - Simplified thread-safety for the `getGson` method Issue-ID: SDC-2900 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I8c687bb408a5e0b1e95316bdae6d53126bc82696
2020-04-19Update git submodulesSebastien Premont-Tendland1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to c36523ba9887990b8a785266fd5d688e4888d67d - Unable to update VSP (heat template) version in VF This seems to fix the issue, we can still onboard CBA at VF level and the CBA get included in the distributed CSAR under the directory Artifacts/*/Deployment/CONTROLLER_BLUEPRINT_ARCHIVE/ as expected Issue-ID: SDC-2892 Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca> Change-Id: Ie9f9cd7b8d2cf5eb3ff3c41a4b04eedd788265a6
2020-04-19Update git submodulesNeil Derraugh1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 28f3de6c698075c2282493309722c8c29e95b523 - ZipSlip test fails on Mac OS Mac OS has a symlink in the tmp dir that gets created in the test for ZipSlip. Using real paths prevents the test test from failing by using actual paths instead of a potentially different symlinked path to the canonical path. Issue-ID: SDC-2887 Signed-off-by: neil.derraugh <neil.derraugh@yoppworks.com> Change-Id: Iafb0a84f6ab68276c5782c1ef716c59435aa72f5
2020-04-19Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to d510e7838cace2c343d9ce5430a75455c3a846c8 - Removed explicit references to exceptions in log messages Issue-ID: SDC-2884 Change-Id: I6f3e9503922cc3a4f4049fced8d23cede7b0455a Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
2020-04-19Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to b191a68ff7702247962fd3a1f222496c300ff10b - Fix GAB problem in ui-ci tests Generic Artifact Browser is failing in tests due mainly to a removal of the default constructor in GAB class. Change-Id: Id10b8d8d81c224e2658002b9c928e8aef7ca8e32 Issue-ID: SDC-2903 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-16Update git submodulesk.kedron1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to bb8a61b60e9b80b1dd1e137533c48fb569b89f9a - Improved UX in the distribution component Added new logic to expand currently open tab, after clicking the refresh button. Issue-ID: SDC-2886 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: Ib9d1c7cbf2ca2dd9df22f7f74ffda64144c06047
2020-04-16Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 56031c95f53813bfbcfd9f08738644ab59cbfbb5 - Add IntelliJ IDE files to .gitignore, remove duplications Change-Id: I1f4934dfb8df0c485a5ecbb6e19efd0563f61520 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2895