Merge pull request #226 from hazendaz/master

[improve] Use our config files as defaults
revelc · Oct 21, 2017 · 7dacfd5 · 7dacfd5
2 parents 7bd03d2 + ea27c80
commit 7dacfd5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
@@ -109,6 +109,27 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <resources>
+                        <!-- Pickup our default config files -->
+                        <resource>
+                            <directory>${main.basedir}/src/config</directory>
+                            <targetPath>${project.build.directory}/classes/src/config</targetPath>
+                        </resource>
+
+                        <!-- Retain original resources -->
+                        <resource>
+                            <directory>${project.basedir}/src/main/resources</directory>
+                        </resource>
+                        <resource>
+                            <directory>${project.basedir}/src/test/resources</directory>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/config/eclipse/formatter/java.xml b/src/config/eclipse/formatter/java.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 
-    Copyright 2010-2016. All work is copyrighted to their respective
+    Copyright 2010-2017. All work is copyrighted to their respective
     author(s), unless otherwise stated.
 
     Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/config/eclipse/formatter/javascript.xml b/src/config/eclipse/formatter/javascript.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 
-    Copyright 2010-2016. All work is copyrighted to their respective
+    Copyright 2010-2017. All work is copyrighted to their respective
     author(s), unless otherwise stated.
 
     Licensed under the Apache License, Version 2.0 (the "License");