Commit 94b76874 authored by Håvard Lunde's avatar Håvard Lunde
Browse files

Euler: Java11 edition

parent 7db5e090
FROM maven:3.5.4-jdk-10-slim as builder
FROM maven:3-jdk-11-slim as builder
WORKDIR /usr/src
COPY pom.xml /usr/src/pom.xml
......@@ -10,14 +10,14 @@ RUN mvn -B clean install -DskipTests -Dcheckstyle.skip -Dmaven.gitcommitid.skip
ADD . /usr/src
RUN mvn test
RUN mvn package
FROM openjdk:10-jre-slim
FROM openjdk:11-jre-slim
RUN mkdir -p /usr/src/{api,euler,repository,resource}
WORKDIR /usr/src
COPY --from=builder /usr/src/api/target/api-0.0.1-SNAPSHOT.jar /usr/src/
COPY --from=builder /usr/src/repository/target/repository-0.0.1-SNAPSHOT.jar /usr/src/
COPY --from=builder /usr/src/resource/target/resource-0.0.1-SNAPSHOT.jar /usr/src/
#COPY --from=builder /usr/src/target/euler-0.0.1-SNAPSHOT.jar /usr/src/
COPY --from=builder /usr/src/api/target/api-0.0.2-SNAPSHOT.jar /usr/src/
COPY --from=builder /usr/src/repository/target/repository-0.0.2-SNAPSHOT.jar /usr/src/
COPY --from=builder /usr/src/resource/target/resource-0.0.2-SNAPSHOT.jar /usr/src/
#COPY --from=builder /usr/src/target/euler-0.0.2-SNAPSHOT.jar /usr/src/
EXPOSE 8080 8081
CMD ["java", "-jar", "-Dhttp.proxyPort=8080", "api-0.0.1-SNAPSHOT.jar"]
CMD ["java", "-jar", "-Dhttp.proxyPort=8080", "api-0.0.2-SNAPSHOT.jar"]
FROM openjdk:10-jre-slim
COPY ./target/api-0.0.1-SNAPSHOT.jar /usr/src/api/
FROM openjdk:11-jre-slim
COPY ./target/api-0.0.2-SNAPSHOT.jar /usr/src/api/
WORKDIR /usr/src/api
EXPOSE 8080
CMD ["java", "-jar", "api-0.0.1-SNAPSHOT.jar"]
CMD ["java", "-jar", "api-0.0.2-SNAPSHOT.jar"]
......@@ -7,7 +7,7 @@
<parent>
<groupId>no.deichman.euler</groupId>
<artifactId>euler</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
</parent>
<artifactId>api</artifactId>
......
1. Innføre constructor-injection hvor det er mulig (@javax.inject.Inject)
2. @Autowired -> @Inject
3. Lombok @Data/@Getter/@Setter?
4. Eclipse warnings
5. Sonar warnings
2. Lombok @Data/@Getter/@Setter?
3. Eclipse warnings
4. Sonar warnings
......@@ -13,12 +13,12 @@
<groupId>no.deichman.euler</groupId>
<artifactId>euler</artifactId>
<packaging>pom</packaging>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
<properties>
<rdf4jVersion>2.4.0</rdf4jVersion>
<jaxbVersion>2.3.0</jaxbVersion>
<java.version>1.10</java.version>
<rdf4jVersion>2.4.2</rdf4jVersion>
<!-- jaxbVersion>2.3.0</jaxbVersion -->
<java.version>11</java.version>
</properties>
<modules>
......@@ -40,17 +40,17 @@
<dependency>
<groupId>no.deichman.euler</groupId>
<artifactId>resource</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>no.deichman.euler</groupId>
<artifactId>repository</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>no.deichman.euler</groupId>
<artifactId>repository</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
......@@ -67,12 +67,12 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${jaxbVersion}</version>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxbVersion}</version>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
......@@ -82,7 +82,7 @@
<dependency>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java</artifactId>
<version>0.12.1</version>
<version>0.12.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
......@@ -262,7 +262,7 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>10</release>
<release>${java.version}</release>
</configuration>
</plugin>
</plugins>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>no.deichman.euler</groupId>
<artifactId>euler</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
</parent>
<artifactId>repository</artifactId>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>no.deichman.euler</groupId>
<artifactId>euler</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
</parent>
<artifactId>resource</artifactId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment