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

Upgrade Maven resolver related dependencies used by bootstrap #7459

Merged
merged 1 commit into from
Feb 27, 2020
Merged

Upgrade Maven resolver related dependencies used by bootstrap #7459

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
12 changes: 6 additions & 6 deletions bom/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@
<asm.version>7.3.1</asm.version>
<commons-io.version>2.6</commons-io.version>
<jboss-metadata-web.version>11.0.0.Final</jboss-metadata-web.version>
<maven-core.version>3.5.4</maven-core.version>
<maven-resolver.version>1.1.1</maven-resolver.version>
<maven-toolchain.version>3.0-alpha-2</maven-toolchain.version>
<maven-core.version>3.6.3</maven-core.version>
<maven-resolver.version>1.4.1</maven-resolver.version>
<maven-toolchain.version>3.0.0</maven-toolchain.version>
<guava.version>27.0.1-jre</guava.version>
<plexus-utils.version>3.0.24</plexus-utils.version>
<maven-plugin-annotations.version>3.5.2</maven-plugin-annotations.version>
<plexus-component-annotations.version>1.7.1</plexus-component-annotations.version>
<plexus-utils.version>3.2.1</plexus-utils.version>
<maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
<plexus-component-annotations.version>2.1.0</plexus-component-annotations.version>
<!-- What we actually depend on for the annotations, as latest Graal is not available in Maven fast enough: -->
<graal-sdk.version>19.3.1</graal-sdk.version>
<gizmo.version>1.0.2.Final</gizmo.version>
Expand Down
4 changes: 4 additions & 0 deletions devtools/maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
5 changes: 4 additions & 1 deletion ...spring-di/deployment/src/main/java/io/quarkus/spring/di/deployment/SpringDIProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,10 @@ private void visitAnnotation(final DotName clazz, final IndexView index, final M
visitAnnotation(annotation, index, deps, visited, ret);
}
}
ret.add(index.getClassByName(clazz));
final ClassInfo classInfo = index.getClassByName(clazz);
if (classInfo != null) {
ret.add(classInfo);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@geoand can you check that change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw an NPE there.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw an NPE there.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, not at this line exactly.

}

/**
Expand Down
1 change: 0 additions & 1 deletion ...ootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ public static BootstrapMavenOptions getBootstrapMavenOptions() {
}

public static RepositorySystem getRepositorySystem(boolean offline, WorkspaceModelResolver wsModelResolver) {

final DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator();
if (!offline) {
locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
Expand Down
18 changes: 14 additions & 4 deletions independent-projects/bootstrap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
<eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
<jboss-logging.version>3.3.2.Final</jboss-logging.version>
<junit.version>5.5.2</junit.version>
<maven-core.version>3.5.4</maven-core.version>
<maven-plugin-annotations.version>3.5.2</maven-plugin-annotations.version>
<maven-resolver.version>1.1.1</maven-resolver.version>
<maven-wagon.version>3.0.0</maven-wagon.version>
<maven-core.version>3.6.3</maven-core.version>
<maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
<maven-resolver.version>1.4.1</maven-resolver.version>
<maven-wagon.version>3.3.4</maven-wagon.version>
<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>
Expand Down Expand Up @@ -136,6 +136,10 @@
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -169,6 +173,12 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings-builder</artifactId>
<version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
Expand Down
4 changes: 4 additions & 0 deletions independent-projects/tools/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
4 changes: 4 additions & 0 deletions tcks/microprofile-opentracing/base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
</exclusion>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down