Merge 25.11 to 26.1

labkey-teamcity · labkey-teamcity · commit cc234879d1a3 · 2026-01-06T10:11:50.000Z
diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRModule.java b/snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRModule.java
@@ -119,7 +119,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 25.001;
+        return 26.000;
     }
 
     @Override
diff --git a/snprc_r24/src/org/labkey/snprc_r24/snprc_r24Module.java b/snprc_r24/src/org/labkey/snprc_r24/snprc_r24Module.java
@@ -46,7 +46,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 25.000;
+        return 26.000;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public String getName()`
`119`	`119`	`@Override`
`120`	`120`	`public @Nullable Double getSchemaVersion()`
`121`	`121`	`{`
`122`		`- return 25.001;`
	`122`	`+ return 26.000;`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public String getName()`
`46`	`46`	`@Override`
`47`	`47`	`public @Nullable Double getSchemaVersion()`
`48`	`48`	`{`
`49`		`- return 25.000;`
	`49`	`+ return 26.000;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`