Merge pull request #3336 from dewniMW/branch01

Remove uma.properties file
wso2 · Jun 28, 2018 · f2f2c9d · f2f2c9d
2 parents 114e795 + 5c7ddc3
commit f2f2c9d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
@@ -1024,13 +1024,6 @@
             </outputDirectory>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/uma.properties
-            </source>
-            <outputDirectory>wso2is-${pom.version}/repository/conf/identity</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/certificate-validation.xml

diff --git a/pom.xml b/pom.xml
@@ -1902,8 +1902,8 @@
         <snakeyaml.version>1.16.0.wso2v1</snakeyaml.version>
         <json.version>3.0.0.wso2v1</json.version>
         <carbon.consent.mgt.version>1.0.53</carbon.consent.mgt.version>
-        <carbon.database.utils.version>2.0.6</carbon.database.utils.version>
-        <carbon.identity.oauth.uma.version>1.0.4</carbon.identity.oauth.uma.version>
+        <carbon.database.utils.version>2.0.7</carbon.database.utils.version>
+        <carbon.identity.oauth.uma.version>1.0.6</carbon.identity.oauth.uma.version>
         <liberty.maven.plugin.version>2.2</liberty.maven.plugin.version>
         <maven.war.plugin.version>3.2.0</maven.war.plugin.version>
         <snakeyaml.version.range>[1.16.0, 1.17.0)</snakeyaml.version.range>