From e8b6719026f95162291b3519af87a560d2e468f3 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sat, 31 Dec 2016 22:13:48 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20Maven?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  26 ------
 pom.xml                                       |  87 ++++++++++++++++++
 settings.gradle                               |   1 -
 .../main/webapp}/WEB-INF/fother.inc.html      |   0
 .../main/webapp}/WEB-INF/header.inc.html      |   0
 .../main/webapp}/WEB-INF/index.html           |   0
 .../main/webapp}/WEB-INF/news.inc.html        |   0
 .../main/webapp}/WEB-INF/player.html          |   0
 .../WEB-INF/simple_template/about.html        |   0
 {webapp => src/main/webapp}/WEB-INF/web.xml   |   0
 .../css/awesome-bootstrap-checkbox.css        |   0
 .../main/webapp}/css/bootstrap.min.css        |   0
 {webapp => src/main/webapp}/css/style.css     |   0
 {webapp => src/main/webapp}/favicon.png       | Bin
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 .../fonts/glyphicons-halflings-regular.woff2  | Bin
 .../main/webapp}/js/bootstrap.min.js          |   0
 .../main/webapp}/js/jquery-2.1.4.min.js       |   0
 .../main/webapp}/js/js.cookie-2.1.0.min.js    |   0
 .../main/webapp}/noise-background.png         | Bin
 23 files changed, 87 insertions(+), 27 deletions(-)
 delete mode 100644 build.gradle
 create mode 100644 pom.xml
 delete mode 100644 settings.gradle
 rename {webapp => src/main/webapp}/WEB-INF/fother.inc.html (100%)
 rename {webapp => src/main/webapp}/WEB-INF/header.inc.html (100%)
 rename {webapp => src/main/webapp}/WEB-INF/index.html (100%)
 rename {webapp => src/main/webapp}/WEB-INF/news.inc.html (100%)
 rename {webapp => src/main/webapp}/WEB-INF/player.html (100%)
 rename {webapp => src/main/webapp}/WEB-INF/simple_template/about.html (100%)
 rename {webapp => src/main/webapp}/WEB-INF/web.xml (100%)
 rename {webapp => src/main/webapp}/css/awesome-bootstrap-checkbox.css (100%)
 rename {webapp => src/main/webapp}/css/bootstrap.min.css (100%)
 rename {webapp => src/main/webapp}/css/style.css (100%)
 rename {webapp => src/main/webapp}/favicon.png (100%)
 rename {webapp => src/main/webapp}/fonts/glyphicons-halflings-regular.eot (100%)
 rename {webapp => src/main/webapp}/fonts/glyphicons-halflings-regular.svg (100%)
 rename {webapp => src/main/webapp}/fonts/glyphicons-halflings-regular.ttf (100%)
 rename {webapp => src/main/webapp}/fonts/glyphicons-halflings-regular.woff (100%)
 rename {webapp => src/main/webapp}/fonts/glyphicons-halflings-regular.woff2 (100%)
 rename {webapp => src/main/webapp}/js/bootstrap.min.js (100%)
 rename {webapp => src/main/webapp}/js/jquery-2.1.4.min.js (100%)
 rename {webapp => src/main/webapp}/js/js.cookie-2.1.0.min.js (100%)
 rename {webapp => src/main/webapp}/noise-background.png (100%)

diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index cbf4930..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-group = 'kinosearch'
-version = '2.0.7с'
-
-apply plugin: 'war'
-apply plugin: 'jetty'
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    providedCompile (['javax.servlet:javax.servlet-api:3.0.1'])
-    compile (['org.jsoup:jsoup:1.8.3'])
-    compile (['org.freemarker:freemarker:2.3.23'])
-    compile (['com.google.code.gson:gson:2.4'])
-    testCompile (['junit:junit:4.12'])
-}
-
-idea.module.downloadSources = false
-eclipse.classpath.downloadSources = false
-
-war {
-    webAppDirName = 'webapp'
-}
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..acc0cd3
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <name>KinoSearch</name>
+
+    <developers>
+        <developer>
+            <name>DmitriyMX</name>
+            <email>mail@dmiriymx.ru</email>
+        </developer>
+    </developers>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <groupId>ru.dmitriymx</groupId>
+    <artifactId>kinosearch</artifactId>
+    <version>2.0.7с</version>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.8.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.23</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.15</version>
+                <configuration>
+                    <argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.0.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>9.4.0.v20161208</version>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 209a601..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'KinoSearch'
diff --git a/webapp/WEB-INF/fother.inc.html b/src/main/webapp/WEB-INF/fother.inc.html
similarity index 100%
rename from webapp/WEB-INF/fother.inc.html
rename to src/main/webapp/WEB-INF/fother.inc.html
diff --git a/webapp/WEB-INF/header.inc.html b/src/main/webapp/WEB-INF/header.inc.html
similarity index 100%
rename from webapp/WEB-INF/header.inc.html
rename to src/main/webapp/WEB-INF/header.inc.html
diff --git a/webapp/WEB-INF/index.html b/src/main/webapp/WEB-INF/index.html
similarity index 100%
rename from webapp/WEB-INF/index.html
rename to src/main/webapp/WEB-INF/index.html
diff --git a/webapp/WEB-INF/news.inc.html b/src/main/webapp/WEB-INF/news.inc.html
similarity index 100%
rename from webapp/WEB-INF/news.inc.html
rename to src/main/webapp/WEB-INF/news.inc.html
diff --git a/webapp/WEB-INF/player.html b/src/main/webapp/WEB-INF/player.html
similarity index 100%
rename from webapp/WEB-INF/player.html
rename to src/main/webapp/WEB-INF/player.html
diff --git a/webapp/WEB-INF/simple_template/about.html b/src/main/webapp/WEB-INF/simple_template/about.html
similarity index 100%
rename from webapp/WEB-INF/simple_template/about.html
rename to src/main/webapp/WEB-INF/simple_template/about.html
diff --git a/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapp/WEB-INF/web.xml
rename to src/main/webapp/WEB-INF/web.xml
diff --git a/webapp/css/awesome-bootstrap-checkbox.css b/src/main/webapp/css/awesome-bootstrap-checkbox.css
similarity index 100%
rename from webapp/css/awesome-bootstrap-checkbox.css
rename to src/main/webapp/css/awesome-bootstrap-checkbox.css
diff --git a/webapp/css/bootstrap.min.css b/src/main/webapp/css/bootstrap.min.css
similarity index 100%
rename from webapp/css/bootstrap.min.css
rename to src/main/webapp/css/bootstrap.min.css
diff --git a/webapp/css/style.css b/src/main/webapp/css/style.css
similarity index 100%
rename from webapp/css/style.css
rename to src/main/webapp/css/style.css
diff --git a/webapp/favicon.png b/src/main/webapp/favicon.png
similarity index 100%
rename from webapp/favicon.png
rename to src/main/webapp/favicon.png
diff --git a/webapp/fonts/glyphicons-halflings-regular.eot b/src/main/webapp/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from webapp/fonts/glyphicons-halflings-regular.eot
rename to src/main/webapp/fonts/glyphicons-halflings-regular.eot
diff --git a/webapp/fonts/glyphicons-halflings-regular.svg b/src/main/webapp/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from webapp/fonts/glyphicons-halflings-regular.svg
rename to src/main/webapp/fonts/glyphicons-halflings-regular.svg
diff --git a/webapp/fonts/glyphicons-halflings-regular.ttf b/src/main/webapp/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from webapp/fonts/glyphicons-halflings-regular.ttf
rename to src/main/webapp/fonts/glyphicons-halflings-regular.ttf
diff --git a/webapp/fonts/glyphicons-halflings-regular.woff b/src/main/webapp/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from webapp/fonts/glyphicons-halflings-regular.woff
rename to src/main/webapp/fonts/glyphicons-halflings-regular.woff
diff --git a/webapp/fonts/glyphicons-halflings-regular.woff2 b/src/main/webapp/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from webapp/fonts/glyphicons-halflings-regular.woff2
rename to src/main/webapp/fonts/glyphicons-halflings-regular.woff2
diff --git a/webapp/js/bootstrap.min.js b/src/main/webapp/js/bootstrap.min.js
similarity index 100%
rename from webapp/js/bootstrap.min.js
rename to src/main/webapp/js/bootstrap.min.js
diff --git a/webapp/js/jquery-2.1.4.min.js b/src/main/webapp/js/jquery-2.1.4.min.js
similarity index 100%
rename from webapp/js/jquery-2.1.4.min.js
rename to src/main/webapp/js/jquery-2.1.4.min.js
diff --git a/webapp/js/js.cookie-2.1.0.min.js b/src/main/webapp/js/js.cookie-2.1.0.min.js
similarity index 100%
rename from webapp/js/js.cookie-2.1.0.min.js
rename to src/main/webapp/js/js.cookie-2.1.0.min.js
diff --git a/webapp/noise-background.png b/src/main/webapp/noise-background.png
similarity index 100%
rename from webapp/noise-background.png
rename to src/main/webapp/noise-background.png