summaryrefslogtreecommitdiffstats
path: root/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest
AgeCommit message (Collapse)AuthorFilesLines
2022-05-27Step version to 1.11.4-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4008 Change-Id: I0570cc896a88c988d5b9cbf45b11f9648a88a932
2022-05-18Step version to 1.11.3-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3980 Change-Id: Ib1a7cae9f32c347c97157020e58188d802fd6068
2022-04-25Step version to 1.11.2-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3959 Change-Id: I684a792fa6cd7357da6754baa9edd1d723ecc08d
2022-04-08Step version to 1.11.1-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3951 Change-Id: Ifee66e777462161952765dcbb84c3a8fb1634cd2
2022-03-23Step version to 1.11.0-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3909 Change-Id: I6d20e041b68afdc7ed6ffb900dcb372c1e600ee8
2022-03-22Step version to 1.10.3-SNAPSHOT1.10.3MichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3909 Change-Id: I7bb06e974320433d9f423be6f099d7811982eac0
2022-02-09Step version to 1.10.2-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3868 Change-Id: I8dc7701d6290bc95cf4ec90dae8653722a5c453f
2022-02-02Step version to 1.10.1-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3868 Change-Id: Ie6509f8b0d2fa0e67a78295d3b49689bc2931b8b
2021-10-01Step version for JakartaMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3738 Change-Id: Id008db63021d07278bd17a6603d992a905237e41
2021-09-20Updated SDC version to 1.9.2-SNAPSHOT1.9.2MichaelMorris3-3/+3
Updated to release bug fixes on 1.9.1 for I release Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3694 Change-Id: Ifda88730a17f2ecabab0ac29128aaa23618bc4f8
2021-09-13Update SDC version to 1.9.1-SNAPSHOT1.9.1MichaelMorris3-3/+3
Update version for M4 for I release Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3694 Change-Id: Ib7ea2917e57496ebd89a27693de60d4ea1aedc70
2021-07-28Upgrade springframework to latest version (5.3.8)vasraz1-0/+10
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I5611f4f275f7a81a7f1b65fde36b2c84894f4619 Issue-ID: SDC-3648
2021-03-29Improve test coveragevasraz4-356/+0
Fix test directory structure Change-Id: Iabd6c06424f1a58bd311da4b071853a05e2816f1 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3428
2021-03-25Improve test coveragevasraz4-132/+108
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I88e5bf627510b72322d061df5d34bc3600c47eb5 Issue-ID: SDC-3428
2021-03-24Improve test coveragexuegao1-1/+9
Add unit tests to improve test coverage. Issue-ID: SDC-3428 Change-Id: I29a8f1d49f1dfd6bca79f3d873d1e1ff7adc4fb2 Signed-off-by: xuegao <xue.gao@intl.att.com>
2021-03-24Reformat openecomp-bevasraz10-285/+270
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3449 Change-Id: I13e02322f8e00820cc5a1d85752caaeda9bf10d1
2021-03-22Update Master to IstambulChrisC3-3/+3
Set version 1.9.0 to ensure no clash of dockers when H branch stage jobs are going to produce stage dockers Issue-ID: SDC-3527 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: I008a90101d89bbd50fae98cc7ce5caae1958059b
2021-03-19Publish swagger files for SDC APIsMichaelMorris1-2/+3
I have created a swagger file for each of the APIs as they are currently listed on the architecture page. Some of the files can be easily be combined if some of the APIs are combined. I have created a single file for SDCE-2 and SDCE-5 as it is not possible to seperate as they are both paritially implemented in the same class with overlapping paths I have copied the generated swagger files to the docs directory as I suspect they need to be under source control for the generation of the readthedocs page Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3525 Change-Id: Id42412704311a573e3ebf911ad34d909c1c3f1b2
2021-03-17Update SDC versionChrisC3-3/+3
Prepare for RC1 build for H release Issue-ID: SDC-3479 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: I91ce37170a98d17b71cd30ff9a43ec5fe63b8cad
2021-03-04Update to 1.8.31.8.3ChrisC3-3/+3
Update Version to prepare for release Issue-ID: SDC-3464 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: Ie23d18d3124ec8cf8edb77a468538c8548a11375
2021-02-25Update version to 1.8.21.8.2ChrisC3-3/+3
Update SDC poms to 1.8.2 to prepare for release Issue-ID: SDC-3464 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: I4a82d521dc8ec80b65082a12a1bc43598ae37e25
2021-01-30Update project version 1.8.0 -> 1.8.11.8.1Joanna Jeremicz3-3/+3
Version updated due to minor feature, introduced recently: Trim inputs in Property assignment Issue-ID: SDC-3390 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>, ChrisC <christophe.closset@intl.att.com> Change-Id: I35c8d5228278ce29b4134e649aae0eb220fe63ab
2020-11-05Update master to HonoluluChrisC3-3/+3
Update pom to 1.8 so that staging images are created for H release Issue-ID: SDC-3349 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: Ied353406c6ff40a43e7176f0c5b42408d7f4dd56
2020-10-26Fix broken local build1.7.2vasraz3-3/+3
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3333 Change-Id: Ia246d909488517b037c01c9e0907d910b31e9db6
2020-10-20Upgrade to 1.7.2sebdet3-3/+3
Prepare for release 1.7.2 Issue-ID: SDC-3323 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ie36a6fd164eefd776cc90b0c5d9527993e87cc02
2020-09-16Remove jboss-rmisebdet1-0/+6
Remove the jboss-rmi from catalog-be, imported by CXF Issue-ID: SDC-3286 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ic17558c1b691ffae9ab670fa071405ac2a022f8f
2020-09-07Update version to 1.7.1sebdet3-3/+3
Update the pom to 1.7.1 so that we could deliver when we want Issue-ID: SDC-3274 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I1cea02ebe28cc7cbb03ea5dd3ced98953e32dfc1 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2020-05-06Prepare for Junit5vasraz2-73/+48
Remove unused/duplicated dependencies Change-Id: Iee0d9510ffbe3e2e14574e22ba965d6829fd568b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2844 Issue-ID: SDC-2983
2020-05-06Increase test coverage - openecomp-sdc-vendor-software-product-libvasraz20-737/+0
Change-Id: Id51ce6f488efd6db02aad479ff419b58436be27c Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3001
2020-05-06Increase test coverage - openecomp-sdc-tosca-generator-apivasraz6-306/+0
Change-Id: I1537d71b11ee440cb01bdee49350336f074ea36d Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3001
2020-05-03Increase test coverage - openecomp-sdc-model-libvasraz1-42/+0
Change-Id: I86e4935fd418bb01971f21ae32351be6044a2566 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3001
2020-03-12Disable SecurityFilterOfir Sonsino3-3/+3
Bumping version to 1.7.0 Change-Id: I041bb5ce967b687e10be97dbbaa3ba1d119d13ff Issue-ID: SDC-2825 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2020-02-02Move to version 1.6.1shrek20003-3/+3
Move SDC to version 1.6.1 Issue-ID: SDC-2755 Signed-off-by: shrek2000 <oren.kleks@amdocs.com> Change-Id: If5c55fdebb5bc2591190ee4389487f6dbb0e1831 Signed-off-by: shrek2000 <oren.kleks@amdocs.com>
2019-10-29Bump SDC version 1.6.0Ofir Sonsino3-3/+3
Change-Id: Ibacb46d19d49023a62caa8f5217086cea6c91ac4 Issue-ID: SDC-2560 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2019-09-10Bump SDC version 1.5.2Ofir Sonsino3-3/+3
Change-Id: Ib672dc8d60a0b6f4b37fd94afe84bc27dfba4c44 Issue-ID: SDC-2560 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2019-09-04openecomp-be code coverage increasePiotr Darosz8-0/+279
Add tests for classes in sdc.vendorsoftwareproduct.types.schemagenerator package Change-Id: Iabd22f88a5106c881ee687a4b57a62f59c0bc10e Issue-ID: SDC-2326 Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
2019-09-04openecomp-be code coverage increasePiotr Darosz5-0/+422
Add tests for classes in openecomp.core.model.types package Change-Id: I1c8044b2c8d422468dba610b2012e1cb34a75835 Issue-ID: SDC-2326 Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
2019-09-03Implement PNFD Model driven conversionandre.schmid1-0/+41
Change-Id: I7427e82353cac17817457294d78953f867d2d6e8 Issue-ID: SDC-2509 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2019-09-03openecomp-be code coverage increasePiotr Darosz6-0/+306
Add tests for classes in generator.datatypes.tosca package Change-Id: Ic21b4e05d15e881016fa5f25113625bc441924c9 Issue-ID: SDC-2326 Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
2019-09-03openecomp-be code coverage increasePiotr Darosz13-0/+491
Add tests for classes in vendorsoftwareproduct.types.composition package Change-Id: I2b05536a4fd80021bfedd2e7ff0f1747f6227935 Issue-ID: SDC-2326 Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
2019-08-29unit tests - openecomp-beTomasz Golabek5-0/+133
Additional junit tests for conflict-rest-types and vendor-license-rest-types Change-Id: I3e58d8a85f40e0f3a2e64c2b3195c97bb71a8fbd Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
2019-08-21increasing test coverage in openecomp-be apiBartosz Gardziejewski2-0/+158
Issue-ID: SDC-2326 Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> Change-Id: I93cc5183190fcbada2349b18f14fbec9c28f1ae5
2019-07-28Update SDC version 1.5.1Ofir Sonsino3-3/+3
Change-Id: Id2182099210982248584c1fcf4569a1360d82f1d Issue-ID: SDC-2478 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2019-07-23Migrate swagger to openapi v3Wojciech Sliwka1-20/+24
Issue-ID: SDC-2261 Change-Id: I614c15878b9d165a4468570e8318867632c88434 Signed-off-by: Wojciech Sliwka <wojciech.sliwka@nokia.com>
2019-07-11Added oparent to sdc mainTomasz Golabek10-0/+200
Removed errors regarding to a missing license and others. Started locally and executed basic api tests Change-Id: Iea37613defc97f7b40613d60c10990841cb2a209 Issue-ID: SDC-2419 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
2019-05-07Update SDC version 1.5.0Sonsino, Ofir (os0695)3-3/+3
Change-Id: I22d2273103230bd9ee7c3655b5f33e4308bb9f92 Issue-ID: SDC-1913 Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
2018-11-18Unit-test for mappers in conflict libraryvempo3-3/+101
Change-Id: I6136fa7491b34d9f3fb8df78a55b8d992e2d27fe Issue-ID: SDC-1917 Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
2018-11-15update sdc version in masterMichael Lando3-3/+3
update sdc version to 1.4.0 for master Change-Id: Ia3b16b397b6e01dc185549dd20be399ee67a791a Issue-ID: SDC-1913 Signed-off-by: Michael Lando <michael.lando@intl.att.com>
2018-11-05bump sdc version to 1.3.3Michael Lando3-3/+3
Change-Id: I703591a9985f9792649622b16f2a05aa89d1d8ea Issue-ID: SDC-1865 Signed-off-by: Michael Lando <michael.lando@intl.att.com>
2018-11-01update sdc to version 1.3.2Michael Lando3-3/+3
Change-Id: Ibd1a6a23f061c23e8bb0bb603f6ac315581564f6 Issue-ID: SDC-1865 Signed-off-by: Michael Lando <michael.lando@intl.att.com>