JCOBridge.jar postion update with posible override in Maven command line

masesgroup · Nov 7, 2023 · d30a898 · d30a898
1 parent 1bac81b
commit d30a898
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -51,7 +51,7 @@ jobs:
 
       - name: Install local file to be used within Javadoc section of generated POM 
         shell: bash
-        run: mvn install:install-file --no-transfer-progress -Dfile=../../bin/net6.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -f ./src/jvm/src/net6.0.xml
+        run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/net6.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -f ./src/jvm/src/net6.0.xml
 
       - name: Publish net6.0 to Apache Maven Central
         shell: bash
@@ -99,7 +99,7 @@ jobs:
 
       - name: Install local file to be used within Javadoc section of generated POM 
         shell: bash
-        run: mvn install:install-file --no-transfer-progress -Dfile=../../bin/net7.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -f ./src/jvm/src/net7.0.xml
+        run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/net7.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -f ./src/jvm/src/net7.0.xml
 
       - name: Publish net7.0 to Apache Maven Central
         shell: bash
@@ -143,7 +143,7 @@ jobs:
 
       - name: Install local file to be used within Javadoc section of generated POM 
         shell: bash
-        run: mvn install:install-file --no-transfer-progress -Dfile=../../bin/net462/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -f ./src/jvm/src/net462.xml
+        run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/net462/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -f ./src/jvm/src/net462.xml
 
       - name: Publish net462 to Apache Maven Central
         shell: bash

diff --git a/src/net/engine/JCOPOMExtension.template b/src/net/engine/JCOPOMExtension.template
@@ -39,6 +39,7 @@
     <maven.compiler.source>POM_JDK_TARGET</maven.compiler.source>
     <maven.compiler.target>POM_JDK_TARGET</maven.compiler.target>
     <classpathfile>${basedir}/classpathfile.classpath</classpathfile>
+	<runtime_relative_dir>${basedir}/../../../bin/POM_RUNTIME_PLACEHOLDER/</runtime_relative_dir>
   </properties>
   <distributionManagement>
     <snapshotRepository>
@@ -98,7 +99,7 @@
         <configuration>
           <compilerArgs>
             <arg>-cp</arg>
-            <arg>${originalClassPath};${basedir}/../../bin/POM_RUNTIME_PLACEHOLDER/JCOBridge.jar</arg>
+            <arg>${originalClassPath};${runtime_relative_dir}JCOBridge.jar</arg>
           </compilerArgs>
         </configuration>
       </plugin>
@@ -146,7 +147,7 @@
         <version>2.9.1</version>
         <configuration>
           <links>
-            <link>https://www.jcobridge.com/api-java</link>
+            <link>https://www.jcobridge.com/api-java_POM_JCOBRIDGE_VERSION_PLACEHOLDER</link>
           </links>
           <quiet>true</quiet>
           <source>POM_JDK_TARGET</source>

diff --git a/src/net/engine/JCOPOMJCOReflector.template b/src/net/engine/JCOPOMJCOReflector.template
@@ -39,6 +39,7 @@
     <maven.compiler.source>POM_JDK_TARGET</maven.compiler.source>
     <maven.compiler.target>POM_JDK_TARGET</maven.compiler.target>
     <classpathfile>${basedir}/classpathfile.classpath</classpathfile>
+	<runtime_relative_dir>${basedir}/../../../bin/POM_RUNTIME_PLACEHOLDER/</runtime_relative_dir>
   </properties>
   <distributionManagement>
     <snapshotRepository>
@@ -55,7 +56,7 @@
     <sourceDirectory>./JCOReflector</sourceDirectory>
     <resources>
       <resource>
-        <directory>${basedir}/../../bin/POM_RUNTIME_PLACEHOLDER/</directory>
+        <directory>${runtime_relative_dir}</directory>
         <filtering>false</filtering>
         <includes>
           <include>JCOBridge.zip</include>
@@ -110,7 +111,7 @@
         <configuration>
           <compilerArgs>
             <arg>-cp</arg>
-            <arg>${originalClassPath};${basedir}/../../bin/POM_RUNTIME_PLACEHOLDER/JCOBridge.jar</arg>
+            <arg>${originalClassPath};${runtime_relative_dir}JCOBridge.jar</arg>
           </compilerArgs>
         </configuration>
       </plugin>
@@ -158,7 +159,7 @@ POM_SOURCEDIRECTORIES_PLACEHOLDER
         <version>2.9.1</version>
         <configuration>
           <links>
-            <link>https://www.jcobridge.com/api-java</link>
+            <link>https://www.jcobridge.com/api-java_POM_JCOBRIDGE_VERSION_PLACEHOLDER</link>
           </links>
           <quiet>true</quiet>
           <source>POM_JDK_TARGET</source>
@@ -212,4 +213,4 @@ POM_SOURCEDIRECTORIES_PLACEHOLDER
       </plugin>
     </plugins>
   </build>
-</project>
+</project>