summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-conflict-lib
AgeCommit message (Collapse)AuthorFilesLines
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-03-24Reformat openecomp-bevasraz14-516/+462
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-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-02-22Fix locally failing TCs in catalog-bevasraz1-7/+0
Migrate to Junit 5 TCs that extends JerseyTest Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I4c81e70836ee5e634291d74cd1773d221dce3702 Issue-ID: SDC-3377 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
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-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-06-25Rationalize maven dependenciesJulienBe1-6/+1
Issue-ID: SDC-3149 Signed-off-by: JulienBe <julien.bertozzi@intl.att.com> Change-Id: I1ee42494a4cc5b185b6dfcbee44399d2960cf880
2020-05-06Prepare for Junit5vasraz2-86/+74
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-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-08-28remove duplicated dependenciesvasraz1-6/+0
Change-Id: I60962892f035d81943567a0b3d7819ef3cab52f7 Issue-ID: SDC-2388 Signed-off-by: vasraz <vasyl.razinkov@est.tech>
2019-08-08Additional unit testsTomasz Golabek1-0/+77
Tests for ItemVersionConflictConverter Change-Id: I5bf7ac9322e44d7021f87c9853ae250024172f0c Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
2019-08-08Additional unit testsTomasz Golabek4-7/+165
Tests for ConflictsDaoImpl Change-Id: I7fd472b55a96a314992be0e49725d8844167ff4d Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
2019-08-08Additional unit testsTomasz Golabek7-2/+170
Tests for conflict-api mostly bean matchers for getters and setters Change-Id: I924b17986dfbc419da391fae0d33bb458d97f465 Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
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-11Added oparent to sdc mainTomasz Golabek12-1/+241
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-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>
2018-10-24update sdc version to 1.3.1Michael Lando3-3/+3
Change-Id: I195d96ddf5bd6257ade7eb56c65f9e4bc2d602b6 Issue-ID: SDC-1865 Signed-off-by: Michael Lando <michael.lando@intl.att.com>
2018-08-09Corrected relative path to parent POMvempo3-3/+0
Change-Id: I48ac8bbc9ed8a7c15401a3af44696be93c5a4d7c Issue-ID: SDC-1065 Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
2018-07-29re base codeMichael Lando3-32/+8
Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando <ml636r@att.com>
2018-06-18Revert "SonarQube coverage"ayalaben2-7/+0
Change-Id: I6b1ab87272fdd23f185e3b79f276cd583fd35884 Issue-ID: SDC-1364 Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>
2018-06-02update sdc versionMichael Lando3-3/+3
update pom and version.properties to 1.3.0 Issue-ID: SDC-1370 Change-Id: I0dcf02f868dd263ba4523435e7be11bdc3851053 Signed-off-by: Michael Lando <ml636r@att.com>
2018-05-27SonarQube coverageayalaben2-0/+7
Change-Id: I2290ea6462cb2ab7a9a3a9feba69b69231ec78fa Issue-ID: SDC-1364 Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>
2018-05-27Revert "update sdc version"Michael Lando3-3/+3
This reverts commit 5920d2c9e47958ed5f3197b7a16094e01e8d4bcd. Change-Id: I7906549d1fb7ba5d8d081870a9d976a3c8077438 Issue-ID: SDC-1370 Signed-off-by: Michael Lando <ml636r@att.com>
2018-05-26update sdc versionMichael Lando3-3/+3
update pom and version.properties to 1.3.0 Issue-ID: SDC-1370 Change-Id: Ib8f4e2859ee79dfd8e19e725b07c77d7d2bbdaf1 Signed-off-by: Michael Lando <ml636r@att.com>
2018-03-05Delete VSP merge Hint - fix sonar issuesayalaben1-14/+7
Change-Id: I7e8d3efd9db3ec714ab97d740cc71e826713b467 Issue-ID: SDC-1014 Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>
2018-02-18Onboarding foundation changes for ItemManagersheetalm1-6/+21
Resolved conflicting changes 1. Split ItemManager to ASDCItemManager and ItemManager 2. ItemManager provides basic capability of item without collaboration 3. AsdcItemManager provides all capabilities of item including collaboration which are required by onboarding 4. ItemManager can be used by other services like activity spec to create a basic item without collaboration features. Change-Id: I6c6dc34a2b1a1745c796099b70e359432e90f85e Issue-ID: SDC-1039 Signed-off-by: sheetalm <sheetal.mudholkar@amdocs.com>
2017-12-21Add collaboration featuretalig18-0/+837
Issue-ID: SDC-767 Change-Id: I14fb4c1f54086ed03a56a7ff7fab9ecd40381795 Signed-off-by: talig <talig@amdocs.com>