Do not include environment or service specific configuration files in…

… the base framework jars
inst-tech · May 31, 2018 · 2f8efcf · 2f8efcf
1 parent e51cb4b
commit 2f8efcf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 doc/
 *.iml
 build/

diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ allprojects {
     apply plugin: 'java'
     apply plugin: 'distribution'
 
-    version = '0.1.2'
+    version = '0.1.3'
     group = 'io.tsdb.services'
 
     sourceCompatibility = 1.8
@@ -56,6 +56,14 @@ allprojects {
             }
         }
     }
+
+    distributions {
+        main {
+            contents {
+                from jar
+            }
+        }
+    }
 }
 
 if (project.hasProperty('test')) {
@@ -207,7 +215,12 @@ task assembleBinary(type: Copy) {
  */
 
 subprojects {
-
+    jar {
+        exclude "application"
+        exclude 'logback.xml'
+        exclude 'logback-access.xml'
+        exclude "environment.properties"
+    }
 
     task assembleDistBin(dependsOn: assembleBinary, type: Copy) {
         from "${project.buildDir}/install/${project.name}/bin/${project.name}"
@@ -274,4 +287,5 @@ project ('framework-common') {
         }
         testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
     }
-}
+}
+
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    .DS_Store
     doc/
     *.iml
     build/
@@ Expand Down @@