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

Extract test-only dependencies from the bootstrap-bom #20667

Merged
merged 1 commit into from
Oct 12, 2021
+118 −69
Merged

Extract test-only dependencies from the bootstrap-bom #20667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions independent-projects/bootstrap/app-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-bom-test</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Expand Down
37 changes: 37 additions & 0 deletions independent-projects/bootstrap/bom-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-parent</artifactId>
<version>999-SNAPSHOT</version>
</parent>
<artifactId>quarkus-bootstrap-bom-test</artifactId>
<name>Quarkus - Bootstrap - Test BOM</name>
<description>This BOM contains only test scoped dependencies for the bootstrap project's testsuite</description>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
<version>${shrinkwrap-depchain.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
53 changes: 0 additions & 53 deletions independent-projects/bootstrap/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,6 @@
<artifactId>quarkus-bootstrap-bom</artifactId>
<name>Quarkus - Bootstrap - BOM</name>
<packaging>pom</packaging>
<properties>
<!-- Versions -->
<eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
<jboss-logging.version>3.4.2.Final</jboss-logging.version>
<junit.jupiter.version>5.8.1</junit.jupiter.version>
<maven-core.version>3.8.1</maven-core.version><!-- Keep in sync with sisu.version -->
<sisu.version>0.3.4</sisu.version><!-- Keep in sync with maven-core.version -->
<maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
<maven-resolver.version>1.6.2</maven-resolver.version>
<maven-shared-utils.version>3.3.3</maven-shared-utils.version> <!-- changed from the original version due to https://snyk.io/vuln/maven:org.apache.maven.shared:[email protected] -->
<maven-wagon.version>3.4.3</maven-wagon.version>
<httpcore.version>4.4.14</httpcore.version><!-- Keep in sync with maven-wagon.version (wagon-http 3.4.3 brings in 4.4.13 and 4.4.14) -->
<plexus-cypher.version>1.7</plexus-cypher.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
<jackson.version>2.12.5</jackson.version>
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
<jakarta.enterprise.cdi-api.version>2.0.2</jakarta.enterprise.cdi-api.version>
<jakarta.inject-api.version>1.0</jakarta.inject-api.version>
<commons-lang.version>3.12.0</commons-lang.version>
<guava.version>30.1.1-jre</guava.version>
<shrinkwrap-depchain.version>1.2.6</shrinkwrap-depchain.version>
<jboss-logmanager-embedded.version>1.0.9</jboss-logmanager-embedded.version>
<slf4j-jboss-logmanager.version>1.1.0.Final</slf4j-jboss-logmanager.version>
<slf4j-api.version>1.7.30</slf4j-api.version>
<graal-sdk.version>21.2.0</graal-sdk.version>
<plexus-classworlds.version>2.6.0</plexus-classworlds.version> <!-- not actually used but ClassRealm class is referenced from the API used in BootstrapWagonConfigurator -->
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<smallrye-common.version>1.6.0</smallrye-common.version>
<gradle-tooling.version>7.2</gradle-tooling.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -346,28 +315,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.jupiter.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
<version>${shrinkwrap-depchain.version}</version>
</dependency>
<!-- Jackson dependencies, imported as a BOM -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<!-- Smallrye Common dependencies, imported as a BOM -->
<dependency>
<groupId>io.smallrye.common</groupId>
Expand Down
7 changes: 7 additions & 0 deletions independent-projects/bootstrap/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-bom-test</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
7 changes: 7 additions & 0 deletions independent-projects/bootstrap/gradle-resolver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-bom-test</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
15 changes: 15 additions & 0 deletions independent-projects/bootstrap/maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,21 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Jackson dependencies, imported as a BOM -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-bom-test</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
13 changes: 7 additions & 6 deletions independent-projects/bootstrap/maven-resolver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-bom-test</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -110,12 +117,6 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
39 changes: 30 additions & 9 deletions independent-projects/bootstrap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,47 @@
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>

<!-- Dependency versions -->
<assertj.version>3.21.0</assertj.version>
<eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
<jboss-logging.version>3.4.2.Final</jboss-logging.version>
<junit.jupiter.version>5.8.1</junit.jupiter.version>
<maven-core.version>3.8.1</maven-core.version><!-- Keep in sync with sisu.version -->
<sisu.version>0.3.4</sisu.version><!-- Keep in sync with maven-core.version -->
<maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
<maven-resolver.version>1.6.2</maven-resolver.version>
<maven-shared-utils.version>3.3.3</maven-shared-utils.version> <!-- changed from the original version due to https://snyk.io/vuln/maven:org.apache.maven.shared:[email protected] -->
<maven-wagon.version>3.4.3</maven-wagon.version>
<httpcore.version>4.4.14</httpcore.version><!-- Keep in sync with maven-wagon.version (wagon-http 3.4.3 brings in 4.4.13 and 4.4.14) -->
<plexus-cypher.version>1.7</plexus-cypher.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
<jackson.version>2.12.5</jackson.version>
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
<jakarta.enterprise.cdi-api.version>2.0.2</jakarta.enterprise.cdi-api.version>
<jakarta.inject-api.version>1.0</jakarta.inject-api.version>
<commons-lang.version>3.12.0</commons-lang.version>
<guava.version>30.1.1-jre</guava.version>
<shrinkwrap-depchain.version>1.2.6</shrinkwrap-depchain.version>
<jboss-logmanager-embedded.version>1.0.9</jboss-logmanager-embedded.version>
<slf4j-jboss-logmanager.version>1.1.0.Final</slf4j-jboss-logmanager.version>
<slf4j-api.version>1.7.30</slf4j-api.version>
<graal-sdk.version>21.2.0</graal-sdk.version>
<plexus-classworlds.version>2.6.0</plexus-classworlds.version> <!-- not actually used but ClassRealm class is referenced from the API used in BootstrapWagonConfigurator -->
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<smallrye-common.version>1.6.0</smallrye-common.version>
<gradle-tooling.version>7.2</gradle-tooling.version>
</properties>
<modules>
<module>bom</module>
<module>bom-test</module>
<module>app-model</module>
<module>maven-resolver</module>
<module>core</module>
<module>maven-plugin</module>
<module>runner</module>
<module>gradle-resolver</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
Expand Down
7 changes: 7 additions & 0 deletions independent-projects/bootstrap/runner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-bom-test</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<gitflow-incremental-builder.version>3.14.3</gitflow-incremental-builder.version>
<quarkus-platform-bom-plugin.version>0.0.22</quarkus-platform-bom-plugin.version>
<quarkus-platform-bom-plugin.version>0.0.31</quarkus-platform-bom-plugin.version>

<skipDocs>false</skipDocs>
<skip.gradle.tests>false</skip.gradle.tests>
Expand Down