Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/query microservices #2

Merged
merged 23 commits into from
May 20, 2024
Merged

Feature/query microservices #2

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
db9e64c
initial commit of cached results starter for query microservices
jwomeara Mar 3, 2023
9881af0
Updated to work with accumulo 2.x
jwomeara Apr 8, 2023
673e5d5
Upped version to 5.3.0-SNAPSHOT
jwomeara May 2, 2023
5d2687d
Updated datawave to 5.4.0-SNAPSHOT
jwomeara May 6, 2023
b037287
bumped datawave version.
jwomeara May 12, 2023
a61efd8
Fixed the cached results monitor
jwomeara May 19, 2023
bcfe9f5
bumped datawave version
jwomeara May 19, 2023
e15e161
Merge remote-tracking branch 'origin' into feature/queryMicroservices…
jwomeara May 23, 2023
8cefc8e
Updated datawave version
jwomeara Jun 23, 2023
c1d821b
updated formatting using impsort plugin
jwomeara Jun 27, 2023
a94b8d5
Moved Query, QueryImpl to query-api
jwomeara Aug 7, 2023
82527d0
Updated with latest changes from integration
jwomeara Sep 14, 2023
cd59de1
bumped release version
jwomeara Sep 18, 2023
775945d
bumped microservice service parent version
jwomeara Oct 10, 2023
df3b23e
Updated versions to use proper semver
jwomeara Oct 20, 2023
95c8004
Added qualifier for cache inspector supplier
jwomeara Nov 22, 2023
32816a1
Added maven repo access token configuration for github actions
jwomeara Jan 24, 2024
ad844fc
Implemented authorization and query federation for the query microser…
jwomeara Mar 18, 2024
cadb0d7
PR feedback
jwomeara Apr 26, 2024
f3a00ba
PR feedback
jwomeara Apr 29, 2024
e085273
PR feedback
jwomeara May 1, 2024
c4ab4f0
pr feedback
jwomeara May 2, 2024
098d6c0
pr feedback
jwomeara May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">

<interactiveMode/>

<offline/>

<pluginGroups/>

<mirrors/>

<proxies/>

<servers>
<server>
<id>github-datawave</id>
<username>${env.USER_NAME}</username>
<password>${env.ACCESS_TOKEN}</password>
</server>
</servers>
</settings>
8 changes: 6 additions & 2 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ jobs:
${{ runner.os }}-maven-
- name: Format code
run: |
mvn -V -B -e clean formatter:format sortpom:sort -Pautoformat
mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -V -B -e clean formatter:format sortpom:sort -Pautoformat
git status
git diff-index --quiet HEAD || (echo "Error! There are modified files after formatting." && false)
env:
MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Djava.awt.headless=true"
USER_NAME: ${{ secrets.USER_NAME }}
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}

# Build the code and run the unit/integration tests.
build-and-test:
Expand All @@ -56,6 +58,8 @@ jobs:
${{ runner.os }}-maven-format-
${{ runner.os }}-maven-
- name: Build and Run Unit Tests
run: mvn -V -B -e -Ddist clean verify
run: mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -V -B -e -Ddist clean verify
env:
MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Djava.awt.headless=true"
USER_NAME: ${{ secrets.USER_NAME }}
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
178 changes: 178 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>datawave-microservice-service-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
<relativePath>../../microservice-service-parent/pom.xml</relativePath>
</parent>
<artifactId>spring-boot-starter-datawave-cached-results</artifactId>
<version>1.0.0-SNAPSHOT</version>
<url>https://code.nsa.gov/datawave-spring-boot-starter-cached-results</url>
<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<scm>
<connection>scm:git:https://github.com/NationalSecurityAgency/datawave-spring-boot-starter-cached-results.git</connection>
<developerConnection>scm:git:git@github.com:NationalSecurityAgency/datawave-spring-boot-starter-cached-results.git</developerConnection>
<url>https://github.com/NationalSecurityAgency/datawave-spring-boot-starter-cached-results</url>
</scm>
<properties>
<version.datawave>7.0.0-SNAPSHOT</version.datawave>
<version.microservice.hazelcast-client>4.0.0-SNAPSHOT</version.microservice.hazelcast-client>
<version.microservice.starter>4.0.0-SNAPSHOT</version.microservice.starter>
<version.microservice.starter-audit>4.0.0-SNAPSHOT</version.microservice.starter-audit>
<version.microservice.starter-query>1.0.0-SNAPSHOT</version.microservice.starter-query>
<version.mysql>8.0.32</version.mysql>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-cached-results</artifactId>
<version>${version.datawave}</version>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
<exclusion>
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-common</artifactId>
<version>${version.datawave}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-common-util</artifactId>
<version>${version.datawave}</version>
<exclusions>
<exclusion>
<artifactId>slf4j-reload4j</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>hazelcast-client</artifactId>
<version>${version.microservice.hazelcast-client}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>spring-boot-starter-datawave-audit</artifactId>
<version>${version.microservice.starter-audit}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>spring-boot-starter-datawave-query</artifactId>
<version>${version.microservice.starter-query}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.webservices</groupId>
<artifactId>datawave-ws-client</artifactId>
<version>${version.datawave}</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.apache.zookeeper</groupId>
</exclusion>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.eclipse.jetty</groupId>
</exclusion>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.apache.hadoop</groupId>
</exclusion>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.apache.accumulo</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${version.mysql}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>spring-boot-starter-datawave-query</artifactId>
<version>${version.microservice.starter-query}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>spring-boot-starter-datawave-query</artifactId>
<version>${version.microservice.starter-query}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-cached-results</artifactId>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-common</artifactId>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-common-util</artifactId>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>hazelcast-client</artifactId>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>spring-boot-starter-datawave-audit</artifactId>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>spring-boot-starter-datawave-query</artifactId>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.webservices</groupId>
<artifactId>datawave-ws-client</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
</dependencies>
<repositories>
<repository>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>github-datawave</id>
<url>https://maven.pkg.github.com/NationalSecurityAgency/datawave</url>
</repository>
</repositories>
</project>
Loading
Loading