From fac4975acfa80cfe6ab36f63f2cec88dfc1fde0f Mon Sep 17 00:00:00 2001 From: AricMonary <46301867+AricMonary@users.noreply.github.com> Date: Fri, 23 Oct 2020 16:09:46 -0700 Subject: [PATCH 01/31] updating gmavenplus plugin for issue 1923 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e776e21..62f60c3 100644 --- a/pom.xml +++ b/pom.xml @@ -346,7 +346,7 @@ org.codehaus.gmavenplus gmavenplus-plugin - 1.6 + 1.11.0 org.codehaus.mojo From 65515e9093928cda0ce3758f1927353c745bdfab Mon Sep 17 00:00:00 2001 From: Pablo Tirado Date: Sun, 25 Oct 2020 12:19:00 +0100 Subject: [PATCH 02/31] Issue 1848: Upgrade Jetty to 9.4.33.v20201020 version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62f60c3..31127ae 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 3.0.1 5.7.0 2.32 - 9.4.18.v20190429 + 9.4.33.v20201020 4.5.2 4.8.1 1.2.3 From 256918db00d832681568626d03acdd5d8c99bfff Mon Sep 17 00:00:00 2001 From: "Solange U. Gasengayire" Date: Mon, 26 Oct 2020 23:22:02 +0000 Subject: [PATCH 03/31] Issue 1871: Upgrade the maven-resources-plugin from 3.0.2 to 3.2.0 - Upgrade the maven-resources plugin from 3.0.2 to 3.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 31127ae..18ade15 100644 --- a/pom.xml +++ b/pom.xml @@ -144,7 +144,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.0.2 + 3.2.0 true From 581da7441023aad3891303431c577738c1e16256 Mon Sep 17 00:00:00 2001 From: sbespalov Date: Tue, 27 Oct 2020 09:34:24 +0700 Subject: [PATCH 04/31] issues-1849: remove ehcache dependencies --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 18ade15..086a673 100644 --- a/pom.xml +++ b/pom.xml @@ -191,7 +191,6 @@ ${strongbox.vault}/logs ${project.build.directory}/strongbox/etc/logback-spring.xml ${strongbox.vault}/tmp - ${project.build.directory}/strongbox/cache false false false @@ -224,7 +223,6 @@ ${project.build.directory}/strongbox/etc/logback-spring.xml true ${strongbox.vault}/tmp - ${project.build.directory}/strongbox/cache false false @@ -463,12 +461,6 @@ ${version.carlspring.npm.metadata} - - net.sf.ehcache - ehcache-core - 2.6.11 - - javax.servlet javax.servlet-api From f1b56c52cb3762cae2206ce341850377a818dbf5 Mon Sep 17 00:00:00 2001 From: carlspring Date: Tue, 27 Oct 2020 15:02:58 +0000 Subject: [PATCH 05/31] Issue 1942: Add explicit versions for the plugins that are missing such in the strongbox-parent Fixed. --- pom.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 086a673..a4a61bd 100644 --- a/pom.xml +++ b/pom.xml @@ -118,6 +118,11 @@ + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + org.apache.maven.plugins maven-compiler-plugin @@ -128,6 +133,16 @@ true + + org.apache.maven.plugins + maven-install-plugin + 3.0.0-M1 + + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0-M1 + org.apache.maven.plugins maven-source-plugin @@ -231,7 +246,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + 3.1.2 common-resources From 325668a4e43fa7d5984506b06168b4aa7fe300c7 Mon Sep 17 00:00:00 2001 From: AricMonary <46301867+AricMonary@users.noreply.github.com> Date: Mon, 12 Oct 2020 12:58:57 -0700 Subject: [PATCH 06/31] Added profiles for Java version enforcement --- pom.xml | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a4a61bd..ae8ca93 100644 --- a/pom.xml +++ b/pom.xml @@ -1747,7 +1747,6 @@ - dependency-convergence-check @@ -1773,6 +1772,67 @@ + + enforce-jdk11 + + 11 + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-versions + + enforce + + + + + [11.3,) + Strongbox only supports JDK 11.3, or higher. + ERROR + + + + + + + + + + + enforce-jdk8 + + 1.8 + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-versions + + enforce + + + + + [1.8.0-241,) + Strongbox only supports JDK 1.8.0_241, or higher. + ERROR + + + + + + + + + - From 34a451cc01f8a8eba63a83766e0b251dca33e462 Mon Sep 17 00:00:00 2001 From: AricMonary <46301867+AricMonary@users.noreply.github.com> Date: Mon, 12 Oct 2020 14:37:25 -0700 Subject: [PATCH 07/31] Added profiles that will fail if unsupported version of java --- pom.xml | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ae8ca93..eae7292 100644 --- a/pom.xml +++ b/pom.xml @@ -1775,7 +1775,7 @@ enforce-jdk11 - 11 + [11.3,12) @@ -1792,7 +1792,7 @@ [11.3,) - Strongbox only supports JDK 11.3, or higher. + JDK 11 is not currently supported. Strongbox will only support JDK 11.3, or higher, in the future. ERROR @@ -1834,5 +1834,98 @@ + + enforce-if-less-than-jdk8 + + (,1.8) + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-versions + + enforce + + + + + [1.8.0-241,1.9), [11.3,12) + Strongbox only supports JDK 8 (and JDK 11 in the future). + ERROR + + + + + + + + + + + enforce-if-greater-than-jdk8-and-less-than-jdk11 + + [1.9, 11.3) + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-versions + + enforce + + + + + [1.8.0-241,1.9), [11.3,12) + Strongbox only supports JDK 8 (and JDK 11 in the future). + ERROR + + + + + + + + + + + enforce-if-greater-than-jdk11 + + [12,) + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-versions + + enforce + + + + + [1.8.0-241,1.9), [11.3,12) + Strongbox only supports JDK 8 (and JDK 11 in the future). + ERROR + + + + + + + + + - + \ No newline at end of file From 55e95f2d9cdf3367deda11ca2048d02954d063d0 Mon Sep 17 00:00:00 2001 From: AricMonary <46301867+AricMonary@users.noreply.github.com> Date: Mon, 12 Oct 2020 18:17:24 -0700 Subject: [PATCH 08/31] converted tabs into spaces --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index eae7292..d5f3068 100644 --- a/pom.xml +++ b/pom.xml @@ -1772,7 +1772,7 @@ - + enforce-jdk11 [11.3,12) @@ -1836,7 +1836,7 @@ enforce-if-less-than-jdk8 - + (,1.8) @@ -1867,7 +1867,7 @@ enforce-if-greater-than-jdk8-and-less-than-jdk11 - + [1.9, 11.3) @@ -1898,7 +1898,7 @@ enforce-if-greater-than-jdk11 - + [12,) From 79790f7ffde071d1afba46eca269a7f4d6a3c296 Mon Sep 17 00:00:00 2001 From: AricMonary <46301867+AricMonary@users.noreply.github.com> Date: Mon, 12 Oct 2020 18:18:14 -0700 Subject: [PATCH 09/31] added missing last line --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d5f3068..1d4af56 100644 --- a/pom.xml +++ b/pom.xml @@ -1928,4 +1928,4 @@ - \ No newline at end of file + From cc94acb791934f8533245c3bc8f7a7d1995d8a6b Mon Sep 17 00:00:00 2001 From: Martin Todorov Date: Fri, 16 Oct 2020 17:12:41 +0100 Subject: [PATCH 10/31] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d4af56..3b68708 100644 --- a/pom.xml +++ b/pom.xml @@ -1792,7 +1792,7 @@ [11.3,) - JDK 11 is not currently supported. Strongbox will only support JDK 11.3, or higher, in the future. + Strongbox only supports JDK 11.3, or higher. ERROR From 477a94fcca3e5dc25ac562016d326c7ee6a77e1f Mon Sep 17 00:00:00 2001 From: AricMonary <46301867+AricMonary@users.noreply.github.com> Date: Thu, 22 Oct 2020 23:03:19 -0700 Subject: [PATCH 11/31] JDK8 support only --- pom.xml | 172 +++++--------------------------------------------------- 1 file changed, 15 insertions(+), 157 deletions(-) diff --git a/pom.xml b/pom.xml index 3b68708..befb3d2 100644 --- a/pom.xml +++ b/pom.xml @@ -440,9 +440,22 @@ true - + + enforce-versions + + enforce + + + + + [1.8.0-241,1.9) + Invalid JDK version, minimum required is 1.8.0_241. + + + + + - @@ -1772,160 +1785,5 @@ - - enforce-jdk11 - - [11.3,12) - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - [11.3,) - Strongbox only supports JDK 11.3, or higher. - ERROR - - - - - - - - - - - enforce-jdk8 - - 1.8 - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - [1.8.0-241,) - Strongbox only supports JDK 1.8.0_241, or higher. - ERROR - - - - - - - - - - - enforce-if-less-than-jdk8 - - (,1.8) - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - [1.8.0-241,1.9), [11.3,12) - Strongbox only supports JDK 8 (and JDK 11 in the future). - ERROR - - - - - - - - - - - enforce-if-greater-than-jdk8-and-less-than-jdk11 - - [1.9, 11.3) - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - [1.8.0-241,1.9), [11.3,12) - Strongbox only supports JDK 8 (and JDK 11 in the future). - ERROR - - - - - - - - - - - enforce-if-greater-than-jdk11 - - [12,) - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - [1.8.0-241,1.9), [11.3,12) - Strongbox only supports JDK 8 (and JDK 11 in the future). - ERROR - - - - - - - - - From 87c647a8785e11df94f6c9867da16528da7696fb Mon Sep 17 00:00:00 2001 From: Martin Todorov Date: Tue, 27 Oct 2020 12:47:06 +0000 Subject: [PATCH 12/31] Update pom.xml [skip ci] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index befb3d2..e30a63d 100644 --- a/pom.xml +++ b/pom.xml @@ -454,7 +454,7 @@ - + From f74f88be406003db9f852f7749d20087cbe7aad2 Mon Sep 17 00:00:00 2001 From: Steve Todorov Date: Tue, 27 Oct 2020 18:19:06 +0200 Subject: [PATCH 13/31] issue-1865: Add a rule using the maven-enforcer plugin that requires JDK 8 (or 11) --- pom.xml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index e30a63d..ef15c18 100644 --- a/pom.xml +++ b/pom.xml @@ -421,7 +421,7 @@ 3.0.0-M3 - enforce-maven + enforce-jdk-and-maven-versions enforce @@ -433,25 +433,21 @@ [3.6.3,) - Invalid Maven version, the minimum required is 3.6.3. + + ${line.separator} You are using an unsupported Maven version! ${line.separator} See https://strongbox.github.io/developer-guide/getting-started.html ${line.separator} + - - true - true - - - - enforce-versions - - enforce - - - - [1.8.0-241,1.9) - Invalid JDK version, minimum required is 1.8.0_241. + + + [1.8.0-222,1.9),[11.1,12) + + ${line.separator} ${java.vendor.version} ${java.runtime.version} is not a supported JDK version! ${line.separator} See https://strongbox.github.io/developer-guide/getting-started.html ${line.separator} + + true + true From 18b2e86dbd49bcb1c3d426f75a78390822386d12 Mon Sep 17 00:00:00 2001 From: Steve Todorov Date: Tue, 27 Oct 2020 18:43:36 +0200 Subject: [PATCH 14/31] issue-1865: Add a rule using the maven-enforcer plugin that requires JDK 8 (or 11) Added maven version to error message for easier debugging. --- pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef15c18..f5348d3 100644 --- a/pom.xml +++ b/pom.xml @@ -312,6 +312,14 @@ org.codehaus.mojo build-helper-maven-plugin 3.2.0 + + + maven-version + + maven-version + + + @@ -434,7 +442,7 @@ [3.6.3,) - ${line.separator} You are using an unsupported Maven version! ${line.separator} See https://strongbox.github.io/developer-guide/getting-started.html ${line.separator} + ${line.separator} Maven ${maven.version} is not a supported version! ${line.separator} See https://strongbox.github.io/developer-guide/getting-started.html ${line.separator} From c93a1c6126e375fbd1da2f5dafbbcf382090cc90 Mon Sep 17 00:00:00 2001 From: Martin Todorov Date: Tue, 27 Oct 2020 18:30:57 +0000 Subject: [PATCH 15/31] Issue 1942: Add explicit versions for the plugins that are missing such in the strongbox-parent It seems there is some sort of bug with the `maven-dependency-plugin` that causes a 401 when deploying to the repository through Jenkins. Reverting this to `2.8.2`. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5348d3..e087324 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + 2.8.2 org.apache.maven.plugins From 6930bec601b5c4b8b69bfc356c1d3434bd46c072 Mon Sep 17 00:00:00 2001 From: Steve Todorov Date: Tue, 27 Oct 2020 20:37:50 +0200 Subject: [PATCH 16/31] issue-1942: Added a warning comment. --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index e087324..a63a031 100644 --- a/pom.xml +++ b/pom.xml @@ -141,6 +141,8 @@ org.apache.maven.plugins maven-deploy-plugin + + 2.8.2 From 3adf884f2709f0bf769372f046911ce2ac31f6bd Mon Sep 17 00:00:00 2001 From: Pablo Tirado Date: Tue, 27 Oct 2020 19:06:38 +0100 Subject: [PATCH 17/31] Issue 1851: Upgrade org.apache.httpcomponents:httpclient to 4.5.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a63a031..6249cbb 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 29.0-jre 2.2 3.10.2 - 4.5 + 4.5.13 2.10.0 1.7.25 3.0.2 From a184cd28e4c3c42b4d50654848decb9161f8d88a Mon Sep 17 00:00:00 2001 From: Florian Zschocke Date: Thu, 29 Oct 2020 15:34:12 +0100 Subject: [PATCH 18/31] Upgrade commons-beanutils from 1.9.3 to 1.9.4 Update the dependency version for commons-beanutils. Also fix the placement of the comment explaining the beanutils version override. It was moved upwards above a different dependency by another commit. This fixes strongbox/strongbox#1847 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6249cbb..6d614af 100644 --- a/pom.xml +++ b/pom.xml @@ -637,19 +637,19 @@ commons-io ${version.apache.commons.io} - com.unboundid unboundid-ldapsdk 5.1.1 test + commons-beanutils commons-beanutils - 1.9.3 + 1.9.4 commons-collections From fc95c0b42cb905bc3eb25add92e91a0e7577afcb Mon Sep 17 00:00:00 2001 From: Ankit Tomar Date: Mon, 23 Nov 2020 17:00:08 +0530 Subject: [PATCH 19/31] required Java version message fix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d614af..0331789 100644 --- a/pom.xml +++ b/pom.xml @@ -452,7 +452,7 @@ [1.8.0-222,1.9),[11.1,12) - ${line.separator} ${java.vendor.version} ${java.runtime.version} is not a supported JDK version! ${line.separator} See https://strongbox.github.io/developer-guide/getting-started.html ${line.separator} + ${line.separator} ${java.vendor} ${java.runtime.version} is not a supported JDK version! ${line.separator} See https://strongbox.github.io/developer-guide/getting-started.html ${line.separator} From 5cc899b853cf2535b8e722ffda2684f85b93e8ac Mon Sep 17 00:00:00 2001 From: sbespalov Date: Thu, 23 Jan 2020 15:04:28 +0700 Subject: [PATCH 20/31] issues/1649: Migrate Strongbox from OrientDB to JanusGraph --- pom.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 0331789..0b1ec7d 100644 --- a/pom.xml +++ b/pom.xml @@ -197,7 +197,6 @@ 1 false - ${project.build.directory}/strongbox ${project.build.directory}/strongbox-vault @@ -1029,7 +1028,7 @@ test - + xerces xercesImpl @@ -1446,7 +1445,7 @@ org.apache.tinkerpop gremlin-core ${version.tinkerpop} - + org.apache.tinkerpop gremlin-driver @@ -1478,7 +1477,6 @@ - org.opencypher.gremlin cypher-gremlin-neo4j-driver @@ -1505,7 +1503,6 @@ neo4j-ogm-core 3.2.10 - org.springframework.data spring-data-neo4j From 5d4f90f62537ccc5b3c507d94c27c4aa1da35257 Mon Sep 17 00:00:00 2001 From: sbespalov Date: Thu, 23 Jan 2020 15:04:28 +0700 Subject: [PATCH 21/31] issues/1775: Upgrade to Cassandra to 4.0-beta2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0b1ec7d..ae3c272 100644 --- a/pom.xml +++ b/pom.xml @@ -1028,7 +1028,7 @@ test - + xerces xercesImpl @@ -1445,7 +1445,7 @@ org.apache.tinkerpop gremlin-core ${version.tinkerpop} - + org.apache.tinkerpop gremlin-driver From 69ea6be8a9d0452d1518982f687ea0f21e9c1166 Mon Sep 17 00:00:00 2001 From: Ankit Tomar Date: Fri, 13 Mar 2020 18:41:32 +0530 Subject: [PATCH 22/31] rest-assured version upgrade for Test Cases fix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae3c272..d8bb180 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 1.3.2 1.7.30 2.2.4.RELEASE - 4.2.0 + 4.3.1-SNAPSHOT 6.1.2.Final 3.0.1-b08 4.7.1 From 5223fdf831acc30044247ca98287a7ecee5f2fb6 Mon Sep 17 00:00:00 2001 From: Ankit Tomar Date: Sun, 15 Mar 2020 22:14:46 +0530 Subject: [PATCH 23/31] rest-assured version upgrade --- pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d8bb180..eab1162 100644 --- a/pom.xml +++ b/pom.xml @@ -629,8 +629,13 @@ org.codehaus.groovy groovy-json + + io.rest-assured + json-path + + commons-io commons-io @@ -1547,7 +1552,15 @@ org.junit.vintage junit-vintage-engine - + + io.rest-assured + json-path + + + io.rest-assured + xml-path + + org.codehaus.janino From 6d9f14f042e2cd131a957fe5c492183f10ab8502 Mon Sep 17 00:00:00 2001 From: Ankit Tomar Date: Sun, 15 Mar 2020 22:56:12 +0530 Subject: [PATCH 24/31] Bumping groovy version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eab1162..50c772f 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 1.19 1.5.5 2.1.0 - 2.5.7 + 3.0.2 29.0-jre 2.2 3.10.2 From aa0135f18709ca8dcf67b7ec162d2701e15c6ba4 Mon Sep 17 00:00:00 2001 From: Ankit Tomar Date: Mon, 13 Apr 2020 00:07:26 +0530 Subject: [PATCH 25/31] groovy dependency changes for rest-assured --- pom.xml | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 50c772f..f279965 100644 --- a/pom.xml +++ b/pom.xml @@ -964,13 +964,92 @@ pom import +<<<<<<< HEAD +======= + + org.testng + testng + +>>>>>>> groovy dependency changes for rest-assured org.codehaus.groovy - groovy-testng + groovy-ant - org.testng - testng + org.codehaus.groovy + groovy-astbuilder + + + org.codehaus.groovy + groovy-cli-picocli + + + org.codehaus.groovy + groovy-console + + + org.codehaus.groovy + groovy-datetime + + + org.codehaus.groovy + groovy-docgenerator + + + org.codehaus.groovy + groovy-groovydoc + + + org.codehaus.groovy + groovy-groovysh + + + org.codehaus.groovy + groovy-jmx + + + org.codehaus.groovy + groovy-json + + + org.codehaus.groovy + groovy-jsr223 + + + org.codehaus.groovy + groovy-macro + + + org.codehaus.groovy + groovy-nio + + + org.codehaus.groovy + groovy-sql + + + org.codehaus.groovy + groovy-servlet + + + org.codehaus.groovy + groovy-swing + + + org.codehaus.groovy + groovy-templates + + + org.codehaus.groovy + groovy-test + + + org.codehaus.groovy + groovy-test-junit5 + + + org.codehaus.groovy + groovy-testng From 6d37c60392b07dada72f566e9b62ec47718adcd4 Mon Sep 17 00:00:00 2001 From: Ankit Tomar Date: Mon, 13 Apr 2020 00:17:08 +0530 Subject: [PATCH 26/31] groovy dependency changes for rest-assured --- pom.xml | 183 ++++++++++++++++++++++++++------------------------------ 1 file changed, 86 insertions(+), 97 deletions(-) diff --git a/pom.xml b/pom.xml index f279965..29356c1 100644 --- a/pom.xml +++ b/pom.xml @@ -959,99 +959,19 @@ org.codehaus.groovy - groovy-all + groovy + ${version.groovy} + + + org.codehaus.groovy + groovy-xml + ${version.groovy} + + + + org.codehaus.groovy + groovy-json ${version.groovy} - pom - import - -<<<<<<< HEAD -======= - - org.testng - testng - ->>>>>>> groovy dependency changes for rest-assured - - org.codehaus.groovy - groovy-ant - - - org.codehaus.groovy - groovy-astbuilder - - - org.codehaus.groovy - groovy-cli-picocli - - - org.codehaus.groovy - groovy-console - - - org.codehaus.groovy - groovy-datetime - - - org.codehaus.groovy - groovy-docgenerator - - - org.codehaus.groovy - groovy-groovydoc - - - org.codehaus.groovy - groovy-groovysh - - - org.codehaus.groovy - groovy-jmx - - - org.codehaus.groovy - groovy-json - - - org.codehaus.groovy - groovy-jsr223 - - - org.codehaus.groovy - groovy-macro - - - org.codehaus.groovy - groovy-nio - - - org.codehaus.groovy - groovy-sql - - - org.codehaus.groovy - groovy-servlet - - - org.codehaus.groovy - groovy-swing - - - org.codehaus.groovy - groovy-templates - - - org.codehaus.groovy - groovy-test - - - org.codehaus.groovy - groovy-test-junit5 - - - org.codehaus.groovy - groovy-testng - - @@ -1113,6 +1033,58 @@ + + io.rest-assured + json-path + ${version.rest.assured} + + + org.codehaus.groovy + groovy + + + org.codehaus.groovy + groovy-xml + + + org.codehaus.groovy + groovy-json + + + + + + io.rest-assured + xml-path + ${version.rest.assured} + + + org.codehaus.groovy + groovy + + + org.codehaus.groovy + groovy-xml + + + javax.activation + activation + + + jakarta.xml.bind + jakarta.xml.bind-api + + + com.sun.xml.bind + jaxb-osgi + + + org.ccil.cowan.tagsoup + tagsoup + + + + xerces xercesImpl @@ -1173,12 +1145,29 @@ - org.codehaus.groovy - groovy - ${version.groovy} + org.apache.directory.server + apacheds-core + ${version.apache.directory} + test + + + org.slf4j + slf4j-api + + + + + org.apache.directory.server + apacheds-protocol-ldap + ${version.apache.directory} + test + + + org.slf4j + slf4j-api + + - - org.javatuples From 7f3cbc9d4f9e31772cd5a6652082fe0ddf9544c7 Mon Sep 17 00:00:00 2001 From: Ankit Tomar Date: Mon, 13 Apr 2020 01:11:54 +0530 Subject: [PATCH 27/31] Adding groovy-json dependency to support rest-assured --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 29356c1..bbbe823 100644 --- a/pom.xml +++ b/pom.xml @@ -957,6 +957,7 @@ aspectjweaver 1.9.4 + org.codehaus.groovy groovy From fa31867b30d9b995eb546bb3d8496a185e460d79 Mon Sep 17 00:00:00 2001 From: Ankit Tomar Date: Mon, 13 Apr 2020 01:17:44 +0530 Subject: [PATCH 28/31] Adding rest-assured json-path,xml-path dependency to parent pom --- pom.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pom.xml b/pom.xml index bbbe823..5636e59 100644 --- a/pom.xml +++ b/pom.xml @@ -1020,19 +1020,6 @@ ${version.rest.assured} test - - io.rest-assured - json-path - ${version.rest.assured} - test - - - io.rest-assured - xml-path - ${version.rest.assured} - test - - io.rest-assured From c0db9b1337637a552f41df9a89563c647a4f8708 Mon Sep 17 00:00:00 2001 From: Ankit Tomar Date: Wed, 2 Dec 2020 15:09:50 +0530 Subject: [PATCH 29/31] Upgrading rest assured version to 4.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5636e59..195156b 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 1.3.2 1.7.30 2.2.4.RELEASE - 4.3.1-SNAPSHOT + 4.3.1 6.1.2.Final 3.0.1-b08 4.7.1 From bed72553461edf929f23f9bbdbf26d7d5c37331d Mon Sep 17 00:00:00 2001 From: Ankit Tomar Date: Thu, 10 Dec 2020 10:11:57 +0530 Subject: [PATCH 30/31] groovy-all dependency excluded from rest-assured --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 195156b..5d5727d 100644 --- a/pom.xml +++ b/pom.xml @@ -1019,6 +1019,12 @@ rest-assured ${version.rest.assured} test + + + org.codehaus.groovy + groovy-all + + From 11e478e5501fa5370a1e9d446cc928992fd5bc0a Mon Sep 17 00:00:00 2001 From: Ankit Tomar Date: Thu, 10 Dec 2020 19:06:43 +0530 Subject: [PATCH 31/31] Version changes --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d5727d..3f6aa17 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.carlspring.strongbox strongbox-parent - 1.0-PR-62-SNAPSHOT + 1.0-PR-135-SNAPSHOT pom Strongbox: Parent