diff --git a/.github/workflows/gradle.yml b/.github/workflows/maven.yml similarity index 86% rename from .github/workflows/gradle.yml rename to .github/workflows/maven.yml index c9c48c5..8db6eb1 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/maven.yml @@ -1,7 +1,7 @@ # This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven --- -name: Java CI with Gradle +name: Java CI with Maven on: push: @@ -22,11 +22,11 @@ jobs: with: java-version: '11' distribution: 'adopt' - cache: gradle + cache: maven - name: Set up OpenPolicyAgent run: | - curl -L -o opa https://openpolicyagent.org/downloads/v0.33.1/opa_linux_amd64_static + curl -L -o opa https://openpolicyagent.org/downloads/v0.46.1/opa_linux_amd64_static chmod +x opa sudo mv opa /usr/local/bin/opa - - name: Build with Gradle - run: ./gradlew build + - name: Build with Maven + run: mvn -B package diff --git a/.gitignore b/.gitignore index 54a5f5d..eeb89d2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ # Ignore Gradle build output directory build -.idea \ No newline at end of file +.idea + +target \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 21d6c75..408effb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## [Unreleased] +## Changed + +- Changed build system to Maven ([#61]). +- Changed module prefix from `de` to `tech` ([#61]). + +[#61]: https://github.com/stackabletech/druid-opa-authorizer/pull/61 + ## [0.3.0] - 2022-10-13 ## Changed diff --git a/README.md b/README.md index 09bd10f..70c0a0f 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,11 @@ A Druid extension to request policy decisions from the [Open Policy Agent](https://www.openpolicyagent.org/) (OPA). ## Building -Simply building the library: +This repository uses maven: - ./gradlew build + mvn package -To build a zip that's easy to use with Druid use: - - ./gradlew distZip - -The zip still has to be modified a bit, all the jars should be at the top level. At the moment this needs to be done by hand. +The packaged zip plugin is located at `target/druid-opa-authorizer-0.3.0.zip`. ## Installing Build the distribution (zip with all the dependencies) and put it all in the extensions directory. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 41d9927..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index aa991fc..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100755 index 1b6c787..0000000 --- a/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed 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 -# -# https://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. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/lib/build.gradle b/lib/build.gradle deleted file mode 100644 index d8f7a8f..0000000 --- a/lib/build.gradle +++ /dev/null @@ -1,63 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * This generated file contains a sample Java library project to get you started. - * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle - * User Manual available at https://docs.gradle.org/7.4/userguide/building_java_projects.html - */ - -plugins { - // Apply the java-library plugin for API and implementation separation. - id 'java-library' - // The distribution plugin to distribute our lib with dependencies - id 'java-library-distribution' -} - -// Druid 0.23.0 uses Java 11 -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) - } -} - -distributions { - main { - distributionBaseName = 'druid-opa-authorizer' - } -} - -repositories { - // Use Maven Central for resolving dependencies. - mavenCentral() - - // "hyperic:sigar, a transitive dependency of druid, cannot be found in maven central - maven { - url "https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/" - } -} - -dependencies { - // Use JUnit Jupiter for testing. - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' - - // This dependency is exported to consumers, that is to say found on their compile classpath. - api 'org.apache.commons:commons-math3:3.6.1' - - // This dependency is used internally, and not exposed to consumers on their own compile classpath. - implementation 'com.google.guava:guava:30.1.1-jre' - - // The dependency to import the Authorizer interface - compileOnly 'org.apache.druid:druid:24.0.0' - - compileOnly 'org.apache.druid:druid-core:24.0.0' - - compileOnly 'org.apache.druid:druid-server:24.0.0' - - // For JSON serialize/deserialize in OPA communication - implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3' -} - -tasks.named('test') { - // Use JUnit Platform for unit tests. - useJUnitPlatform() -} diff --git a/lib/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/lib/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule deleted file mode 100644 index 6131797..0000000 --- a/lib/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -de.stackable.druid.opaauthorizer.OpaDruidModule diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..1b048b9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,81 @@ + + + 4.0.0 + + tech.stackable + druid-opa-authorizer + 0.4.0 + + + UTF-8 + + + + + com.google.guava + guava + 30.1.1-jre + compile + + + com.fasterxml.jackson.core + jackson-databind + 2.13.3 + compile + + + + org.apache.druid + druid-core + 24.0.0 + provided + + + org.apache.druid + druid-server + 24.0.0 + provided + + + + org.junit.jupiter + junit-jupiter + 5.8.2 + test + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 11 + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + false + + src/main/assembly/zip.xml + + + + + + + + diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 7ad3fd6..0000000 --- a/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user manual at https://docs.gradle.org/7.4/userguide/multi_project_builds.html - */ - -rootProject.name = 'druid-opa-authorizer' -include('lib') diff --git a/src/main/assembly/zip.xml b/src/main/assembly/zip.xml new file mode 100644 index 0000000..15f668a --- /dev/null +++ b/src/main/assembly/zip.xml @@ -0,0 +1,26 @@ + + + zip + false + + tar.gz + + + + /${project.artifactId} + ${project.build.directory}/${project.artifactId}-${project.version}.jar + + + + + /${project.artifactId} + + ${project.groupId}:${project.artifactId}:jar:* + + + + \ No newline at end of file diff --git a/lib/src/main/java/de/stackable/druid/opaauthorizer/OpaAuthorizer.java b/src/main/java/tech/stackable/druid/opaauthorizer/OpaAuthorizer.java similarity index 92% rename from lib/src/main/java/de/stackable/druid/opaauthorizer/OpaAuthorizer.java rename to src/main/java/tech/stackable/druid/opaauthorizer/OpaAuthorizer.java index 8f09d7b..c84cb9f 100644 --- a/lib/src/main/java/de/stackable/druid/opaauthorizer/OpaAuthorizer.java +++ b/src/main/java/tech/stackable/druid/opaauthorizer/OpaAuthorizer.java @@ -1,15 +1,12 @@ -/* - * This Java source file was generated by the Gradle 'init' task. - */ -package de.stackable.druid.opaauthorizer; +package tech.stackable.druid.opaauthorizer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.stackable.druid.opaauthorizer.opatypes.OpaMessage; -import de.stackable.druid.opaauthorizer.opatypes.OpaResponse; +import tech.stackable.druid.opaauthorizer.opatypes.OpaMessage; +import tech.stackable.druid.opaauthorizer.opatypes.OpaResponse; import org.apache.druid.server.security.*; import org.apache.druid.java.util.common.logger.Logger; diff --git a/lib/src/main/java/de/stackable/druid/opaauthorizer/OpaDruidModule.java b/src/main/java/tech/stackable/druid/opaauthorizer/OpaDruidModule.java similarity index 93% rename from lib/src/main/java/de/stackable/druid/opaauthorizer/OpaDruidModule.java rename to src/main/java/tech/stackable/druid/opaauthorizer/OpaDruidModule.java index ce7b4f7..9ddd015 100644 --- a/lib/src/main/java/de/stackable/druid/opaauthorizer/OpaDruidModule.java +++ b/src/main/java/tech/stackable/druid/opaauthorizer/OpaDruidModule.java @@ -1,4 +1,4 @@ -package de.stackable.druid.opaauthorizer; +package tech.stackable.druid.opaauthorizer; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaInput.java b/src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaInput.java similarity index 86% rename from lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaInput.java rename to src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaInput.java index 685968a..33c2e60 100644 --- a/lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaInput.java +++ b/src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaInput.java @@ -1,4 +1,4 @@ -package de.stackable.druid.opaauthorizer.opatypes; +package tech.stackable.druid.opaauthorizer.opatypes; public class OpaInput { public String user; diff --git a/lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaMessage.java b/src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaMessage.java similarity index 81% rename from lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaMessage.java rename to src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaMessage.java index d06bb9c..0fc7ac9 100644 --- a/lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaMessage.java +++ b/src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaMessage.java @@ -1,4 +1,4 @@ -package de.stackable.druid.opaauthorizer.opatypes; +package tech.stackable.druid.opaauthorizer.opatypes; public class OpaMessage { public OpaInput input; diff --git a/lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaResource.java b/src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaResource.java similarity index 78% rename from lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaResource.java rename to src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaResource.java index f77d7d0..435e26d 100644 --- a/lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaResource.java +++ b/src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaResource.java @@ -1,4 +1,4 @@ -package de.stackable.druid.opaauthorizer.opatypes; +package tech.stackable.druid.opaauthorizer.opatypes; public class OpaResource { public String name; diff --git a/lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaResponse.java b/src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaResponse.java similarity index 51% rename from lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaResponse.java rename to src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaResponse.java index 6d77778..616b45a 100644 --- a/lib/src/main/java/de/stackable/druid/opaauthorizer/opatypes/OpaResponse.java +++ b/src/main/java/tech/stackable/druid/opaauthorizer/opatypes/OpaResponse.java @@ -1,4 +1,4 @@ -package de.stackable.druid.opaauthorizer.opatypes; +package tech.stackable.druid.opaauthorizer.opatypes; public class OpaResponse { public boolean result; diff --git a/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 0000000..1fbd609 --- /dev/null +++ b/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +tech.stackable.druid.opaauthorizer.OpaDruidModule diff --git a/lib/src/test/java/de/stackable/druid/opaauthorizer/LibraryTest.java b/src/test/java/de/stackable/druid/opaauthorizer/LibraryTest.java similarity index 87% rename from lib/src/test/java/de/stackable/druid/opaauthorizer/LibraryTest.java rename to src/test/java/de/stackable/druid/opaauthorizer/LibraryTest.java index bc91bbb..5b76407 100644 --- a/lib/src/test/java/de/stackable/druid/opaauthorizer/LibraryTest.java +++ b/src/test/java/de/stackable/druid/opaauthorizer/LibraryTest.java @@ -1,7 +1,7 @@ /* * This Java source file was generated by the Gradle 'init' task. */ -package de.stackable.druid.opaauthorizer; +package tech.stackable.druid.opaauthorizer; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*;