This is an automated email from the ASF dual-hosted git repository. pradeep pushed a commit to branch RANGER-4076_master in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 5cc7c1e4aaf2a3acc5bcb5a5d9aca58722b531b6 Author: Kishor Gollapalliwar <[email protected]> AuthorDate: Mon Dec 8 14:51:38 2025 +0530 RANGER-4076: pom & config changes for jdk17 build --- agents-common/pom.xml | 22 ++++++++++++++++------ distro/src/main/assembly/admin-web.xml | 2 +- docs/src/site/resources/index.js | 4 ++-- hive-agent/pom.xml | 6 ++++++ pom.xml | 16 +++++++++++----- security-admin/pom.xml | 6 ++++++ 6 files changed, 42 insertions(+), 14 deletions(-) diff --git a/agents-common/pom.xml b/agents-common/pom.xml index 5870af008..3f498c784 100644 --- a/agents-common/pom.xml +++ b/agents-common/pom.xml @@ -168,11 +168,7 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <!-- To be added for JDK15 and above + <dependency> <groupId>org.graalvm.js</groupId> <artifactId>js</artifactId> @@ -183,7 +179,21 @@ <artifactId>js-scriptengine</artifactId> <version>${graalvm.version}</version> </dependency> - --> + <dependency> + <groupId>org.graalvm.sdk</groupId> + <artifactId>graal-sdk</artifactId> + <version>${graalvm.version}</version> + </dependency> + <dependency> + <groupId>org.graalvm.truffle</groupId> + <artifactId>truffle-api</artifactId> + <version>${graalvm.version}</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + <!-- Test --> <dependency> <groupId>org.junit.jupiter</groupId> diff --git a/distro/src/main/assembly/admin-web.xml b/distro/src/main/assembly/admin-web.xml index 720f7e14a..2194e226d 100644 --- a/distro/src/main/assembly/admin-web.xml +++ b/distro/src/main/assembly/admin-web.xml @@ -610,7 +610,7 @@ <exclude>index.html</exclude> </excludes> <includes> - <include>swagger.json</include> + <include>openapi.json</include> </includes> <fileMode>544</fileMode> </fileSet> diff --git a/docs/src/site/resources/index.js b/docs/src/site/resources/index.js index 40a370056..870544a1a 100644 --- a/docs/src/site/resources/index.js +++ b/docs/src/site/resources/index.js @@ -39,7 +39,7 @@ const rangerLogo = `<svg width="130" height="40" viewBox="0 0 130 40" fill="none window.onload = function() { const ui = SwaggerUIBundle({ - url: getSwaggerBaseUrl(window.location.pathname) + "/swagger.json", + url: getSwaggerBaseUrl(window.location.pathname) + "/openapi.json", dom_id: '#swagger-ui', deepLinking: true, presets: [ @@ -51,7 +51,7 @@ window.onload = function() { ], layout: "StandaloneLayout", requestInterceptor: function(request) { - if (!request.url.includes("swagger.json")) { + if (!request.url.includes("openapi.json")) { request.url = getAPIUrl(request.url); } if (request.method != "GET") { diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml index 825f0f1e5..aae776150 100644 --- a/hive-agent/pom.xml +++ b/hive-agent/pom.xml @@ -207,6 +207,12 @@ <artifactId>javax.el</artifactId> <version>${javax.el.version}</version> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client-runtime</artifactId> + <version>${hadoop.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> diff --git a/pom.xml b/pom.xml index e703f964a..bc74266e0 100755 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ <dnsjava.version>3.6.2</dnsjava.version> <eclipse.jpa.version>2.7.12</eclipse.jpa.version> <elasticsearch.version>7.17.29</elasticsearch.version> - <enunciate.version>2.13.2</enunciate.version> + <enunciate.version>2.15.0</enunciate.version> <fasterxml.jackson.databind.version>2.17.2</fasterxml.jackson.databind.version> <fasterxml.jackson.version>2.17.2</fasterxml.jackson.version> <fasterxml.woodstox.version>5.4.0</fasterxml.woodstox.version> @@ -124,9 +124,9 @@ <!-- JaCoCo Properties --> <jacoco.version>0.8.13</jacoco.version> - <java.version.required>1.8</java.version.required> - <javac.source.version>1.8</javac.source.version> - <javac.target.version>1.8</javac.target.version> + <java.version.required>17</java.version.required> + <javac.source.version>17</javac.source.version> + <javac.target.version>17</javac.target.version> <javax-inject.version>1</javax-inject.version> <javax.annotation-api>1.3.2</javax.annotation-api> <javax.el.version>3.0.1-b12</javax.el.version> @@ -379,7 +379,9 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${maven.surefire.plugin.version}</version> <configuration> - <argLine>${argLine} -Djava.library.path="${hadoop.library.path}${path.separator}${java.library.path}"</argLine> + <argLine>${argLine} -Djava.library.path="${hadoop.library.path}${path.separator}${java.library.path}" + --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/com.sun.crypto.provider=ALL-UNNAMED</argLine> <skipTests>${skipTests}</skipTests> <encoding>UTF-8</encoding> <systemProperties> @@ -391,6 +393,10 @@ <name>catalina.base</name> <value>${project.build.directory}</value> </property> + <property> + <name>polyglot.engine.WarnInterpreterOnly</name> + <value>false</value> + </property> </systemProperties> </configuration> </plugin> diff --git a/security-admin/pom.xml b/security-admin/pom.xml index 135f3184a..1d66c02ef 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -544,6 +544,12 @@ <groupId>org.apache.ranger</groupId> <artifactId>ugsync-util</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.ranger</groupId>
