From 6a47502469f79f42c7312fa9f415fe1009b9df3f Mon Sep 17 00:00:00 2001
From: Christopher Bohn <bohn@unl.edu>
Date: Mon, 28 Sep 2020 14:50:40 -0500
Subject: [PATCH] Updated pom.xml and .gitignore

- Made java target explicit, updated JUnit dependency to JUnit 4
- More robust gitignore
---
 .gitignore                                    | 62 +++++++++++++++++++
 {tetris/logs => logs}/tetris.log              |  0
 pom.xml                                       | 36 +++++++++++
 .../edu/unl/cse/soft160/tetris/Tetris.java    |  0
 tetris/.gitignore                             |  9 ---
 tetris/pom.xml                                | 18 ------
 6 files changed, 98 insertions(+), 27 deletions(-)
 create mode 100644 .gitignore
 rename {tetris/logs => logs}/tetris.log (100%)
 create mode 100644 pom.xml
 rename {tetris/src => src}/main/java/edu/unl/cse/soft160/tetris/Tetris.java (100%)
 delete mode 100644 tetris/.gitignore
 delete mode 100644 tetris/pom.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f35f60a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,62 @@
+# Mac file finder metadata
+.DS_Store
+# Windows file metadata
+._*
+# Thumbnail image caches
+Thumbs.db
+ethumbs.db
+# MS Office temporary file
+~*
+# Emacs backup file
+*~
+
+# Common
+[Bb]in/
+[Bb]uild/
+[Oo]bj/
+[Oo]ut/
+[Tt]mp/
+[Xx]86/
+[Ii][Aa]32/
+[Xx]64/
+[Xx]86_64/
+[Xx]86-64/
+[Aa]rm
+[Aa]32
+[Tt]32
+[Aa]64
+*.tmp
+*.bak
+*.bk
+*.swp
+
+# Java files
+*.class
+javadoc/
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# JetBrains (IntelliJ IDEA, PyCharm, etc) files
+.idea/
+cmake-build-*/
+*.iml
+*.iws
+*.ipr
+
+# Eclipse files
+.settings/
+.project
+.classpath
+.buildpath
+.loadpath
+.factorypath
+local.properties
diff --git a/tetris/logs/tetris.log b/logs/tetris.log
similarity index 100%
rename from tetris/logs/tetris.log
rename to logs/tetris.log
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..47dd09f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,36 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>edu.unl.cse.soft160.tetris</groupId>
+  <artifactId>tetris</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>tetris</name>
+  <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tetris/src/main/java/edu/unl/cse/soft160/tetris/Tetris.java b/src/main/java/edu/unl/cse/soft160/tetris/Tetris.java
similarity index 100%
rename from tetris/src/main/java/edu/unl/cse/soft160/tetris/Tetris.java
rename to src/main/java/edu/unl/cse/soft160/tetris/Tetris.java
diff --git a/tetris/.gitignore b/tetris/.gitignore
deleted file mode 100644
index 1cdc9f7..0000000
--- a/tetris/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
diff --git a/tetris/pom.xml b/tetris/pom.xml
deleted file mode 100644
index 621885f..0000000
--- a/tetris/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>edu.unl.cse.soft160.tetris</groupId>
-  <artifactId>tetris</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>tetris</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
-- 
GitLab