Update

Author: luan-cestari

.travis.yml

@@ -4,14 +4,12 @@ jdk:
     - oraclejdk8
 before_install:
     - cp ./etc/settings.xml ~/.m2/
-    - cp ./etc/settings-arquillian.xml ~/
     - cp ./etc/onFailure.sh  ~/
     - cp ./etc/onSuccess.sh  ~/
-    - cp ./etc/logging.properties  ~/
     - chmod 777 ~/onFailure.sh
     - chmod 777 ~/onSuccess.sh
 script:
-    - mvn -B clean verify cobertura:cobertura coveralls:cobertura -Dorg.apache.maven.user-settings=~/settings-arquillian.xml -Dorg.apache.maven.global-settings=~/settings-arquillian.xml
+    - mvn -B clean verify cobertura:cobertura coveralls:report
 after_failure: ~/onFailure.sh
 after_success: ~/onSuccess.sh
 notifications:

etc/logging.properties

@@ -13,6 +13,7 @@ fi
 
 # prepare and verify state
 git fetch --all
+rm -rf ~/.m2/repository/com/redhat/lightblue/
 
 BRANCH=`git branch | grep ^* | awk '{print $2}'`
 
@@ -49,6 +50,4 @@ git push origin master --tags
 # perform release
 mvn release:perform -P release || exit
 
-mvn versions:set -DnewVersion=$DEVEL_VERSION
-
 mvn clean deploy

etc/release.sh

@@ -30,10 +30,6 @@
 
     <artifactId>lightblue-ldap-integration-test</artifactId>
 
-    <properties>
-          <lightblue.mongo.version>1.3.0-SNAPSHOT</lightblue.mongo.version>
-    </properties>
-    
     <dependencies>
         <dependency>
             <groupId>com.redhat.lightblue.ldap</groupId>
@@ -49,13 +45,13 @@
         <dependency>
             <groupId>com.redhat.lightblue.mongo</groupId>
             <artifactId>lightblue-mongo-config</artifactId>
-            <version>${lightblue.mongo.version}</version>
+            <version>1.3.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.redhat.lightblue.mongo</groupId>
             <artifactId>lightblue-mongo-test</artifactId>
-            <version>${lightblue.mongo.version}</version>
+            <version>1.3.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

etc/settings-arquillian.xml

@@ -51,7 +51,7 @@
         <connection>scm:git:https://github.com/lightblue-platform/lightblue-ldap.git</connection>
         <developerConnection>scm:git:[email protected]:lightblue-platform/lightblue-ldap.git</developerConnection>
         <url>https://github.com/lightblue-platform/lightblue-ldap</url>
-      <tag>HEAD</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
@@ -62,18 +62,6 @@
     </distributionManagement>
 
     <properties>
-        <!-- Lightblue Core -->
-        <lightblue-core.version>1.3.0-SNAPSHOT</lightblue-core.version>
-        
-        <!-- 3rd Party -->
-        <unboundid.version>2.3.8</unboundid.version>
-        <hystrix.version>1.3.16</hystrix.version>
-        <slf4j.version>1.7.7</slf4j.version>
-        
-        <!-- Test -->
-        <junit.version>4.11</junit.version>
-        <mockito.version>1.10.8</mockito.version>
-        
         <!-- Sonar -->
         <sonar.exclusions>**/*Test.java,**/*Exception.java</sonar.exclusions>
         <sonar.jdbc.url>jdbc:mysql://127.0.0.1:3306/sonar?useUnicode=true&amp;characterEncoding=utf8&amp;rewriteBatchedStatements=true</sonar.jdbc.url>
@@ -98,7 +86,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
+            <version>1.7.7</version>
         </dependency>
 
         <!-- Global Test Dependencies -->
@@ -126,17 +114,17 @@
             <dependency>
                 <groupId>com.redhat.lightblue</groupId>
                 <artifactId>lightblue-core-config</artifactId>
-                <version>${lightblue-core.version}</version>
+                <version>1.3.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.redhat.lightblue</groupId>
                 <artifactId>lightblue-core-crud</artifactId>
-                <version>${lightblue-core.version}</version>
+                <version>1.3.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.redhat.lightblue</groupId>
                 <artifactId>lightblue-core-metadata</artifactId>
-                <version>${lightblue-core.version}</version>
+                <version>1.3.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Lightblue Ldap -->
@@ -176,37 +164,37 @@
             <dependency>
                 <groupId>com.unboundid</groupId>
                 <artifactId>unboundid-ldapsdk</artifactId>
-                <version>${unboundid.version}</version>
+                <version>2.3.8</version>
             </dependency>
             <dependency>
                 <groupId>com.netflix.hystrix</groupId>
                 <artifactId>hystrix-core</artifactId>
-                <version>${hystrix.version}</version>
+                <version>1.3.16</version>
             </dependency>
 
             <!-- Test -->
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
+                <version>4.11</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
-                <version>${slf4j.version}</version>
+                <version>1.7.7</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>${mockito.version}</version>
+                <version>1.10.8</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>com.redhat.lightblue</groupId>
                 <artifactId>lightblue-core-test</artifactId>
-                <version>${lightblue-core.version}</version>
+                <version>1.3.0-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>