syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [1/4] syncope git commit: [SYNCOPE-753] Adding user and role migration from 1.2
Date Fri, 06 May 2016 11:56:07 GMT
Repository: syncope
Updated Branches:
  refs/heads/master 44346bb66 -> 9ef167750


http://git-wip-us.apache.org/repos/asf/syncope/blob/9ef16775/fit/core-reference/src/test/resources/test.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/resources/test.properties b/fit/core-reference/src/test/resources/test.properties
new file mode 100644
index 0000000..5a81ddc
--- /dev/null
+++ b/fit/core-reference/src/test/resources/test.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+basedir=${basedir}

http://git-wip-us.apache.org/repos/asf/syncope/blob/9ef16775/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 43074da..0e8a59c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,7 +327,7 @@ under the License.
 
     <connid.version>1.4.2.0</connid.version>
     <connid.soap.version>1.4.1</connid.soap.version>
-    <connid.database.version>2.2.3</connid.database.version>
+    <connid.database.version>2.2.4-SNAPSHOT</connid.database.version>
     <connid.csvdir.version>0.8.4</connid.csvdir.version>
     <connid.ldap.version>1.5.1</connid.ldap.version>
     <connid.ad.version>1.3.1</connid.ad.version>
@@ -1463,7 +1463,7 @@ under the License.
                 <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
                 <extractDir>${project.build.directory}/cargo/extract</extractDir>
               </zipUrlInstaller>
-              <timeout>240000</timeout>
+              <timeout>300000</timeout>
               <log>${cargo.log}</log>
               <output>${cargo.output}</output>    
             </container>


Mime
View raw message