summaryrefslogtreecommitdiffstats
path: root/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest
AgeCommit message (Collapse)AuthorFilesLines
2023-09-22Update version to 1.13.5MichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4631 Change-Id: Ib1c16010517843e5b46cb96a0a77631b615952b5
2023-09-15Update version to 1.13.4MichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4624 Change-Id: Ia3b77d43de6602c98b0695843d7f05e48b239540
2023-07-14Update version to 1.13.31.13.3MichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4574 Change-Id: I2da7bb3d6a463222d187f4bc881e32751ed3252e
2023-07-10Step version to 1.13.2-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4552 Change-Id: I0e3e9a90d463bd5f18c683712eefbb7123a03c4a
2023-06-08Step version to 1.13.1-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4524 Change-Id: I52a902a5f7341ed67179fba9e0d4b2ee6d488458
2023-06-02Set version to 1.13.0-SNAPSHOTMichaelMorris3-3/+3
Previous commit mistakenly set version to 1.13.0 when should be SNAPSHOT Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4524 Change-Id: Ie89b5df595a513ccfd30f987acea56d845f58cbb
2023-06-02Step version to 1.13.0 for MontrealMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4524 Change-Id: I6840e63ff116ca0ee3296d5bac5377e3374ea6ea
2023-04-03Step version to 1.12.4-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4464 Change-Id: I260cab2bee303e3d022935dd2eb9f41b88e934cd
2023-03-02Step version to 1.12.3-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4417 Change-Id: I3f84b40fb0ac4aa868d958430496bd0a9c706ac5
2023-02-02Step version to 1.12.2-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4353 Change-Id: I6c600039f8354a3ba794512b0fd5e84d5a9dedca
2022-10-29Step version to 1.12.1MichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4238 Change-Id: I3797ce38210c4c2ecd00e4a6ab3d7fd846f97aa0
2022-09-29Stepping version to 1.12.0 for start of LondonMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4155 Change-Id: Ide5c76cbb332dbd03344fdb462e7feef91c9256e
2022-09-28Step version to 1.11.9-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4172 Change-Id: If2746847292bd769ef47c4628b5bafa7af2d69b9
2022-08-17Update SDC version to 1.11.8-SNAPSHOTMichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4111 Change-Id: I39b23ed9e56a889f1f4a9fa7029a4758c4c9ba47
2022-08-15Step version to 1.11.7-SNAPSHOT1.11.7MichaelMorris3-3/+3
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4111 Change-Id: I42a9a518dc05a4fd42619fbd471955ddacd62dc3
2022-06-24Step version to 1.11.6-SNAPSHOTandre.schmid3-3/+3
Change-Id: Ie3f800c418b32bbf05fc8f984bba7ea419583d03 Issue-ID: SDC-4064 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2022-06-24Step version to 1.11.5-SNAPSHOTandre.schmid3-3/+3
Change-Id: Iee1394298e6afddf30e98c8e07a4ddacef95d55f Issue-ID: SDC-4064 Signed-off-by: andre.schmid <andre.schmid@est.tech>
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>