Skip to content

Commit c791bf6

Browse files
authored
Merge pull request #577 from graalvm/og/update-maven-plugin-quickstart
Update Getting Started with Maven Plugin doc.
2 parents fd6dd3a + 95f7b4f commit c791bf6

File tree

4 files changed

+32
-9
lines changed

4 files changed

+32
-9
lines changed

docs/src/docs/asciidoc/docinfo-footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<script src="js/multi-lang-sample.js"></script>
33
<div id="footer">
44
<div id="footer-text">
5-
<img src="https://www.graalvm.org/resources/img/logo-colored.svg" alt="GraalVM"> (c) {docyear}. Licensed under the Universal Permissive License (UPL), Version 1.0
5+
<img src="img/GraalVM-rgb.svg" alt="GraalVM"> (c) {docyear}. Licensed under the Universal Permissive License (UPL), Version 1.0
66
</div>
77
</div>

docs/src/docs/asciidoc/gradle-plugin-quickstart.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Two ways of building a native executable using the plugin will be demonstrated:
1414
====
1515
The plugin requires that you https://www.graalvm.org/latest/docs/getting-started/[setup GraalVM].
1616
17-
The easiest way to install GraalVM is to use the https://sdkman.io/jdks[SDKMAN!].
17+
The easiest way to install GraalVM is to use https://sdkman.io/jdks[SDKMAN!].
1818
1919
For other installation options, go to https://www.graalvm.org/downloads/[GraalVM Downloads].
2020
====
Lines changed: 27 additions & 0 deletions
Loading

docs/src/docs/asciidoc/maven-plugin-quickstart.adoc

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You will create a sample application, enable the plugin, add support for dynamic
99
====
1010
The plugin requires that you https://www.graalvm.org/latest/docs/getting-started/[setup GraalVM].
1111
12-
The easiest way to install GraalVM is to use the https://sdkman.io/jdks[SDKMAN!].
12+
The easiest way to install GraalVM is to use https://sdkman.io/jdks[SDKMAN!].
1313
1414
For other installation options, go to https://www.graalvm.org/downloads/[GraalVM Downloads].
1515
====
@@ -314,12 +314,8 @@ With this plugin you can already build a native executable directly with Maven b
314314

315315
== Build a Native Executable by Detecting Resources with the Agent
316316

317-
<<<<<<< HEAD
318317
This demo application and requires metadata before building a native executable.
319318
You do not have to configure anything manually: the plugin can generate the required configuration for you by injecting the https://graalvm.github.io/native-build-tools/latest/maven-plugin.html#agent-support[tracing agent] at package time.
320-
=======
321-
This demo application requires metadata before building a native executable. You do not have to configure anything manually: the plugin can generate the required configuration for you by injecting the https://graalvm.github.io/native-build-tools/latest/maven-plugin.html#agent-support[tracing agent] at package time.
322-
>>>>>>> 24e5db3b (Remove extra word)
323319
The agent is disabled by default, and can be enabled in project's _pom.xml_ file or via the command line.
324320

325321
. To enable the agent via the _pom.xml_ file, specify `<enabled>true</enabled>` in the `native-maven-plugin` plugin configuration:
@@ -442,7 +438,7 @@ executable.
442438
<version>${native.maven.plugin.version}</version>
443439
<extensions>true</extensions>
444440
...
445-
</plugin>
441+
</plugin>
446442
----
447443
. Add an explicit dependency on the `junit-platform-launcher` artifact in the dependencies section of your native profile configuration as in the following example:
448444
+
@@ -459,7 +455,7 @@ executable.
459455
</dependency>
460456
</dependencies>
461457
...
462-
</profile>
458+
</profile>
463459
----
464460
. Create the following test in the _src/test/java/demo/FortuneTest.java_ file:
465461
+

0 commit comments

Comments
 (0)