Skip to content

Commit

Permalink
Upgrade to Quarkus 2.10.1.Final
Browse files Browse the repository at this point in the history
  • Loading branch information
gsmet committed Jun 29, 2022
1 parent 617d68b commit 1393dc9
Show file tree
Hide file tree
Showing 15 changed files with 1,283 additions and 1,232 deletions.
8 changes: 1 addition & 7 deletions generated-platform-project/quarkus-camel/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>2.8.3</version>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
Expand Down Expand Up @@ -672,12 +672,6 @@
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>1.6.7</version>
<exclusions>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1776,7 +1776,7 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>2.8.3</version>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class AddExtensionMojo extends QuarkusProjectMojoBase {
Set<String> extensions;

/**
* For usability reason, this parameter allow adding a single extension.
* For usability reason, this parameter allows adding a single extension.
*/
@Parameter(property = "extension")
String extension;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* Creates the base of a
* <a href="https://quarkus.io/guides/writing-extensions">Quarkus Extension</a> in different layout depending of the options and
* <a href="https://quarkus.io/guides/writing-extensions">Quarkus Extension</a> in different layout depending on the options and
* environment.
* <br />
* <br />
Expand Down Expand Up @@ -116,11 +116,20 @@ public class CreateExtensionMojo extends AbstractMojo {
@Parameter(property = "extensionName")
String extensionName;

/**
* The {@code extensionDescription} of the runtime module.
* <br />
* <br />
* This description is used on https://code.quarkus.io/.
*/
@Parameter(property = "extensionDescription")
String extensionDescription;

/**
* A prefix common to all extension names in the current source tree.
* <br />
* <br />
* Default: "quarkus-" in quarkus Quarkus Core and Quarkiverse else ""
* Default: "quarkus-" in Quarkus Core and Quarkiverse else ""
*/
@Parameter(property = "namespaceName")
String namespaceName;
Expand Down Expand Up @@ -222,6 +231,7 @@ public void execute() throws MojoExecutionException {
final CreateExtension createExtension = new CreateExtension(basedir.toPath())
.extensionId(extensionId)
.extensionName(extensionName)
.extensionDescription(extensionDescription)
.groupId(groupId)
.version(version)
.packageName(packageName)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ protected MavenArtifactResolver resolver() throws BootstrapMavenException {
// The session should be initialized with the loaded workspace
//.setRepositorySystemSession(repoSession)
.setRemoteRepositories(repos)
// To support multimodule projects that haven't been installed
// To support multi-module projects that haven't been installed
.setPreferPomsFromWorkspace(true)
.build()
: resolver;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public class DevMojo extends AbstractMojo {

/**
* If this server should be started in debug mode. The default is to start in debug mode and listen on
* port 5005. Whether or not the JVM is suspended waiting for a debugger to be attached,
* port 5005. Whether the JVM is suspended waiting for a debugger to be attached,
* depends on the value of {@link #suspend}.
* <p>
* {@code debug} supports the following options:
Expand Down Expand Up @@ -216,9 +216,9 @@ public class DevMojo extends AbstractMojo {
@Parameter(defaultValue = "${open-lang-package}")
private boolean openJavaLang;
/**
* Whether or not the JVM launch, in debug mode, should be suspended. This parameter is only
* Whether the JVM launch, in debug mode, should be suspended. This parameter is only
* relevant when the JVM is launched in {@link #debug debug mode}. This parameter supports the
* following values (all the allowed values are case insensitive):
* following values (all the allowed values are case-insensitive):
* <table>
* <th>
* <td>Value</td>
Expand Down Expand Up @@ -290,14 +290,14 @@ public class DevMojo extends AbstractMojo {

/**
* This value is intended to be set to true when some generated bytecode
* is erroneous causing the JVM to crash when the verify:none option is set (which is on by default)
* is erroneous causing the JVM to crash when the <code>verify:none</code> option is set (which is on by default)
*/
@Parameter(defaultValue = "${preventnoverify}")
private boolean preventnoverify = false;

/**
* Whether changes in the projects that appear to be dependencies of the project containing the application to be launched
* should trigger hot-reload. By default they do.
* should trigger hot-reload. By default, they do.
*/
@Parameter(defaultValue = "${noDeps}")
private boolean noDeps = false;
Expand Down Expand Up @@ -334,7 +334,7 @@ public class DevMojo extends AbstractMojo {
private String target;

/**
* Whether or not to enforce the quarkus-maven-plugin build goal to be configured.
* Whether to enforce the quarkus-maven-plugin build goal to be configured.
* By default, a missing build goal is considered an inconsistency (although the build goal is not <i>required</i>
* technically).
* In this case a warning will be logged and the application will not be started.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void execute() throws MojoExecutionException {
final Path projectDirPath = baseDir();
BuildTool buildTool = QuarkusProject.resolveExistingProjectBuildTool(projectDirPath);
if (buildTool == null) {
// it's not Gradle and the pom.xml not found, so we assume there is not project at all
// it's not Gradle and the pom.xml not found, so we assume there is no project at all
buildTool = BuildTool.MAVEN;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ protected MavenArtifactResolver initArtifactResolver() throws MojoExecutionExcep
// The session should be initialized with the loaded workspace
//.setRepositorySystemSession(repoSession)
.setRemoteRepositories(repos)
// To support multimodule projects that haven't been installed
// To support multi-module projects that haven't been installed
.setPreferPomsFromWorkspace(true)
.build();
} catch (BootstrapMavenException e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class RemoveExtensionMojo extends QuarkusProjectMojoBase {
Set<String> extensions;

/**
* For usability reason, this parameter allow removing a single extension.
* For usability reason, this parameter allows removing a single extension.
*/
@Parameter(property = "extension")
String extension;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ private void enforce(Log log,
}

/**
* Copied from Artifact.VersionRange. This is tweaked to handle singular ranges properly. Currently the default
* containsVersion method assumes a singular version means allow everything.
* Copied from Artifact.VersionRange. This is tweaked to handle singular ranges properly. Currently, the default
* <code>containsVersion</code> method assumes a singular version means allow everything.
*
* @param allowedRange range of allowed versions.
* @param theVersion the version to be checked.
Expand Down
Loading

0 comments on commit 1393dc9

Please sign in to comment.