Merge pull request #279 from Systems-Modeling/ST6RI-448

ST6RI-448 Strip qualifier from version included in Jupyter installer

Author: seidewitz

org.omg.sysml.jupyter.installer/README.adoc

@@ -2,7 +2,7 @@
 
 == All Operating Systems
 
-1. Install Java 8+, e.g. https://adoptopenjdk.net/index.html?variant=openjdk11&jvmVariant=hotspot[OpenJDK 11].
+1. Install Java 11+, e.g. https://adoptopenjdk.net/index.html?variant=openjdk11&jvmVariant=hotspot[OpenJDK 11].
     * You can check the Java version you have installed by running `java -version` in Terminal (Linux / macOS) or Command Prompt (Windows). See https://www.baeldung.com/java-check-is-installed[How to Check if Java is Installed].
 2. Install https://docs.conda.io/en/latest/miniconda.html[Miniconda] with Python version 3.x.
     * **[Windows]** During installation, enable the "Add Anaconda to my PATH environment variable" option. See https://medium.com/@GalarnykMichael/install-python-on-windows-anaconda-c63c7c3d1444[Install Python on Windows]

org.omg.sysml.jupyter.installer/assembly.xml

@@ -19,12 +19,13 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/target/classes</directory>
+            <directory>${project.basedir}</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>install.bat</include>
                 <include>install.sh</include>
             </includes>
+            <filtered>true</filtered>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>

org.omg.sysml.jupyter.installer/install.bat

@@ -20,7 +20,7 @@
 
 @echo off
 
-set /A SYSML_VERSION="${project.version}"
+set /A SYSML_VERSION="${project.version.unqualified}"
 
 echo --- Step 1: Testing Conda installation ---
 where conda

org.omg.sysml.jupyter.installer/install.sh

@@ -21,7 +21,7 @@
 
 set -e
 
-SYSML_VERSION="${project.version}"
+SYSML_VERSION="${project.version.unqualified}"
 
 echo "--- Step 1: Testing Conda installation ---"
 command -v conda || (echo "Conda is not installed. Please install Conda and re-run." && return 1)

org.omg.sysml.jupyter.installer/pom.xml

@@ -9,23 +9,6 @@
   </parent>
   <artifactId>org.omg.sysml.jupyter.installer</artifactId>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.omg.sysml</groupId>
-      <artifactId>jupyter-sysml-kernel</artifactId>
-      <type>zip</type>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.omg.sysml</groupId>
-      <artifactId>jupyterlab-sysml</artifactId>
-      <type>tgz</type>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <!-- disable Maven's default-compile -->
@@ -52,6 +35,29 @@
           </execution>
         </executions>
       </plugin>
+      <!-- remove qualifier, e.g. "-SNAPSHOT" from version -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>${build-helper-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>regex-property</id>
+            <phase>package</phase>
+            <goals>
+              <goal>regex-property</goal>
+            </goals>
+            <configuration>
+              <name>project.version.unqualified</name>
+              <value>${project.version}</value>
+              <!-- https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string -->
+              <regex>^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$</regex>
+              <replacement>$1.$2.$3</replacement>
+              <failIfNoMatch>true</failIfNoMatch>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <!-- build installer archive -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>