Merge pull request #146 from Alfresco/master

ATS-440: ATS: T-Engines - release 2.1.0

.travis.yml

@@ -18,11 +18,9 @@ cache:
 branches:
   only:
     - master
-    - SP/1.3.N
+    - /^SP\/.+$/
-    - SP/2.0.N
     - release
-    - release/SP/1.3.N
+    - /^release\/SP\/.+$/
-    - release/SP/2.0.N
     - company_release
     - /^ATS-.*$/
 
@@ -48,7 +46,7 @@ jobs:
 
     - name: "Release"
       stage: release
-      if: branch IN (release, release/SP/1.3.N, release/SP/2.0.N)
+      if: branch = release OR branch =~ /^release\/SP\/.+$/
       before_install: bash _ci/init.sh
       before_script: travis_wait bash _ci/cache_artifacts.sh
       script: travis_wait 30 bash _ci/release.sh
@@ -63,12 +61,13 @@ jobs:
         local_dir: "deploy_dir"
         upload-dir: "enterprise/AlfrescoTransformServices/TransformEngines/${VERSION}"
         on:
-          branch: release
+          all_branches: true
 
     - name: "Company Release"
       stage: company_release
       if: branch = company_release
       before_install: bash _ci/init.sh
+      install: echo "NoOp"
       script: echo "NoOp"
       before_deploy: source _ci/prepare_release_deploy.sh
       deploy:

_ci/settings.xml

@@ -64,6 +64,12 @@
             <username>bamboo</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
+        <server>
+            <id>alfresco-thirdparty</id>
+            <username>bamboo</username>
+            <password>${env.NEXUS_PASSWORD}</password>
+        </server>
+        
         <!-- private docker registry-->
         <server>
             <id>quay.io</id>

pom.xml

@@ -25,7 +25,7 @@
         <env.project_version>${project.version}</env.project_version>
         <dependency.alfresco-transform-model.version>1.0.2.7</dependency.alfresco-transform-model.version>
         <dependency.activemq.version>5.15.9</dependency.activemq.version>
-        <dependency.jackson.version>2.9.10</dependency.jackson.version>
+        <dependency.jackson.version>2.10.0</dependency.jackson.version>
         <dependency.cxf.version>3.3.3</dependency.cxf.version>
         <dependency.poi.version>4.0.1</dependency.poi.version>
     </properties>