Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FLAG-73: upgrade openmrs version from 1.9.9 to 2.0.0 #58

Merged
merged 1 commit into from
Jun 14, 2024
Merged

FLAG-73: upgrade openmrs version from 1.9.9 to 2.0.0 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
FLAG-73: upgrade openmrs version from 1.9.9 to 2.0.0 
FLAG-73: remove unwanted dependencies and properties

FLAG-73: remove unwanted dependencies

FLAG-73: update legacy UI to latest version
  • Loading branch information
@ManojLL
ManojLL committed Jun 14, 2024
commit 8d102a477e03f81bb22afc55300629783d5789aa
25 changes: 4 additions & 21 deletions omod/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@
<groupId>org.openmrs.module</groupId>
<artifactId>uiframework-api</artifactId>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-omod</artifactId>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -200,27 +204,6 @@

<!-- different profiles for building/testing against different version of openmrs -->
<profiles>
<profile>
<id>openmrs-2.0</id>
<dependencies>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-api</artifactId>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-omod</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>


<!--deploys webapp files directly to web app directory -->
<profile>
<id>deploy-web</id>
Expand Down
51 changes: 15 additions & 36 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,31 @@
<version>${metadatasharingVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need both legacyui-omod and legacyui-api?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed legacyui-api dependency

<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-omod</artifactId>
<version>${legacyuiVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-api</artifactId>
<version>${legacyuiVersion}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

<!-- default property values, required for eclipse build path configuration -->
<properties>
<openMRSVersion>1.9.9</openMRSVersion>
<openMRSMinorVersion>1.9</openMRSMinorVersion>
<openMRSVersion>2.0.0</openMRSVersion>
<openMRSMinorVersion>2.0</openMRSMinorVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<uiframeworkVersion>3.11.0</uiframeworkVersion>
<metadatadeployVersion>1.8.1</metadatadeployVersion>
<metadatasharingVersion>1.2.2</metadatasharingVersion>
<webservices.rest-omod.version>2.40.0</webservices.rest-omod.version>
<legacyuiVersion>1.16.0</legacyuiVersion>
</properties>

<build>
Expand Down Expand Up @@ -191,39 +204,5 @@
</properties>
</profile>

<profile>
<id>openmrs-2.0</id>

<properties>
<openMRSVersion>2.0.4</openMRSVersion>
<openMRSMinorVersion>2.0</openMRSMinorVersion>
<legacyuiVersion>1.2.3</legacyuiVersion>
<omodHbmConfig>
DisplayPoint.hbm.xml
Flag.hbm.xml
Priority.hbm.xml
Tag.hbm.xml
</omodHbmConfig>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-omod</artifactId>
<version>${legacyuiVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-api</artifactId>
<version>${legacyuiVersion}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
</profile>


</profiles>
</project>
Loading