Merge branch 'master' into transifex

Evolveum · Jul 10, 2017 · d2a1e93 · d2a1e93
2 parents 4bbff9b + 1fdb909
commit d2a1e93
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -80,7 +80,7 @@
         <activiti-spring.version>5.22.0</activiti-spring.version>
         <commons-email.version>1.3</commons-email.version>
         <xmlsec.version>2.0.6</xmlsec.version>
-        <connid.version>1.4.2.35</connid.version>
+        <connid.version>1.4.3.0</connid.version>
         <jasper.version>6.4.1</jasper.version>
         <derby.version>10.11.1.1</derby.version>
         <wro4j.version>1.8.0</wro4j.version>

diff --git a/...ning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorManager.java b/...ning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorManager.java
@@ -53,7 +53,7 @@
 @DirtiesContext
 public class TestConnectorManager extends AbstractIntegrationTest {
 
-	private static final String CONNID_FRAMEWORK_VERSION = "1.4.2.35";
+	private static final String CONNID_FRAMEWORK_VERSION = "1.4.3.0";
 
 	@Autowired
 	private ProvisioningService provisioningService;