From 10f5c149beb323fe81e84cff50fbe108e166993c Mon Sep 17 00:00:00 2001
From: Grigory Kislin <javawebinar@yandex.ru>
Date: Fri, 14 Oct 2016 23:03:47 +0300
Subject: [PATCH] 4_fix_pom_log4j

---
 parent-web/pom.xml     | 26 +++++++++++++++
 parent/pom.xml         | 74 ++++++++++++++++++------------------------
 pom.xml                |  3 ++
 test/pom.xml           |  4 +--
 web/common-web/pom.xml |  6 ++++
 web/export/pom.xml     | 18 ++++++++++
 6 files changed, 87 insertions(+), 44 deletions(-)

diff --git a/parent-web/pom.xml b/parent-web/pom.xml
index 1a3b981..cde808d 100644
--- a/parent-web/pom.xml
+++ b/parent-web/pom.xml
@@ -27,6 +27,32 @@
                 </configuration>
             </plugin>
         </plugins>
+
+        <resources>
+            <resource>
+                <directory>${masterjava.config}</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>logback.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+
+        <testResources>
+            <testResource>
+                <directory>${masterjava.config}</directory>
+                <includes>
+                    <include>logback-test.xml</include>
+                </includes>
+            </testResource>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+        </testResources>
+
     </build>
 
     <dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 9cbd341..bbafced 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -13,6 +13,13 @@
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <dependency.locations.enabled>false</dependency.locations.enabled>
+
+        <slf4j.version>1.7.20</slf4j.version>
+        <logback.version>1.1.7</logback.version>
+
+        <masterjava.config>/apps/masterjava/config/</masterjava.config>
     </properties>
 
     <build>
@@ -36,57 +43,30 @@
                     <argLine>-Dfile.encoding=UTF-8</argLine>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.2</version>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.4.1</version>
                 <executions>
                     <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
+                        <id>enforce</id>
                         <configuration>
-                            <finalName>benchmarks</finalName>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.openjdk.jmh.Main</mainClass>
-                                </transformer>
-                            </transformers>
-                            <filters>
-                                <filter>
-                                    <!--
-                                        Shading signed JARs will fail without this.
-                                        http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
-                                    -->
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
+                            <rules>
+                                <dependencyConvergence/>
+                            </rules>
                         </configuration>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
                     </execution>
                 </executions>
             </plugin>
+
         </plugins>
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>RELEASE</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -95,12 +75,22 @@
         <dependency>
             <groupId>one.util</groupId>
             <artifactId>streamex</artifactId>
-            <version>RELEASE</version>
+            <version>0.6.2</version>
         </dependency>
+
+        <!-- Logging with SLF4J & LogBack -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
-            <groupId>com.j2html</groupId>
-            <artifactId>j2html</artifactId>
-            <version>RELEASE</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+            <scope>runtime</scope>
         </dependency>
 
         <!--Test-->
diff --git a/pom.xml b/pom.xml
index 42e6825..9c077c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,9 @@
     <url>https://github.com/JavaOPs/masterjava</url>
 
     <modules>
+        <module>parent</module>
+        <module>parent-web</module>
+
         <module>common</module>
         <module>test</module>
 
diff --git a/test/pom.xml b/test/pom.xml
index f469908..bfab185 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -64,12 +64,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>RELEASE</version>
+            <version>1.15</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>RELEASE</version>
+            <version>1.15</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/web/common-web/pom.xml b/web/common-web/pom.xml
index adf98e7..bbfb15d 100644
--- a/web/common-web/pom.xml
+++ b/web/common-web/pom.xml
@@ -30,6 +30,12 @@
             <groupId>org.thymeleaf</groupId>
             <artifactId>thymeleaf</artifactId>
             <version>3.0.2.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/web/export/pom.xml b/web/export/pom.xml
index 4b4fe6f..b86aa78 100644
--- a/web/export/pom.xml
+++ b/web/export/pom.xml
@@ -19,4 +19,22 @@
     <build>
         <finalName>export</finalName>
     </build>
+    <dependencies>
+        <dependency>
+            <groupId>ru.javaops</groupId>
+            <artifactId>mail-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.j2html</groupId>
+            <artifactId>j2html</artifactId>
+            <version>0.7</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file