Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moved maven-clean-plugin version to the only module that uses it. #12393

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Moved maven-clean-plugin version to the only module that uses it. #12393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ec1789
Moved maven-clean-plugin version to the only module that uses it.
Ansku Sep 1, 2021
9463688
add maven central repo to test module
ZheSun88 Sep 2, 2021
19606e9
fix pluginrepo declaration
ZheSun88 Sep 2, 2021
5413310
add addon repo
ZheSun88 Sep 2, 2021
378afb9
define maven repos in karaf-run
ZheSun88 Sep 2, 2021
c62febb
Add https configurations.
Ansku Sep 2, 2021
1cc81e4
Update jsoup.
Ansku Sep 2, 2021
6525317
Merge branch 'master' into updateKaraf20210901
ZheSun88 Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,6 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
Expand Down
46 changes: 32 additions & 14 deletions test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,15 @@
<install.skip>true</install.skip>
</properties>

<repositories>
<repository>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>https://repo.maven.apache.org/maven2/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>vaadin-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
<releases>
Expand All @@ -38,19 +45,22 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>vaadin-addons</id>
<url>https://maven.vaadin.com/vaadin-addons</url>
</repository>
<repository>
</pluginRepository>
<pluginRepository>
<id>vaadin-prereleases</id>
<url>https://maven.vaadin.com/vaadin-prereleases</url>
</repository>
</repositories>
</pluginRepository>
</pluginRepositories>

<pluginRepositories>
<pluginRepository>
<repositories>
<repository>
<id>central</id>
<url>https://repo.maven.apache.org/maven2/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>vaadin-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
<releases>
Expand All @@ -59,8 +69,16 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</repository>
<repository>
<id>vaadin-prereleases</id>
<url>https://maven.vaadin.com/vaadin-prereleases</url>
</repository>
<repository>
<id>vaadin-addons</id>
<url>https://maven.vaadin.com/vaadin-addons</url>
</repository>
</repositories>

<dependencyManagement>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions ...rvlet-containers/karaf/karaf-run/apache-karaf-4.2.1-minimal/etc/org.ops4j.pax.url.mvn.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

#
Expand Down
54 changes: 53 additions & 1 deletion test/servlet-containers/karaf/karaf-run/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution><id>clean-karaf</id>
<phase>pre-integration-test</phase>
Expand Down Expand Up @@ -126,7 +127,7 @@
<command>shutdown -f +10</command>
<command>feature:install http</command>
<command>feature:install http-whiteboard</command>
<command>bundle:install -s mvn:org.jsoup/jsoup/1.11.2</command>
<command>bundle:install -s mvn:org.jsoup/jsoup/1.14.2</command>
<command>bundle:install -s mvn:com.vaadin.external/gentyref/1.2.0.vaadin1</command>
<command>bundle:install -s mvn:com.vaadin/vaadin-shared/${vaadin.version}</command>
<command>bundle:install -s mvn:com.vaadin/vaadin-server/${vaadin.version}</command>
Expand Down Expand Up @@ -178,4 +179,55 @@
</plugin>
</plugins>
</build>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>https://repo.maven.apache.org/maven2/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>vaadin-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>vaadin-prereleases</id>
<url>https://maven.vaadin.com/vaadin-prereleases</url>
</pluginRepository>
</pluginRepositories>

<repositories>
<repository>
<id>central</id>
<url>https://repo.maven.apache.org/maven2/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>vaadin-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>vaadin-prereleases</id>
<url>https://maven.vaadin.com/vaadin-prereleases</url>
</repository>
<repository>
<id>vaadin-addons</id>
<url>https://maven.vaadin.com/vaadin-addons</url>
</repository>
</repositories>
</project>