From 1ec1789d68f6dce6b167871004e38e4be199becf Mon Sep 17 00:00:00 2001 From: Anna Koskinen Date: Wed, 1 Sep 2021 19:14:16 +0300 Subject: [PATCH 1/7] Moved maven-clean-plugin version to the only module that uses it. - Fixes server integration test warning about missing version. --- pom.xml | 4 ---- test/servlet-containers/karaf/karaf-run/pom.xml | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5cd631f9c72..b87f654f057 100644 --- a/pom.xml +++ b/pom.xml @@ -367,10 +367,6 @@ - - maven-clean-plugin - 3.0.0 - maven-compiler-plugin 3.5.1 diff --git a/test/servlet-containers/karaf/karaf-run/pom.xml b/test/servlet-containers/karaf/karaf-run/pom.xml index ffc1ccfdad5..04b75e7c008 100644 --- a/test/servlet-containers/karaf/karaf-run/pom.xml +++ b/test/servlet-containers/karaf/karaf-run/pom.xml @@ -61,6 +61,7 @@ maven-clean-plugin + 3.0.0 clean-karaf pre-integration-test From 946368865f0eadaf3c9b17ab413fba5f47b9db7d Mon Sep 17 00:00:00 2001 From: Zhe Sun <31067185+ZheSun88@users.noreply.github.com> Date: Thu, 2 Sep 2021 13:32:16 +0300 Subject: [PATCH 2/7] add maven central repo to test module --- test/pom.xml | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index 94b380b52c5..c41e91f0d0d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,8 +28,15 @@ true - - + + + central + https://repo.maven.apache.org/maven2/ + + false + + + vaadin-snapshots https://oss.sonatype.org/content/repositories/vaadin-snapshots/ @@ -38,19 +45,22 @@ true - - - vaadin-addons - https://maven.vaadin.com/vaadin-addons - + vaadin-prereleases https://maven.vaadin.com/vaadin-prereleases - + - - + + + central + https://repo.maven.apache.org/maven2/ + + false + + + vaadin-snapshots https://oss.sonatype.org/content/repositories/vaadin-snapshots/ @@ -59,8 +69,12 @@ true - - + + + vaadin-prereleases + https://maven.vaadin.com/vaadin-prereleases + + From 19606e95943323c022ede1d48e83d40d2ce8c512 Mon Sep 17 00:00:00 2001 From: Zhe Sun <31067185+ZheSun88@users.noreply.github.com> Date: Thu, 2 Sep 2021 13:40:50 +0300 Subject: [PATCH 3/7] fix pluginrepo declaration --- test/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index c41e91f0d0d..8ec8b3288e5 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,10 +46,10 @@ true - + vaadin-prereleases https://maven.vaadin.com/vaadin-prereleases - + From 5413310be815697d702483605ec9a4ff1be7783e Mon Sep 17 00:00:00 2001 From: Zhe Sun <31067185+ZheSun88@users.noreply.github.com> Date: Thu, 2 Sep 2021 14:07:17 +0300 Subject: [PATCH 4/7] add addon repo --- test/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/pom.xml b/test/pom.xml index 8ec8b3288e5..8e5aa446393 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -74,6 +74,10 @@ vaadin-prereleases https://maven.vaadin.com/vaadin-prereleases + + vaadin-addons + https://maven.vaadin.com/vaadin-addons + From 378afb951b4aeb3d5e10bbe36b757aafabec87b0 Mon Sep 17 00:00:00 2001 From: Zhe Sun <31067185+ZheSun88@users.noreply.github.com> Date: Thu, 2 Sep 2021 14:29:51 +0300 Subject: [PATCH 5/7] define maven repos in karaf-run --- .../karaf/karaf-run/pom.xml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/test/servlet-containers/karaf/karaf-run/pom.xml b/test/servlet-containers/karaf/karaf-run/pom.xml index 04b75e7c008..da97f5632c3 100644 --- a/test/servlet-containers/karaf/karaf-run/pom.xml +++ b/test/servlet-containers/karaf/karaf-run/pom.xml @@ -179,4 +179,55 @@ + + + central + https://repo.maven.apache.org/maven2/ + + false + + + + vaadin-snapshots + https://oss.sonatype.org/content/repositories/vaadin-snapshots/ + + false + + + true + + + + vaadin-prereleases + https://maven.vaadin.com/vaadin-prereleases + + + + + + central + https://repo.maven.apache.org/maven2/ + + false + + + + vaadin-snapshots + https://oss.sonatype.org/content/repositories/vaadin-snapshots/ + + false + + + true + + + + vaadin-prereleases + https://maven.vaadin.com/vaadin-prereleases + + + vaadin-addons + https://maven.vaadin.com/vaadin-addons + + From c62febb242ba834c56e98e5558af7bfc2f844d27 Mon Sep 17 00:00:00 2001 From: Anna Koskinen Date: Thu, 2 Sep 2021 16:29:49 +0300 Subject: [PATCH 6/7] Add https configurations. --- .../apache-karaf-4.2.1-minimal/etc/org.ops4j.pax.url.mvn.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/servlet-containers/karaf/karaf-run/apache-karaf-4.2.1-minimal/etc/org.ops4j.pax.url.mvn.cfg b/test/servlet-containers/karaf/karaf-run/apache-karaf-4.2.1-minimal/etc/org.ops4j.pax.url.mvn.cfg index 8f8ddeb7770..e2cc11a1cc8 100644 --- a/test/servlet-containers/karaf/karaf-run/apache-karaf-4.2.1-minimal/etc/org.ops4j.pax.url.mvn.cfg +++ b/test/servlet-containers/karaf/karaf-run/apache-karaf-4.2.1-minimal/etc/org.ops4j.pax.url.mvn.cfg @@ -112,8 +112,8 @@ org.ops4j.pax.url.mvn.defaultRepositories=\ # settings.xml this is optional but recommended # org.ops4j.pax.url.mvn.repositories= \ - http://repo1.maven.org/maven2@id=central, \ - http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \ + https://repo1.maven.org/maven2@id=central, \ + https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \ https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases # From 1cc81e4c26d430ed4dc811f7bbe51a475701b052 Mon Sep 17 00:00:00 2001 From: Anna Koskinen Date: Thu, 2 Sep 2021 17:00:42 +0300 Subject: [PATCH 7/7] Update jsoup. --- test/servlet-containers/karaf/karaf-run/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/servlet-containers/karaf/karaf-run/pom.xml b/test/servlet-containers/karaf/karaf-run/pom.xml index da97f5632c3..2a230ae4aa7 100644 --- a/test/servlet-containers/karaf/karaf-run/pom.xml +++ b/test/servlet-containers/karaf/karaf-run/pom.xml @@ -127,7 +127,7 @@ shutdown -f +10 feature:install http feature:install http-whiteboard - bundle:install -s mvn:org.jsoup/jsoup/1.11.2 + bundle:install -s mvn:org.jsoup/jsoup/1.14.2 bundle:install -s mvn:com.vaadin.external/gentyref/1.2.0.vaadin1 bundle:install -s mvn:com.vaadin/vaadin-shared/${vaadin.version} bundle:install -s mvn:com.vaadin/vaadin-server/${vaadin.version}