Skip to content

The Unified and Autonomous Development Platform

Add upgrade logic to 2.1.x

Robin Shene66f9ca541cd
diff --git a/core/src/main/java/io/onedev/server/command/UpgradeCommand.java b/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
index 46fabd4ef8..fc6eda7034 100644
--- a/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
+++ b/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
@@ -137,7 +137,6 @@ public class UpgradeCommand extends DefaultPersistManager {
}
}
}
- cleanAndCopy(new File(upgradeDir, "site/lib"), new File(Bootstrap.installDir, "site/lib"));
AtomicReference<String> oldDataVersion = new AtomicReference<>(null);
int ret = buildCommandline(upgradeDir, "check_data_version").execute(new LineConsumer() {
@@ -436,14 +435,6 @@ public class UpgradeCommand extends DefaultPersistManager {
}
}
}
- for (File file: Bootstrap.getSiteLibDir().listFiles()) {
- // end user may put some custom program files in site lib before upgrade,
- // to override site lib of old version
- if (file.getName().endsWith(".jar") || file.getName().endsWith(".zip")) {
- cleanAndCopy(Bootstrap.getSiteLibDir(), new File(upgradeDir, "site/lib"));
- break;
- }
- }
try {
File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf");
String wrapperConf = FileUtils.readFileToString(wrapperConfFile, Charsets.UTF_8);
diff --git a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
index 60a8caee68..57e07f9146 100644
--- a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
+++ b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
@@ -874,4 +874,24 @@ public class DatabaseMigrator {
}
}
+ private void migrate21(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Projects.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ for (Element branchProtectionElement: element.element("branchProtections").elements()) {
+ branchProtectionElement.element("branch").setName("branches");
+ for (Element fileProtectionElement: branchProtectionElement.element("fileProtections").elements()) {
+ fileProtectionElement.element("path").setName("paths");
+ }
+ }
+ for (Element tagProtectionElement: element.element("tagProtections").elements()) {
+ tagProtectionElement.element("tag").setName("tags");
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
diff --git a/pom.xml b/pom.xml
index 8d8d2ab9aa..f104e0e1a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,7 +210,7 @@
</repository>
</repositories>
<properties>
- <commons.version>1.0.7</commons.version>
+ <commons.version>1.0.8</commons.version>
<antlr.version>4.7.2</antlr.version>
</properties>
</project>
\ No newline at end of file
diff --git a/product/system/conf/wrapper-license.conf b/product/system/conf/wrapper-license.conf
index 22e7dfb8b3..304d663f7e 100644
--- a/product/system/conf/wrapper-license.conf
+++ b/product/system/conf/wrapper-license.conf
@@ -1,13 +1,13 @@
#encoding=UTF-8
wrapper.license.type=DEV
-wrapper.license.id=201803060000020
+wrapper.license.id=201903210000004
wrapper.license.licensee=Robin Shen
wrapper.license.group=OneDev
wrapper.license.dev_application=OneDev
wrapper.license.features=64bit
wrapper.license.upgrade_term.begin_date=2009-04-26
-wrapper.license.upgrade_term.end_date=2018-04-26
-wrapper.license.key.1=b492-fb58-75a2-663e
-wrapper.license.key.2=6fdb-dc35-f537-57ac
-wrapper.license.key.3=6fa4-94dc-7e98-e4fc
-wrapper.license.key.4=dc78-2d11-0637-a727
\ No newline at end of file
+wrapper.license.upgrade_term.end_date=2019-04-26
+wrapper.license.key.1=e478-2bba-20ce-c9c1
+wrapper.license.key.2=b953-db93-9597-5f8b
+wrapper.license.key.3=bfff-1044-645b-33b6
+wrapper.license.key.4=0a8a-1211-d1b9-ba0c
\ No newline at end of file