Update CircleCI configuration

.circleci/config.yml

@@ -0,0 +1,37 @@
+version: 2.1
+
+orbs:
+  maven: circleci/[email protected]
+
+executors:
+  openjdk8:
+    docker:
+      - image: cimg/openjdk:8.0
+
+workflows:
+  build-and-deploy:
+    jobs:
+      - maven/test:
+          name: build
+          executor: openjdk8
+          filters:
+            branches:
+              only:
+                - master
+          settings_file: .circleci/m2-settings.xml
+          verify_dependencies: false
+      - maven/test:
+          name: deploy
+          executor: openjdk8
+          requires:
+            - build
+          context:
+            - org-global
+            - cloudsoft-artifactory
+          filters:
+            branches:
+              only:
+                - master
+          settings_file: .circleci/m2-settings.xml
+          command: deploy -DskipTests -P cloudsoft-release
+          verify_dependencies: false

.circleci/m2-settings.xml

@@ -0,0 +1,42 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>cloudsoft-deploy-artifactory-snapshot</id>
+            <username>${env.ARTIFACTORY_USERNAME}</username>
+            <password>${env.ARTIFACTORY_PASSWORD}</password>
+        </server>
+        <server>
+            <id>cloudsoft-deploy-artifactory-release</id>
+            <username>${env.ARTIFACTORY_USERNAME}</username>
+            <password>${env.ARTIFACTORY_PASSWORD}</password>
+        </server>
+
+        <server>
+            <id>cloudsoft-snapshots</id>
+            <username>${env.ARTIFACTORY_USERNAME}</username>
+            <password>${env.ARTIFACTORY_PASSWORD}</password>
+        </server>
+        <server>
+            <id>cloudsoft-releases</id>
+            <username>${env.ARTIFACTORY_USERNAME}</username>
+            <password>${env.ARTIFACTORY_PASSWORD}</password>
+        </server>
+        <server>
+            <id>cloudsoft-artifactory-repo</id>
+            <username>${env.ARTIFACTORY_USERNAME}</username>
+            <password>${env.ARTIFACTORY_PASSWORD}</password>
+        </server>
+
+        <server>
+            <id>sonatype-nexus-staging</id>
+            <username>${env.SONATYPE_USER}</username>
+            <password>${env.SONATYPE_PASSWORD}</password>
+        </server>
+        <server>
+            <id>sonatype-nexus-snapshots</id>
+            <username>${env.SONATYPE_USER}</username>
+            <password>${env.SONATYPE_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>

pom.xml

@@ -27,12 +27,49 @@
 
     <repositories>
         <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
+            <id>sonatype-oss-releases</id>
+            <url>https://oss.sonatype.org/content/repositories/releases/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>sonatype-oss-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>apache-snapshots</id>
+            <url>https://repository.apache.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <!-- Cloudsoft repo, for custom releases of jclouds vcloud-director etc -->
+        <repository>
+            <id>cloudsoft-releases</id>
+            <url>https://artifactory.cloudsoftcorp.com/artifactory/libs-release-local/</url>
+        </repository>
+        <repository>
+            <id>cloudsoft-snapshots</id>
+            <url>https://artifactory.cloudsoftcorp.com/artifactory/libs-snapshot-local/</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
     </repositories>