Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set version to 4.7.2-SNAPSHOT in 4.7 branch #1367

Merged
merged 3 commits into from Jan 26, 2016
Merged

Set version to 4.7.2-SNAPSHOT in 4.7 branch #1367

merged 3 commits into from Jan 26, 2016

Conversation

remibergsma
Copy link
Contributor

After releasing 4.7.1, next version is 4.7.2-SNAPSHOT in 4.7 branch.

@remibergsma
Copy link
Contributor Author

I'll also add the upgrade paths to this PR

@remibergsma
Copy link
Contributor Author

Tried upgrade from 4.7.1 to 4.7.2 and that was successful:

2016-01-26 12:47:32,170 DEBUG [c.c.u.d.VersionDaoImpl] (main:null) (logid:) Checking to see if the database is at a version before it was the version table is created
2016-01-26 12:47:32,196 INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) DB version = 4.7.1 Code Version = 4.7.2-SNAPSHOT
2016-01-26 12:47:32,197 INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Database upgrade must be performed from 4.7.1 to 4.7.2-SNAPSHOT
2016-01-26 12:47:32,197 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Running upgrade Upgrade471to472 to upgrade from 4.7.1-4.7.2 to 4.7.2
2016-01-26 12:47:32,201 DEBUG [c.c.u.s.Script] (main:null) (logid:) Looking for db/schema-471to472.sql in the classpath
2016-01-26 12:47:32,201 DEBUG [c.c.u.s.Script] (main:null) (logid:) System resource: null
2016-01-26 12:47:32,202 DEBUG [c.c.u.s.Script] (main:null) (logid:) Classpath resource: file:/data/git/cs2/cloudstack/client/target/utilities/scripts/db/db/schema-471to472.sql
2016-01-26 12:47:32,202 DEBUG [c.c.u.s.Script] (main:null) (logid:) Absolute path =  /data/git/cs2/cloudstack/client/target/utilities/scripts/db/db/schema-471to472.sql
2016-01-26 12:47:32,203 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Licensed to the Apache Software Foundation (ASF) under one
2016-01-26 12:47:32,203 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- or more contributor license agreements.  See the NOTICE file
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- distributed with this work for additional information
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- regarding copyright ownership.  The ASF licenses this file
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- to you under the Apache License, Version 2.0 (the
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- "License"); you may not use this file except in compliance
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- with the License.  You may obtain a copy of the License at
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --   http://www.apache.org/licenses/LICENSE-2.0
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Unless required by applicable law or agreed to in writing,
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- software distributed under the License is distributed on an
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- KIND, either express or implied.  See the License for the
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- specific language governing permissions and limitations
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- under the License.
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --;
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Schema upgrade from 4.7.1 to 4.7.2;
2016-01-26 12:47:32,204 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --;
2016-01-26 12:47:32,214 INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Cleaning upgrades because all management server are now at the same version
2016-01-26 12:47:32,216 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Upgrading to version 4.7.2...
2016-01-26 12:47:32,216 INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Cleanup upgrade Upgrade471to472 to upgrade from 4.7.1-4.7.2 to 4.7.2
2016-01-26 12:47:32,217 DEBUG [c.c.u.s.Script] (main:null) (logid:) Looking for db/schema-471to472-cleanup.sql in the classpath
2016-01-26 12:47:32,217 DEBUG [c.c.u.s.Script] (main:null) (logid:) System resource: null
2016-01-26 12:47:32,217 DEBUG [c.c.u.s.Script] (main:null) (logid:) Classpath resource: file:/data/git/cs2/cloudstack/client/target/utilities/scripts/db/db/schema-471to472-cleanup.sql
2016-01-26 12:47:32,217 DEBUG [c.c.u.s.Script] (main:null) (logid:) Absolute path =  /data/git/cs2/cloudstack/client/target/utilities/scripts/db/db/schema-471to472-cleanup.sql
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Licensed to the Apache Software Foundation (ASF) under one
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- or more contributor license agreements.  See the NOTICE file
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- distributed with this work for additional information
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- regarding copyright ownership.  The ASF licenses this file
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- to you under the Apache License, Version 2.0 (the
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- "License"); you may not use this file except in compliance
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- with the License.  You may obtain a copy of the License at
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --   http://www.apache.org/licenses/LICENSE-2.0
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Unless required by applicable law or agreed to in writing,
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- software distributed under the License is distributed on an
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- KIND, either express or implied.  See the License for the
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- specific language governing permissions and limitations
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- under the License.
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --;
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Schema cleanup from 4.7.1 to 4.7.2;
2016-01-26 12:47:32,218 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --;
2016-01-26 12:47:32,219 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Cleanup script /data/git/cs2/cloudstack/client/target/utilities/scripts/db/db/schema-471to472-cleanup.sql is executed successfully
2016-01-26 12:47:32,233 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Upgrade completed for version 4.7.2

@remibergsma
Copy link
Contributor Author

Ping @DaanHoogland @borisroman Please review.

@pdion891
Copy link
Contributor

LGTM, it's just a version number change.

@rafaelweingartner
Copy link
Member

I looked at the changes, just the upgrade of versions.
The PR LGTM

@asfgit asfgit merged commit 847fde3 into apache:4.7 Jan 26, 2016
asfgit pushed a commit that referenced this pull request Jan 26, 2016
@remibergsma
Merge pull request #1367 from remibergsma/472_version
e24d5e5 
Set version to 4.7.2-SNAPSHOT in 4.7 branchAfter releasing 4.7.1, next version is 4.7.2-SNAPSHOT in 4.7 branch.

* pr/1367:
  Implement upgrade path 4.7.1 -> 4.7.2
  Updating pom.xml version numbers for release 4.7.2-SNAPSHOT
  update debian changelog

Signed-off-by: Remi Bergsma <github@remi.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@remibergsma @pdion891 @rafaelweingartner @asfgit