Skip to content

Commit 17219df

Browse files
committed
Merge release branch 4.6 to master
* 4.6: more poms didn't get updated with script implemented upgrade path from 4.6.0 to 4.6.1 checkstyle pom didn't get updated with script debian: add 4.6.1-snapshot to changelog Updating pom.xml version numbers for release 4.6.1-SNAPSHOT Updating pom.xml version numbers for release 4.6.0
2 parents ea7c2d9 + f6db0a2 commit 17219df

6 files changed

Lines changed: 110 additions & 3 deletions

File tree

build/replace.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ AGENTLOG=logs/agent.log
2626
MSMNTDIR=/mnt
2727
COMPONENTS-SPEC=components.xml
2828
REMOTEHOST=localhost
29-
COMMONLIBDIR=client/target/cloud-client-ui-4.6.0-SNAPSHOT/WEB-INF/lib/
29+
COMMONLIBDIR=client/target/cloud-client-ui-4.6.0/WEB-INF/lib/
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
18+
package com.cloud.upgrade.dao;
19+
20+
import com.cloud.utils.exception.CloudRuntimeException;
21+
import com.cloud.utils.script.Script;
22+
import org.apache.log4j.Logger;
23+
24+
import java.io.File;
25+
import java.sql.Connection;
26+
27+
public class Upgrade460to461 implements DbUpgrade {
28+
final static Logger s_logger = Logger.getLogger(Upgrade460to461.class);
29+
30+
@Override
31+
public String[] getUpgradableVersionRange() {
32+
return new String[] {"4.6.0", "4.6.1"};
33+
}
34+
35+
@Override
36+
public String getUpgradedVersion() {
37+
return "4.6.1";
38+
}
39+
40+
@Override
41+
public boolean supportsRollingUpgrade() {
42+
return false;
43+
}
44+
45+
@Override
46+
public File[] getPrepareScripts() {
47+
String script = Script.findScript("", "db/schema-460to461.sql");
48+
if (script == null) {
49+
throw new CloudRuntimeException("Unable to find db/schema-460to461.sql");
50+
}
51+
return new File[] {new File(script)};
52+
}
53+
54+
@Override
55+
public void performDataMigration(Connection conn) {
56+
}
57+
58+
@Override
59+
public File[] getCleanupScripts() {
60+
String script = Script.findScript("", "db/schema-460to461-cleanup.sql");
61+
if (script == null) {
62+
throw new CloudRuntimeException("Unable to find db/schema-460to461-cleanup.sql");
63+
}
64+
65+
return new File[] {new File(script)};
66+
}
67+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
--;
19+
-- Schema cleanup from 4.6.0 to 4.6.1;
20+
--;

setup/db/db/schema-460to461.sql

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
--;
19+
-- Schema upgrade from 4.6.0 to 4.6.1;
20+
--;

tools/marvin/marvin/deployAndRun.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class ShellColor(object):
163163
END = '\033[0m'
164164
ITALICS = '\x1B[3m'
165165

166-
#VERSION = "4.5.1-SNAPSHOT"
166+
#VERSION = "4.7.0-SNAPSHOT"
167167

168168

169169
class MarvinCli(cmd.Cmd, object):

tools/marvin/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
raise RuntimeError("python setuptools is required to build Marvin")
2828

2929

30-
VERSION = "4.6.0-SNAPSHOT"
30+
VERSION = "4.7.0-SNAPSHOT"
3131

3232
setup(name="Marvin",
3333
version=VERSION,

0 commit comments

Comments
 (0)