Skip to content

Commit

Permalink
bump to version 1.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
rkrenn committed Apr 22, 2022
1 parent 743b33e commit c67f158
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dbtool.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
CTSMS_PROPERTIES=/ctsms/properties
$JAVA_HOME/bin/java -DCTSMS_PROPERTIES="$CTSMS_PROPERTIES" -DCTSMS_JAVA="$CTSMS_JAVA" -Dfile.encoding=Cp1252 -Djava.awt.headless=true -classpath /home/runner/work/ctsms/ctsms/web/target/ctsms-1.7.0/WEB-INF/lib/ctsms-core-1.7.0.jar:/home/runner/work/ctsms/ctsms/web/target/ctsms-1.8.0/WEB-INF/lib/* org.phoenixctms.ctsms.executable.DBTool $*
$JAVA_HOME/bin/java -DCTSMS_PROPERTIES="$CTSMS_PROPERTIES" -DCTSMS_JAVA="$CTSMS_JAVA" -Dfile.encoding=Cp1252 -Djava.awt.headless=true -classpath /home/runner/work/ctsms/ctsms/web/target/ctsms-1.7.0/WEB-INF/lib/ctsms-core-1.8.1.jar:/home/runner/work/ctsms/ctsms/web/target/ctsms-1.8.1/WEB-INF/lib/* org.phoenixctms.ctsms.executable.DBTool $*
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.phoenixctms.ctsms</groupId>
<artifactId>ctsms</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
</parent>
<artifactId>ctsms-common</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/db/schema-set-version.sql
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ begin
end
$$ language plpgsql;

select set_database_version('010800011');
select set_database_version('010801000');
8 changes: 8 additions & 0 deletions core/db/schema-up-181.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

alter table PASSWORD add column ENABLE2FA BOOLEAN;
update PASSWORD set ENABLE2FA = 'f';
alter table PASSWORD alter ENABLE2FA set not null;

alter table PASSWORD add column SHOW_OTP_REGISTRATION_INFO BOOLEAN;
update PASSWORD set SHOW_OTP_REGISTRATION_INFO = 'f';
alter table PASSWORD alter SHOW_OTP_REGISTRATION_INFO set not null;
24 changes: 0 additions & 24 deletions core/db/schema-up-master.sql
Original file line number Diff line number Diff line change
@@ -1,24 +0,0 @@
do
$$
begin

if get_database_version() < '010800001' then

alter table PASSWORD add column ENABLE2FA BOOLEAN;
update PASSWORD set ENABLE2FA = 'f';
alter table PASSWORD alter ENABLE2FA set not null;

select set_database_version('010800001');
end if;

if get_database_version() < '010800011' then

alter table PASSWORD add column SHOW_OTP_REGISTRATION_INFO BOOLEAN;
update PASSWORD set SHOW_OTP_REGISTRATION_INFO = 'f';
alter table PASSWORD alter SHOW_OTP_REGISTRATION_INFO set not null;

select set_database_version('010800011');
end if;

end
$$;
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.phoenixctms.ctsms</groupId>
<artifactId>ctsms</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
</parent>
<artifactId>ctsms-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion mda/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.phoenixctms.ctsms</groupId>
<artifactId>ctsms</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
</parent>
<artifactId>ctsms-mda</artifactId>
<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>org.phoenixctms.ctsms</groupId>
<artifactId>ctsms</artifactId>
<packaging>pom</packaging>
<version>1.8.0</version>
<version>1.8.1</version>
<name>Clinical Trial Site Management System</name>
<description>The Clinical Trial Site Management System Project.</description>
<scm>
Expand Down Expand Up @@ -597,7 +597,7 @@
<application.id>ctsms</application.id>
<application.package>org.phoenixctms.ctsms</application.package>
<application.name>Phoenix Clinical Trial Management System</application.name>
<application.version>1.8.0</application.version>
<application.version>1.8.1</application.version>
<application.abbreviation>Phoenix CTMS</application.abbreviation>
<dataSource.name>jdbc/${application.id}</dataSource.name>
<dataSource>java:comp/env/${dataSource.name}</dataSource>
Expand Down
2 changes: 1 addition & 1 deletion web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.phoenixctms.ctsms</groupId>
<artifactId>ctsms</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
</parent>
<artifactId>ctsms-web</artifactId>
<packaging>war</packaging>
Expand Down

0 comments on commit c67f158

Please sign in to comment.