Merge pull request #14 from sunshower-io/prepare-release

Prepare release
sunshower-io · Mar 4, 2019 · 159a9fa · 159a9fa
2 parents a915b49 + 90b6365
commit 159a9fa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/bom/imported/pom.xml b/bom/imported/pom.xml
@@ -17,7 +17,7 @@
     <url>http://www.sunshower.io</url>
 
     <properties>
-        <env.version>1.0.14.Final</env.version>
+        <env.version>1.0.15.Final</env.version>
     </properties>
 
     <dependencies>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -10,14 +10,14 @@
     <parent>
         <groupId>io.sunshower.env</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.13-SNAPSHOT</version>
+        <version>1.0.15.Final</version>
     </parent>
 
     <name>bom</name>
     <url>http://maven.apache.org</url>
 
     <properties>
-        <env.version>1.0.14.Final</env.version>
+        <env.version>1.0.15.Final</env.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <modules>

diff --git a/build.gradle b/build.gradle
@@ -54,7 +54,6 @@ allprojects {
     ]
 
 
-
     task testArtifact(type: Jar, dependsOn: testClasses) {
         classifier = 'tests'
         from sourceSets.test.output
@@ -74,17 +73,19 @@ allprojects {
     repositories {
         mavenLocal()
         repos.each { repo ->
-            maven { url "$repo" }
+            maven {
+                url "$repo"
+                credentials {
+                    username mavenRepositoryUsername
+                    password mavenRepositoryPassword
+                }
+            }
         }
     }
 
     dependencyManagement {
         imports {
-            mavenBom("io.sunshower.base:bom-imported:${version}") {
-                bomProperties([
-                        'env.version': '1.0.13-SNAPSHOT'
-                ])
-            }
+            mavenBom("io.sunshower.base:bom-imported:${version}")
         }
     }
 
@@ -104,7 +105,6 @@ allprojects {
             testCompile('org.junit.platform:junit-platform-launcher')
             testCompile('org.junit.platform:junit-platform-commons')
             testCompile('org.junit.jupiter:junit-jupiter-engine')
-            testCompile('org.junit.vintage:junit-vintage-engine')
 
         }
     }
@@ -138,7 +138,9 @@ allprojects {
     }
 
     test {
-        useJUnitPlatform()
+        useJUnitPlatform {
+            includeEngines 'junit-jupiter'
+        }
     }
 
 }