Merged in broDom/scm-manager/dep-updates-2.x (pull request #37)

scm-server/pom.xml

@@ -64,7 +64,6 @@
               <assembleDirectory>${exploded.directory}</assembleDirectory>
               <repoPath>lib</repoPath>
               <repositoryLayout>flat</repositoryLayout>
-              <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
               <daemons>
                 <daemon>
 

scm-webapp/pom.xml

@@ -75,11 +75,13 @@
       <artifactId>jjwt-impl</artifactId>
       <version>${jjwt.version}</version>
     </dependency>
+
     <dependency>
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt-api</artifactId>
       <version>${jjwt.version}</version>
     </dependency>
+
     <dependency>
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt-jackson</artifactId>
@@ -99,16 +101,19 @@
       <artifactId>jackson-jaxrs-base</artifactId>
       <version>${jackson.version}</version>
     </dependency>
+
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jdk8</artifactId>
       <version>${jackson.version}</version>
     </dependency>
+
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
       <version>${jackson.version}</version>
     </dependency>
+
     <dependency>
       <groupId>javax</groupId>
       <artifactId>javaee-api</artifactId>
@@ -264,6 +269,7 @@
       <artifactId>tika-core</artifactId>
       <version>1.18</version>
     </dependency>
+
     <!-- test scope -->
 
     <dependency>
@@ -555,6 +561,8 @@
     <selenium.version>2.53.1</selenium.version>
     <wagon.version>1.0</wagon.version>
     <mustache.version>0.8.17</mustache.version>
+    <resteasy.version>3.1.4.Final</resteasy.version>
+    <jackson.version>2.8.9</jackson.version>
     <netbeans.hint.deploy.server>Tomcat</netbeans.hint.deploy.server>
     <sonar.issue.ignore.multicriteria>e1</sonar.issue.ignore.multicriteria>
     <sonar.issue.ignore.multicriteria.e1.ruleKey>javascript:S3827</sonar.issue.ignore.multicriteria.e1.ruleKey>