Advertisement
Guest User

Untitled

a guest
Jul 30th, 2017
112
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.56 KB | None | 0 0
  1. kiiza@kiiza-Extensa-5635Z:~/openmrs/openmrs-module-metadatadeploy$ git diff
  2. diff --git a/api/src/main/java/org/openmrs/module/metadatadeploy/bundle/CoreConstructors.java b/api/src/main/java/org/openmrs/module/metadatadep
  3. index 0ba558d..1db71c4 100644
  4. --- a/api/src/main/java/org/openmrs/module/metadatadeploy/bundle/CoreConstructors.java
  5. +++ b/api/src/main/java/org/openmrs/module/metadatadeploy/bundle/CoreConstructors.java
  6. @@ -14,6 +14,10 @@
  7.  
  8. package org.openmrs.module.metadatadeploy.bundle;
  9.  
  10. +import org.openmrs.api.db.hibernate.DbSessionFactory;
  11. +
  12. +import org.hibernate.SessionFactory;
  13. +
  14. import org.apache.commons.collections.CollectionUtils;
  15. import org.apache.commons.collections.Transformer;
  16. import org.apache.commons.lang.StringUtils;
  17. @@ -56,6 +60,16 @@ import java.util.Set;
  18. public class CoreConstructors {
  19.  
  20. /**
  21. + * Constructs a dbsessionFactory source
  22. + * @return the transient object
  23. + */
  24. + public static DbSessionFactory dbSessionFactory(SessionFactory sessionFactory) {
  25. + DbSessionFactory obj = new DbSessionFactory();
  26. + obj.getSessionFactory(sessionFactory);
  27. + return obj;
  28. + }
  29. +
  30. + /**
  31. * Constructs a concept source
  32. * @param name the name
  33. * @param description the description
  34. diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml
  35. index edb66e0..3dd49c3 100644
  36. --- a/omod/src/main/resources/config.xml
  37. +++ b/omod/src/main/resources/config.xml
  38. @@ -7,7 +7,7 @@
  39. <author>I-TECH</author>
  40. <description>${project.parent.description}</description>
  41. <updateURL>https://dev.openmrs.org/modules/download/${project.parent.artifactId}/update.rdf</updateURL>
  42. - <require_version>${openMRSVersion}</require_version>
  43. + <require_version>2.0,1.11.3, 1.10.2 - 1.10.*, 1.9.9 - 1.9.*</require_version>
  44.  
  45. <require_modules>
  46. <require_module version="${metadatasharingVersion}">org.openmrs.module.metadatasharing</require_module>
  47. diff --git a/pom.xml b/pom.xml
  48. index 5f1b054..9876c44 100644
  49. --- a/pom.xml
  50. +++ b/pom.xml
  51. @@ -40,8 +40,8 @@
  52. </modules>
  53.  
  54. <properties>
  55. - <openMRSVersion>1.9.4</openMRSVersion>
  56. - <openMRSBuildVersion>1.9.4</openMRSBuildVersion>
  57. + <openMRSVersion>1.10.2</openMRSVersion>
  58. + <openMRSBuildVersion>1.10.2</openMRSBuildVersion>
  59.  
  60. <!-- Module dependencies -->
  61. <metadatasharingVersion>1.1.8</metadatasharingVersion>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement