This is an automated email from the ASF dual-hosted git repository.
kpvdr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git
The following commit(s) were added to refs/heads/main by this push:
new 0e5dafc Updates for Java 11, DotNet 5.0, Rhea and other Java deps
0e5dafc is described below
commit 0e5dafc14d539af317dc4f38e0201939cfc2c4e3
Author: Kim van der Riet <kvand...@redhat.com>
AuthorDate: Tue May 4 12:03:59 2021 -0400
Updates for Java 11, DotNet 5.0, Rhea and other Java deps
---
.gitignore | 2 ++
CMakeLists.txt | 5 ++---
pom.xml | 21 ++++++++++++---------
shims/amqpnetlite/src/CMakeLists.txt | 4 ++--
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index cac0800..c2bcbe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,8 @@
#
/target/
/build/
+/build.old/
+build.sh
/docs/users-guide.html
/src/python/qpid_interop_test/amqp_complex_types_test_data.*
.project
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b8720f..795aef8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,9 +68,8 @@ if (NOT PYTHON2_FOUND)
endif ()
find_python(python3 "PYTHON3_FOUND" "PYTHON3_VER" "PYTHON3_SITE_DIR_NAME")
-# Find Java
-
-find_package(Java 1.8 COMPONENTS Development)
+# Find Java 11
+find_package(Java 11 COMPONENTS Development)
# if (NOT Java_FOUND)
# RHEL7 bug: Java_FOUND is not being set, so workaround:
if (NOT DEFINED Java_JAVA_EXECUTABLE OR NOT DEFINED Java_JAVAC_EXECUTABLE OR
NOT DEFINED Java_JAR_EXECUTABLE)
diff --git a/pom.xml b/pom.xml
index b3ef087..4c06a71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,24 +46,25 @@
</scm>
<properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- <maven-assembly-plugin-version>2.6</maven-assembly-plugin-version>
- <surefire.version>2.21.0</surefire.version>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ <maven-assembly-plugin-version>3.3.0</maven-assembly-plugin-version>
+ <surefire.version>3.0.0-M5</surefire.version>
+ <maven-compiler-plugin-version>3.8.0</maven-compiler-plugin-version>
<!-- Dependency versions -->
<geronimo.jms.2.spec-version>1.0-alpha-2</geronimo.jms.2.spec-version>
- <json-version>1.1</json-version>
- <qpid-jms-client-version>0.34.0</qpid-jms-client-version>
- <slf4j-version>1.7.25</slf4j-version>
-
+ <json-version>1.1.4</json-version>
+ <qpid-jms-client-version>0.58.0</qpid-jms-client-version>
+ <slf4j-version>1.7.30</slf4j-version>
+
</properties>
<modules>
<module>shims/qpid-jms</module>
<module>utils</module>
</modules>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -99,7 +100,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin-version}</version>
<configuration>
+ <release>11</release>
<optimize>true</optimize>
<debug>true</debug>
<showDeprecation>true</showDeprecation>
diff --git a/shims/amqpnetlite/src/CMakeLists.txt
b/shims/amqpnetlite/src/CMakeLists.txt
index 49db295..930c737 100644
--- a/shims/amqpnetlite/src/CMakeLists.txt
+++ b/shims/amqpnetlite/src/CMakeLists.txt
@@ -18,7 +18,7 @@
#
# Building AMQP.Net Lite shim requires
-# * DotNet version 2.1
+# * DotNet version 5.0
#
# Define -DBUILD_AMQPNETLITE=ON (or OFF) at the cmake command line
# to force a build or not.
@@ -101,7 +101,7 @@ ENDMACRO (define_lite_test)
set(build_amqpnetlite_default ON) # Set BUILD_AMQPNETLITE control variable
based on prerequisites being present
-set(REQUIRED_DOTNET_VERSION 2.1)
+set(REQUIRED_DOTNET_VERSION 5.0)
set(BUILD_CONFIG Release) # Debug or Release
# --- Check prerequisites ---
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
