Skip to content

add shade plugin to pgsql, mongo, gremlin, redis #162

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

Merged
robfrank merged 16 commits into from
Dec 19, 2021
Merged

add shade plugin to pgsql, mongo, gremlin, redis #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fcced92
add shade plugin to pgsql, mongo, gremlin, redis
arcade-player Oct 24, 2021
22f84e5
wip
arcade-player Oct 30, 2021
57555e4
rebased
arcade-player Dec 16, 2021
7b9eea8
reconfigure shade plugin to produce test-jar as well
arcade-player Dec 16, 2021
5ea22d3
shade plugin conf
arcade-player Dec 18, 2021
4657007
tentative fix of jacoco
arcade-player Dec 18, 2021
1c24ebf
gremlin dependency cleanup
arcade-player Dec 18, 2021
e376d31
remove arcade-package jar from distribution
arcade-player Dec 18, 2021
5ebcbdb
jacoco files find command and export
arcade-player Dec 18, 2021
d30eef4
fix vorkflow
arcade-player Dec 18, 2021
94e34e6
fix get coverage files with set-output
arcade-player Dec 18, 2021
5a64a44
fix get coverage files with set-output
arcade-player Dec 18, 2021
4b5b4e9
fix get coverage files with set-output
arcade-player Dec 18, 2021
33225ee
assign find result to variable
arcade-player Dec 19, 2021
8769781
back to command
arcade-player Dec 19, 2021
c658459
port new method to compute coverage
arcade-player Dec 19, 2021
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
7 changes: 6 additions & 1 deletion .github/workflows/mvn-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,14 @@ jobs:
list-tests: 'failed'
reporter: java-junit

- name: Get coverage files
run: |
echo ::set-output name=COVERAGE_FILES::$(find **/jacoco*.xml -printf '%p,')
id: coverage-files-generator

- name: Codacy coverage reporter
if: ${{ matrix.os != 'windows-latest' }}
uses: codacy/codacy-coverage-reporter-action@v1
with:
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
coverage-reports: coverage/target/site/jacoco-aggregate/jacoco.xml
coverage-reports: ${{ steps.coverage-files-generator.COVERAGE_FILES }}
7 changes: 6 additions & 1 deletion .github/workflows/mvn-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,14 @@ jobs:
list-tests: 'failed'
reporter: java-junit

- name: Get coverage files
run: |
echo ::set-output name=COVERAGE_FILES::$(find **/jacoco*.xml -printf '%p,')
id: coverage-files-generator

- name: Codacy coverage reporter
if: ${{ matrix.os != 'windows-latest' }}
uses: codacy/codacy-coverage-reporter-action@v1
with:
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
coverage-reports: coverage/target/site/jacoco-aggregate/jacoco.xml
coverage-reports: ${{ steps.coverage-files-generator.COVERAGE_FILES }}
2 changes: 1 addition & 1 deletion coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<artifactId>arcadedb-coverage</artifactId>
<description>Compute aggregated test code coverage</description>

<packaging>pom</packaging>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<code.coverage.project.folder>${basedir}/../</code.coverage.project.folder>
Expand Down
64 changes: 61 additions & 3 deletions gremlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,28 @@
<artifactId>arcadedb-gremlin</artifactId>
<packaging>jar</packaging>

<properties>
<translation.version>1.0.4</translation.version>
</properties>

<dependencies>
<dependency>
<groupId>com.arcadedb</groupId>
<artifactId>arcadedb-engine</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<version>${gremlin.version}</version>
</dependency>

<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-server</artifactId>
<version>${gremlin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-groovy</artifactId>
Expand All @@ -55,7 +63,7 @@
<dependency>
<groupId>org.opencypher.gremlin</groupId>
<artifactId>translation</artifactId>
<version>1.0.4</version>
<version>${translation.version}</version>
</dependency>

<dependency>
Expand All @@ -73,4 +81,54 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<shadeTestJar>true</shadeTestJar>
<minimizeJar>true</minimizeJar>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<addHeader>false</addHeader>
</transformer>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</plugin>
</plugins>
</build>
</project>
18 changes: 18 additions & 0 deletions mongodbw/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,22 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
30 changes: 27 additions & 3 deletions package/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,33 +69,57 @@
</dependency>
<dependency>
<groupId>com.arcadedb</groupId>
<artifactId>arcadedb-gremlin</artifactId>
<artifactId>arcadedb-console</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.arcadedb</groupId>
<artifactId>arcadedb-console</artifactId>
<artifactId>arcadedb-server</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.arcadedb</groupId>
<artifactId>arcadedb-server</artifactId>
<artifactId>arcadedb-gremlin</artifactId>
<version>${project.parent.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.arcadedb</groupId>
<artifactId>arcadedb-redisw</artifactId>
<version>${project.parent.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.arcadedb</groupId>
<artifactId>arcadedb-postgresw</artifactId>
<version>${project.parent.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.arcadedb</groupId>
<artifactId>arcadedb-mongodbw</artifactId>
<version>${project.parent.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions package/src/main/assembly/archive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
limitations under the License.

-->
<assembly>

<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 https://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>distribution</id>

<formats>
Expand Down
8 changes: 7 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<maven-versions-plugin.version>2.8.1</maven-versions-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>

<assertj-core.version>3.21.0</assertj-core.version>
Expand Down Expand Up @@ -114,7 +115,7 @@
<module>mongodbw</module>
<module>redisw</module>
<module>postgresw</module>
<module>coverage</module>
<!-- <module>coverage</module>-->
<module>package</module>
</modules>

Expand Down Expand Up @@ -185,6 +186,8 @@
<skipITs>${skipIntegration}</skipITs>
<argLine>${itCoverageAgent}</argLine>
<reuseForks>true</reuseForks>
<forkedProcessExitTimeoutInSeconds>60</forkedProcessExitTimeoutInSeconds>
<forkCount>1</forkCount>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -253,6 +256,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<skipIfEmpty>true</skipIfEmpty>
</configuration>
<executions>
<execution>
<goals>
Expand Down
17 changes: 17 additions & 0 deletions postgresw/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,22 @@
<type>test-jar</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
18 changes: 18 additions & 0 deletions redisw/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,22 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
6 changes: 0 additions & 6 deletions server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,6 @@
<groupId>com.arcadedb</groupId>
<artifactId>arcadedb-gremlin</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-server</artifactId>
<version>${gremlin.version}</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
Expand Down
15 changes: 13 additions & 2 deletions server/src/main/java/com/arcadedb/server/TestCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,18 @@
package com.arcadedb.server;

public interface TestCallback {
enum TYPE {SERVER_STARTING, SERVER_UP, SERVER_SHUTTING_DOWN, SERVER_DOWN, REPLICA_MSG_RECEIVED, REPLICA_ONLINE, REPLICA_OFFLINE, REPLICA_HOT_RESYNC, REPLICA_FULL_RESYNC, NETWORK_CONNECTION}
enum TYPE {
SERVER_STARTING,
SERVER_UP,
SERVER_SHUTTING_DOWN,
SERVER_DOWN,
REPLICA_MSG_RECEIVED,
REPLICA_ONLINE,
REPLICA_OFFLINE,
REPLICA_HOT_RESYNC,
REPLICA_FULL_RESYNC,
NETWORK_CONNECTION
}

void onEvent(TYPE type, Object object, ArcadeDBServer server) throws Exception;
void onEvent(TYPE type, Object object, ArcadeDBServer server) throws Exception;
}