Merge 1.0.0 changes back to master.

This commit is contained in:
Nick Couchman
2018-09-29 16:50:32 -04:00
16 changed files with 46 additions and 45 deletions

View File

@@ -37,14 +37,14 @@
<build> <build>
<plugins> <plugins>
<!-- Compile using Java 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -37,14 +37,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -37,14 +37,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -37,14 +37,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -43,14 +43,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -43,14 +43,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -43,14 +43,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -43,14 +43,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -37,14 +37,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -37,14 +37,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -37,14 +37,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -37,14 +37,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -37,14 +37,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -57,14 +57,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>

View File

@@ -85,6 +85,7 @@ public class SimpleDirectory<ObjectType extends Identifiable>
* @param objects * @param objects
* The objects that should be present in this directory. * The objects that should be present in this directory.
*/ */
@SafeVarargs
public SimpleDirectory(ObjectType... objects) { public SimpleDirectory(ObjectType... objects) {
this(Arrays.asList(objects)); this(Arrays.asList(objects));
} }

View File

@@ -57,14 +57,14 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 --> <!-- Written for Java 1.8 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.6</source> <source>1.8</source>
<target>1.6</target> <target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-Werror</arg> <arg>-Werror</arg>