diff options
| -rw-r--r-- | pom.xml | 93 | ||||
| -rw-r--r-- | src/main/java/org/drtshock/Potato.java | 5 | ||||
| -rw-r--r-- | src/main/java/org/drtshock/Tuber.java | 4 | ||||
| -rw-r--r-- | src/main/resources/GLaDOS.jpg (renamed from src/main/resources/5728853850_a3bbb14083_z.jpg) | bin | 65939 -> 65939 bytes | |||
| -rw-r--r-- | src/main/resources/sourcream.png | bin | 64151 -> 59842 bytes |
5 files changed, 59 insertions, 43 deletions
@@ -1,40 +1,55 @@ -<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> - <groupId>org.drtshock</groupId> - <artifactId>potato</artifactId> - <version>1.7.5</version> - <name>Potato</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - <configuration> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - <manifest> - <addClasspath>true</addClasspath> - <mainClass>org.drtshock.Potato</mainClass> - </manifest> - </archive> - <finalName>Potato</finalName> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> - </plugin> - </plugins> - </build> +<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> + <groupId>org.drtshock</groupId> + <artifactId>potato</artifactId> + <version>1.7.5</version> + <name>Potato</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.5.1</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>3.0.2</version> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>org.drtshock.Potato</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + </plugin> + <plugin> + <groupId>net.orfjackal.retrolambda</groupId> + <artifactId>retrolambda-maven-plugin</artifactId> + <version>2.3.0</version> + <executions> + <execution> + <goals> + <goal>process-main</goal> + <goal>process-test</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <finalName>Potato</finalName> + </build> </project> diff --git a/src/main/java/org/drtshock/Potato.java b/src/main/java/org/drtshock/Potato.java index 73113e5..9e2123e 100644 --- a/src/main/java/org/drtshock/Potato.java +++ b/src/main/java/org/drtshock/Potato.java @@ -11,7 +11,7 @@ import java.util.List; */ public class Potato implements Tuber { - private final List<Condiment> condiments = new ArrayList<Condiment>(); + private final List<Condiment> condiments = new ArrayList<>(); public static void main(String[] args) { Potato potato = new Potato(); @@ -39,7 +39,8 @@ public class Potato implements Tuber { * @throws NotDeliciousException If the potato is not delicious */ public void prepare() throws NotDeliciousException { - this.addCondiments("sour cream", "chives", "butter", "crumbled bacon", "grated cheese", "ketchup", "salt", "tabasco"); + this.addCondiments("sour cream", "chives", "butter", "crumbled bacon", "grated cheese", "ketchup", "pepper", + "salt", "tabasco", "tomatoes"); this.listCondiments(); if (!this.isDelicious()) throw new NotDeliciousException(NotDeliciousReason.NOT_BAKED); } diff --git a/src/main/java/org/drtshock/Tuber.java b/src/main/java/org/drtshock/Tuber.java index de52fea..feb752b 100644 --- a/src/main/java/org/drtshock/Tuber.java +++ b/src/main/java/org/drtshock/Tuber.java @@ -1,7 +1,7 @@ package org.drtshock; public interface Tuber { - public boolean isDelicious(); + boolean isDelicious(); - public Tuber propagate(); + Tuber propagate(); } diff --git a/src/main/resources/5728853850_a3bbb14083_z.jpg b/src/main/resources/GLaDOS.jpg Binary files differindex 6791074..6791074 100644 --- a/src/main/resources/5728853850_a3bbb14083_z.jpg +++ b/src/main/resources/GLaDOS.jpg diff --git a/src/main/resources/sourcream.png b/src/main/resources/sourcream.png Binary files differindex d00f648..77fbd85 100644 --- a/src/main/resources/sourcream.png +++ b/src/main/resources/sourcream.png |
