Skip to content

Commit a4eb527

Browse files
Radoslav PetrovNateBrady23
authored andcommitted
Java/officefloor-spring update to Java 11 (#4816)
* Fix the name of SpringData Fortune repository so the discovery to work * Update officefloor-springdata to Java 11 runtime and compilation
1 parent ae85429 commit a4eb527

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

frameworks/Java/officefloor/officefloor-spring_data.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COPY src src
44
WORKDIR /officefloor/src/woof_benchmark_spring
55
RUN mvn -q clean package
66

7-
FROM openjdk:10
7+
FROM openjdk:11.0.3-jre-slim
88
WORKDIR /officefloor
99
COPY --from=maven /officefloor/src/woof_benchmark_spring/target/woof_benchmark_spring-1.0.0-exec.jar server.jar
1010
CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:+UseNUMA", "-Dhttp.port=8080", "-Dhttp.server.name=OF", "-Dhttp.date.header=true", "-jar", "server.jar"]

frameworks/Java/officefloor/src/woof_benchmark_spring/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010
</parent>
1111
<artifactId>woof_benchmark_spring</artifactId>
1212
<packaging>jar</packaging>
13-
<properties>
14-
<maven.compiler.source>10</maven.compiler.source>
15-
<maven.compiler.target>10</maven.compiler.target>
16-
<officefloor.version>3.4.0</officefloor.version>
17-
</properties>
13+
1814
<dependencies>
1915
<dependency>
2016
<groupId>net.officefloor.web</groupId>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
import org.springframework.stereotype.Repository;
55

66
@Repository
7-
public interface FortunueRepository extends CrudRepository<Fortune, Integer> {
7+
public interface FortuneRepository extends CrudRepository<Fortune, Integer> {
88
}

frameworks/Java/officefloor/src/woof_benchmark_spring/src/main/java/net/officefloor/benchmark/FortunesLogic.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
public class FortunesLogic {
1010

11-
public Fortune[] getFortunes(FortunueRepository repository) {
11+
public Fortune[] getFortunes(FortuneRepository repository) {
1212
List<Fortune> fortunes = new ArrayList<>();
1313
repository.findAll().forEach((fortune) -> fortunes.add(fortune));
1414
fortunes.add(new Fortune(0, "Additional fortune added at request time."));

0 commit comments

Comments
 (0)