diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 51faf4d..a71d493 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,38 +1,31 @@ FROM openjdk:13-slim-buster # Java global config ARG MAX_RAM=2800G ENV JAVA_TOOL_OPTIONS \ -Xmx${MAX_RAM} -XX:PretenureSizeThreshold=512M -XX:MaxNewSize=4G \ -XX:+UseLargePages -XX:+UseTransparentHugePages -XX:+UseNUMA \ -XX:+UseTLAB -XX:+ResizeTLAB \ -Dlogback.configurationFile=app/configuration/logback.xml # Install swh.graph (both Python and Java parts) RUN apt-get update && \ apt-get install --no-install-recommends --yes \ curl time \ gcc pkg-config libsystemd-dev python3-dev \ python3-pip python3-setuptools && \ rm -rf /var/lib/apt/lists/* && \ pip3 install swh.graph # Install 3rd party dependencies (not shipped with swh.graph) WORKDIR /srv/softwareheritage/graph/lib RUN ln /usr/local/share/swh-graph/*.jar . -# law is not shipped via Maven, download from upstream -ARG LAW_VERSION=2.6.0 -RUN curl -O http://law.di.unimi.it/software/download/law-${LAW_VERSION}-bin.tar.gz && \ - tar xaf law-${LAW_VERSION}-bin.tar.gz && \ - cp law-${LAW_VERSION}/law-${LAW_VERSION}.jar . &&\ - rm -rf law-${LAW_VERSION}-bin.tar.gz law-${LAW_VERSION}/ - # Add user files WORKDIR /srv/softwareheritage/graph/app COPY configuration configuration/ COPY scripts scripts/ # Default dir WORKDIR /srv/softwareheritage/graph diff --git a/java/server/pom.xml b/java/server/pom.xml index d99ffda..8db5e82 100644 --- a/java/server/pom.xml +++ b/java/server/pom.xml @@ -1,190 +1,209 @@ 4.0.0 org.softwareheritage.graph swh-graph ${git.closest.tag.name} swh-graph https://forge.softwareheritage.org/source/swh-graph/ UTF-8 11 ch.qos.logback logback-classic 1.2.3 junit junit 4.11 test org.hamcrest hamcrest 2.1 test io.javalin javalin 3.0.0 org.slf4j slf4j-simple 1.7.26 com.fasterxml.jackson.core jackson-databind 2.9.8 it.unimi.dsi webgraph-big 3.5.1 it.unimi.dsi fastutil 8.2.2 + + it.unimi.dsi + law-library + 2.6.0 + + + org.apache.hadoop + hadoop-common + + + org.umlgraph + umlgraph + + + org.eclipse.jetty.aggregate + jetty-all + + + com.martiansoftware jsap 2.1 net.sf.py4j py4j 0.10.8.1 maven-clean-plugin 3.1.0 maven-resources-plugin 3.0.2 maven-compiler-plugin 3.8.0 -verbose -Xlint:all maven-surefire-plugin 2.22.1 maven-jar-plugin 3.0.2 maven-install-plugin 2.5.2 maven-deploy-plugin 2.8.2 maven-site-plugin 3.7.1 maven-project-info-reports-plugin 3.0.0 maven-assembly-plugin org.softwareheritage.graph.App jar-with-dependencies false make-assembly package single pl.project13.maven git-commit-id-plugin 3.0.1 get-the-git-infos revision initialize true true true true v* git.closest.tag.name ^v true org.apache.maven.plugins maven-javadoc-plugin 3.1.1