ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-20 05:37:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

set java version number instead of using env. This is the conventional approach and will eliminate a maven warning

Browse Source
This commit is contained in:
Scott Fennell 2020-02-21 09:50:12 -06:00
parent c857e2f48c
commit 898fc68017
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trick_source/java/CMakeLists.txt
View File

@ -3,4 +3,4 @@
# Build Java
###############################################################
add_custom_target(java ALL COMMAND ${MAVEN_EXECUTABLE} -q package -Dcmake=true -DbuildDirectory=${CMAKE_BINARY_DIR}/libexec/trick/java/build -DTRICK_VERSION="${TRICK_MAJOR}.${TRICK_MINOR}.${TRICK_TINY}${TRICK_PRERELEASE}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
add_custom_target(java ALL COMMAND ${MAVEN_EXECUTABLE} -q package -Dcmake=true -DbuildDirectory=${CMAKE_BINARY_DIR}/libexec/trick/java/build WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

8
trick_source/java/pom.xml
View File

@ -6,7 +6,7 @@
<groupId>trick-java</groupId>
<artifactId>trick-java</artifactId>
<version>${trick_version}</version>
<version>19.2.0-beta</version>
<name>trick-java</name>
@ -18,9 +18,6 @@
<build>
<directory>${buildDirectory}</directory>
</build>
<properties>
<trick_version>${TRICK_VERSION}</trick_version>
</properties>
<activation>
<property>
<name>cmake</name>
@ -30,9 +27,6 @@
</profile>
<profile>
<id>makefile</id>
<properties>
<trick_version>${env.TRICK_VERSION}</trick_version>
</properties>
<activation>
<property>
<name>cmake</name>