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/pom.xml b/test/pom.xml index d3ec21c01b1..024d2800d8f 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,16 @@ true - - + + + vaadin-prereleases + https://maven.vaadin.com/vaadin-prereleases + + + vaadin-addons + https://maven.vaadin.com/vaadin-addons + + 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 # diff --git a/test/servlet-containers/karaf/karaf-run/pom.xml b/test/servlet-containers/karaf/karaf-run/pom.xml index ffc1ccfdad5..2a230ae4aa7 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 @@ -126,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} @@ -178,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 + +