Merge branch 'hotfix/2020.1.4'

openequella · Sep 10, 2020 · ea048fa · ea048fa
2 parents 210fb82 + 95f6db1
commit ea048fa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Source/Plugins/Core/com.equella.core/plugin-jpf.xml b/Source/Plugins/Core/com.equella.core/plugin-jpf.xml
@@ -5148,6 +5148,13 @@
     <parameter id="bean" value="bean:com.tle.core.institution.migration.v20192.AddLastOwnerMigration" />
     <parameter id="date" value="2019-09-17" />
   </extension>
+  <!-- Let 2020.1 know v20192.RemoveLastKnownUserConstraint-->
+  <extension plugin-id="com.tle.core.migration" point-id="migration" id="RemoveLastKnownUserConstraint20192">
+    <parameter id="id" value="com.tle.core.institution.migration.v20192.RemoveLastKnownUserConstraint" />
+    <parameter id="bean" value="bean:com.tle.core.institution.migration.v20201.RemoveLastKnownUserConstraint" />
+    <parameter id="date" value="2020-06-15" />
+    <parameter id="obsoletedby" value="com.tle.core.institution.migration.v20201.RemoveLastKnownUserConstraint" />
+  </extension>
   <extension plugin-id="com.tle.core.migration" point-id="migration" id="RemoveLastKnownUserConstraint">
     <parameter id="id" value="com.tle.core.institution.migration.v20201.RemoveLastKnownUserConstraint" />
     <parameter id="bean" value="bean:com.tle.core.institution.migration.v20201.RemoveLastKnownUserConstraint" />

diff --git a/...lla.core/src/com/tle/core/institution/migration/v20201/RemoveLastKnownUserConstraint.java b/...lla.core/src/com/tle/core/institution/migration/v20201/RemoveLastKnownUserConstraint.java
@@ -52,6 +52,11 @@ protected List<String> getAddSql(HibernateMigrationHelper helper) {
     return sql;
   }
 
+  @Override
+  public boolean isBackwardsCompatible() {
+    return true;
+  }
+
   @Override
   protected void executeDataMigration(
       HibernateMigrationHelper helper, MigrationResult result, Session session) throws Exception {

diff --git a/build.sbt b/build.sbt
@@ -116,7 +116,7 @@ name := "Equella"
 
 equellaMajor in ThisBuild := 2020
 equellaMinor in ThisBuild := 1
-equellaPatch in ThisBuild := 3
+equellaPatch in ThisBuild := 4
 equellaStream in ThisBuild := "Stable"
 equellaBuild in ThisBuild := buildConfig.value.getString("build.buildname")