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

Move Maven-based AppModelResolver impl to quarkus-bootstrap-maven-resolver #9923

Merged
merged 1 commit into from
Jun 11, 2020
Merged

Move Maven-based AppModelResolver impl to quarkus-bootstrap-maven-resolver #9923

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
11 changes: 10 additions & 1 deletion bom/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,16 @@
</dependency>

<!-- Quarkus core dependencies -->

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-app-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-maven-resolver</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-core</artifactId>
Expand Down
1 change: 1 addition & 0 deletions core/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
<parentFirstArtifact>org.ow2.asm:asm</parentFirstArtifact>
<parentFirstArtifact>org.ow2.asm:asm-commons</parentFirstArtifact>
<parentFirstArtifact>org.apache.maven:maven-model</parentFirstArtifact>
<parentFirstArtifact>org.codehaus.plexus:plexus-utils</parentFirstArtifact>
<!--
This is a temporary fix, we need a better way to be able to
add these exclusions outside the quarkus-extension.properties file.
Expand Down
4 changes: 0 additions & 4 deletions devtools/platform-descriptor-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-devtools-common</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-core</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bom-descriptor-json</artifactId>
Expand Down
0 ...quarkus/bootstrap/BootstrapConstants.java → ...quarkus/bootstrap/BootstrapConstants.java
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion ...otstrapDependencyProcessingException.java → ...otstrapDependencyProcessingException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package io.quarkus.bootstrap;

import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;

/**
*
* @author Alexey Loubyansky
*/
public class BootstrapDependencyProcessingException extends BootstrapException {
public class BootstrapDependencyProcessingException extends BootstrapMavenException {

/**
*
Expand Down
0 ...p/resolver/BootstrapAppModelResolver.java → ...p/resolver/BootstrapAppModelResolver.java
View file
Open in desktop
File renamed without changes.
0 ...er/maven/BuildDependencyGraphVisitor.java → ...er/maven/BuildDependencyGraphVisitor.java
View file
Open in desktop
File renamed without changes.
0 ...DeploymentInjectingDependencyVisitor.java → ...DeploymentInjectingDependencyVisitor.java
View file
Open in desktop
File renamed without changes.
0 ...r/maven/DeploymentInjectionException.java → ...r/maven/DeploymentInjectionException.java
View file
Open in desktop
File renamed without changes.
0 ...a/io/quarkus/bootstrap/util/ZipUtils.java → ...a/io/quarkus/bootstrap/util/ZipUtils.java
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions independent-projects/tools/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-core</artifactId>
<scope>provided</scope>
<artifactId>quarkus-bootstrap-maven-resolver</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
4 changes: 1 addition & 3 deletions independent-projects/tools/platform-descriptor-resolver-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-core</artifactId>
<scope>provided</scope>
<artifactId>quarkus-bootstrap-maven-resolver</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand All @@ -41,7 +40,6 @@
<artifactId>quarkus-bootstrap-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
<version>${quarkus.version}</version>
</dependency>
</dependencies>
</project>
9 changes: 8 additions & 1 deletion independent-projects/tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-core</artifactId>
<artifactId>quarkus-bootstrap-maven-resolver</artifactId>
<version>${quarkus.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -152,6 +152,13 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
<version>${quarkus.version}</version>
</dependency>
<!-- Jackson dependencies, imported as a BOM -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
Expand Down
21 changes: 21 additions & 0 deletions integration-tests/kotlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@
<name>Quarkus - Integration Tests - Kotlin</name>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kotlin-deployment</artifactId>
Expand All @@ -39,6 +50,16 @@
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
21 changes: 21 additions & 0 deletions integration-tests/scala/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,27 @@
<artifactId>quarkus-test-maven</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down