Skip to content

Commit

Permalink
Revert "started multithreadding, introduced a lot of bugs; added prin…
Browse files Browse the repository at this point in the history
…ting facilities to latex"

This reverts commit cb35bc7.
  • Loading branch information
SomeUserName1 committed Nov 18, 2019
1 parent 60d9ce5 commit 86e5f82
Show file tree
Hide file tree
Showing 22 changed files with 565 additions and 1,490 deletions.
128 changes: 93 additions & 35 deletions neo4j-concept/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?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">
<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>
Expand All @@ -20,14 +22,14 @@


<properties>

<!-- Global Project Properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<uberjar.name>benchmarks</uberjar.name>
<maven.build.timestamp.format>yyyy.MM.dd.HH.mm.ss</maven.build.timestamp.format>

<!-- Dependency Versions -->
<neo4j.version>3.5.0</neo4j.version>
<junit.jupiter.version>5.3.1</junit.jupiter.version>
</properties>
Expand Down Expand Up @@ -68,7 +70,7 @@
<artifactId>neo4j-eval</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<!-- neo4j dependencies -->
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
Expand All @@ -80,7 +82,7 @@
<version>${neo4j.version}</version>
</dependency>


<!-- Graph Algorithms and APoC -->
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>graph-algorithms-algo</artifactId>
Expand All @@ -97,7 +99,7 @@
<version>3.5.0.2</version>
</dependency>


<!-- Testing -->
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-io</artifactId>
Expand Down Expand Up @@ -131,12 +133,7 @@
<version>${junit.jupiter.version}</version>
</dependency>


<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.1-jre</version>
</dependency>
<!-- Arg parse, Logging, CheckStyle and Benchmarking -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
Expand All @@ -156,7 +153,7 @@


<build>
<defaultGoal>compile</defaultGoal>
<defaultGoal>test</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
Expand All @@ -181,7 +178,7 @@
</execution>
</executions>
</plugin>

<!-- JUnit 5 requires Surefire version 2.22.0 or higher -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
Expand Down Expand Up @@ -226,13 +223,14 @@
<configuration>
<finalName>${uberjar.name}</finalName>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.openjdk.jmh.Main</mainClass>
</transformer>
</transformers>
<filters>
<filter>

<!-- Shading signed JARs will fail without this. http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar -->
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
Expand All @@ -245,6 +243,84 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<excludes>**/PropertyGraphCobwebProc.java</excludes>
<sourceDirectory>${project.build.sourceDirectories}</sourceDirectory>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeResources>false</includeResources>
<configLocation>../checkstyle.xml</configLocation>
<failOnViolation>true</failOnViolation>
<violationSeverity>warning</violationSeverity>
</configuration>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>checkstyle</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
<configuration>
<effort>max</effort>
<threshold>Low</threshold>
</configuration>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>findbugs</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.2</version>
<configuration>
<effort>max</effort>
<threshold>Low</threshold>
</configuration>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>spotbugs</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.12.0</version>
<configuration>
<targetJdk>1.8</targetJdk>
<failOnViolation>true</failOnViolation> <!-- this is actually true by default, but can be disabled -->
<printFailingErrors>true</printFailingErrors>
</configuration>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>pmd</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
Expand All @@ -262,22 +338,4 @@
</plugins>
</reporting>

<profiles><profile>
<id>infer-capture</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<compilerId>javac</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<fork>true</fork>
<executable>/opt/infer-linux64-v0.17.0/lib/infer/infer/bin/infer</executable>

</configuration>
</plugin>
</plugins>
</build>
</profile></profiles></project>
</project>
Empty file modified neo4j-concept/src/main/cypher/import_ldbc.sh
100755 → 100644
Empty file.
Loading

0 comments on commit 86e5f82

Please sign in to comment.