Merge pull request #98 from filip26/patch/build

0.9.0
filip26 · Jul 27, 2024 · 9dd586b · 9dd586b
2 parents 87edc7e + 1f28e01
commit 9dd586b
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 10 deletions.
diff --git a/.github/workflows/executables.yml b/.github/workflows/executables.yml
@@ -37,7 +37,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 'Build Native Image'
-        run: mvn package -P native-image
+        run: mvn package -P native
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/README.md b/README.md
@@ -5,11 +5,11 @@ A simple command line utility allowing to process JSON-LD, RDF, and CBOR-LD, doc
 ## Features
 
 * [JSON-LD 1.1](https://www.w3.org/TR/json-ld/) 
-* [CBOR-LD 1.0](https://digitalbazaar.github.io/cbor-ld-spec/)
+* [CBOR-LD 1.0](https://json-ld.github.io/cbor-ld-spec/)
 
 ## Installation
 
-[Downloads](https://github.com/filip26/ld-cli/releases/tag/v0.8.0)
+[Downloads](https://github.com/filip26/ld-cli/releases/)
 
 ```bash
 > unzip ld-cli-....zip
@@ -71,11 +71,10 @@ All PR's welcome!
 
 ### Building
 
-1. [Install GraalVM and Native Image](https://www.graalvm.org/java/quickstart/)
-   - download and unpack ```graalvm-ce-java17-[platform]-[version].tar.gz```
+1. [Install GraalVM and Native Image](https://www.graalvm.org/latest/docs/)
+   - download and unpack ```graalvm-jdk-....tar.gz```
    - set ```JAVA_HOME``` and ```PATH``` env variables
-   - ```gu install native-image```
-3. ```mvn clean package -P native-image```
+3. ```mvn clean package -Pnative```
 4. ```./target/ld-cli```
 
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.apicatalog</groupId>
     <artifactId>ld-cli</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.0</version>
     <packaging>jar</packaging>
 
     <name>A Command Line Processor for Linked Data Processing</name>
@@ -34,7 +34,9 @@
         <graal.version>24.0.2</graal.version>
         <picocli.version>4.7.6</picocli.version>
         <picocli-jansi-graalvm.version>1.2.0</picocli-jansi-graalvm.version>
-        <jansi.version>1.18</jansi.version>
+
+        <jansi.version>2.4.1</jansi.version>
+<!--        <jansi.version>1.18</jansi.version>-->
 
         <junit.jupiter.version>5.10.3</junit.jupiter.version>
     </properties>
@@ -118,6 +120,7 @@
                     <compilerArgs>
                         <arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
                     </compilerArgs>
+                    <fork>true</fork>
                 </configuration>
             </plugin>
             <plugin>
@@ -132,6 +135,14 @@
                         <id>default-jar</id>
                     </execution>
                 </executions>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.apicatalog.App</mainClass>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -163,6 +174,48 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>native</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <version>0.10.2</version>
+                        <extensions>true</extensions>
+                        <configuration>
+<!--                            <imageName>${command.name}</imageName>-->
+<!--                            <mainClass>${mainClass}</mainClass>-->
+                            <buildArgs>&#45;&#45;no-server &#45;&#45;no-fallback
+                                &#45;&#45;report-unsupported-elements-at-runtime
+                                &#45;H:+UnlockExperimentalVMOptions
+                                &#45;H:+ReportExceptionStackTraces
+                                &#45;H:+AddAllCharsets                                
+                                &#45;H:ReflectionConfigurationFiles=${project.basedir}/graal.json
+                                &#45;H:IncludeResourceBundles=org.glassfish.json.messages
+                                &#45;H:IncludeResources=.*/.*jsonld$</buildArgs>
+                        </configuration>
+
+                        <executions>
+                            <execution>
+                                <id>build-native</id>
+                                <goals>
+                                    <goal>compile-no-fork</goal>
+                                </goals>
+                                <phase>package</phase>
+                            </execution>
+                            <execution>
+                                <id>test-native</id>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <phase>test</phase>
+                            </execution>
+                        </executions>
+                    </plugin>                  
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>native-image</id>
             <activation>

diff --git a/src/main/java/com/apicatalog/cli/App.java b/src/main/java/com/apicatalog/cli/App.java
@@ -37,7 +37,7 @@
     version = {
             "ld-cli            0.9.0  https://github.com/filip26/ld-cli",
             "titanium-json-ld  1.4.1  https://github.com/filip26/titanium-json-ld",
-            "iridium-cbor-ld   0.2.0  https://github.com/filip26/iridium-cbor-ld",
+            "iridium-cbor-ld   0.2.2  https://github.com/filip26/iridium-cbor-ld",
             }
     )
 public final class App {