This is an automated email from the ASF dual-hosted git repository.
kpvdr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git
The following commit(s) were added to refs/heads/master by this push:
new 073db2f Update to remove dependency on perl-XML-XPath, use mvn query
instead to extract version from pom.xml
073db2f is described below
commit 073db2f3a7cd35a6fcaa8ee23d0cb114141dfc7a
Author: Kim van der Riet <k...@vanderriet.com>
AuthorDate: Fri Jan 15 12:54:08 2021 -0500
Update to remove dependency on perl-XML-XPath, use mvn query instead to
extract version from pom.xml
---
CMakeLists.txt | 10 ----------
get-proj-ver | 25 -------------------------
shims/qpid-jms/CMakeLists.txt | 5 ++---
3 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8baa4ee..6b8720f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,16 +89,6 @@ else ()
message (STATUS "Maven found: ${Maven}")
endif ()
-# Find xpath
-
-find_program(Xpath xpath)
-if (Xpath STREQUAL "Xpath-NOTFOUND")
- message(STATUS "ERROR: xpath not found, but is required")
- set (ErrorFlag TRUE)
-else ()
- message(STATUS "xpath found: ${Xpath}")
-endif ()
-
# Find Proton components
find_package(Proton 0.30)
diff --git a/get-proj-ver b/get-proj-ver
deleted file mode 100755
index 478a7e1..0000000
--- a/get-proj-ver
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/perl
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-use strict;
-use warnings;
-use XML::XPath;
-
-my $root = XML::XPath->new(filename => $ARGV[0]);
-for my $node ($root->find('//project/version/text()')->get_nodelist) {
- print($node->getData, "\n");
-}
diff --git a/shims/qpid-jms/CMakeLists.txt b/shims/qpid-jms/CMakeLists.txt
index bda737b..588ad41 100644
--- a/shims/qpid-jms/CMakeLists.txt
+++ b/shims/qpid-jms/CMakeLists.txt
@@ -27,9 +27,8 @@ add_custom_target(jms-shims ALL ${Maven} -DskipTests package
set(JMS_INSTALL_ROOT
${CMAKE_INSTALL_PREFIX}/libexec/qpid_interop_test/shims/qpid-jms)
# Find the version string from the pom.xml file (as this in included in the
jar file name)
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/get-proj-ver
${CMAKE_SOURCE_DIR}/pom.xml
- OUTPUT_VARIABLE QPID_JMS_SHIM_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND mvn
org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate
-Dexpression=project.version -q -DforceStdout
+ OUTPUT_VARIABLE QPID_JMS_SHIM_VERSION)
message(STATUS "Qpid JMS shim version: ${QPID_JMS_SHIM_VERSION}")
install(FILES
"${CMAKE_CURRENT_SOURCE_DIR}/target/qpid-interop-test-jms-shim-${QPID_JMS_SHIM_VERSION}-jar-with-dependencies.jar"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
