repo_name stringclasses 5 values | pr_number int64 1.52k 15.5k | pr_title stringlengths 8 143 | pr_description stringlengths 0 10.2k | author stringlengths 3 18 | date_created timestamp[ns, tz=UTC] | date_merged timestamp[ns, tz=UTC] | previous_commit stringlengths 40 40 | pr_commit stringlengths 40 40 | query stringlengths 11 10.2k | filepath stringlengths 6 220 | before_content stringlengths 0 597M | after_content stringlengths 0 597M | label int64 -1 1 |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/index.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>Apollo</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="keywords" content="apollo,configuration,server,java,microservice" />
<meta name="description" content="A reliable configuration management system" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0" />
<meta name="google-site-verification" content="CuvYz6OxISNH7wdJsnS8oNtJJn9IP6k0zz5x6m9uXco" />
<!-- theme -->
<link rel="stylesheet" href="css/vue.css" title="vue" />
<link rel="stylesheet" href="css/dark.css" title="dark" disabled />
<link rel="stylesheet" href="css/buble.css" title="buble" disabled />
<link rel="stylesheet" href="css/pure.css" title="pure" disabled />
<style type="text/css">
.sidebar-nav >ul >li.file p >a {
font-size: 15px;
font-weight: 700;
color: #364149;
}
.sidebar-nav .folder {
cursor: pointer;
}
</style>
</head>
<body>
<div id="app">Loading ...</div>
<script>
window.$docsify = {
alias: {
'/': 'zh/README.md',
'/zh/.*/_sidebar.md': '/zh/_sidebar.md',
'/en/.*/_sidebar.md': '/en/_sidebar.md',
'/zh/.*/_navbar.md': '/zh/_navbar.md',
'/en/.*/_navbar.md': '/en/_navbar.md',
'/zh/(.*)': 'zh/$1',
'/en/(.*)': 'en/$1',
},
auto2top: true,
// Only coverpage is loaded when visiting the home page.
onlyCover: true,
coverpage: true,
loadSidebar: true,
loadNavbar: true,
mergeNavbar: true,
maxLevel: 6,
subMaxLevel: 5,
name: 'Apollo',
repo: 'https://github.com/ctripcorp/apollo/',
search: {
noData: {
'/zh/': '没有结果!',
'/en/': 'No results!',
'/': '没有结果!',
},
paths: 'auto',
placeholder: {
'/zh/': '搜索',
'/en/': 'Search',
'/': '搜索',
},
},
// click to copy.
copyCode: {
buttonText: {
'/zh/': '点击复制',
'/en/': 'Copy to clipboard',
'/': 'Copy to clipboard',
},
errorText: {
'/zh/': '错误',
'/en/': 'Error',
'/': 'Error',
},
successText: {
'/zh/': '复制成功',
'/en': 'Copied',
'/': 'Copied',
},
},
// docsify-pagination
pagination: {
crossChapter: true,
crossChapterText: true,
},
plugins: [
// Edit Document Button in each page
function (hook, vm) {
hook.beforeEach(function (html) {
if (/githubusercontent\.com/.test(vm.route.file)) {
url = vm.route.file
.replace('raw.githubusercontent.com', 'github.com')
.replace(/\/master/, '/blob/master')
} else {
url = 'https://github.com/ctripcorp/apollo/blob/master/docs/' + vm.route.file
}
var editHtml = '[:memo: Edit Document](' + url + ')\n\n'
return editHtml
+ html
+ '\n\n----\n\n'
+ '<a href="https://docsify.js.org" target="_blank" style="color: inherit; font-weight: normal; text-decoration: none;">Powered by docsify</a>'
})
},
],
};
</script>
<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/docsify.min.js"></script>
<!-- plugins -->
<!-- support search -->
<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/search.min.js"></script>
<!-- Support docsify sidebar catalog expand and collapse -->
<script src="//cdn.jsdelivr.net/npm/docsify-sidebar-collapse/dist/docsify-sidebar-collapse.min.js"></script>
<!-- Medium's image zoom -->
<script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/zoom-image.min.js"></script>
<!-- Add a simple Click to copy button to all preformatted code blocks to effortlessly allow users to copy example code from your docs -->
<script src="//cdn.jsdelivr.net/npm/docsify-copy-code"></script>
<!-- docsify-pagination -->
<script src="//cdn.jsdelivr.net/npm/docsify-pagination/dist/docsify-pagination.min.js"></script>
<!-- code highlight -->
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-bash.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-csharp.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-java.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-json.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-markdown.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-nginx.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-properties.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-sql.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-xml-doc.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-yaml.min.js"></script>
</body>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?d47d58dcc5ba5c0c7dccab29717379c6";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</html>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>Apollo</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="keywords" content="apollo,configuration,server,java,microservice" />
<meta name="description" content="A reliable configuration management system" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0" />
<meta name="google-site-verification" content="CuvYz6OxISNH7wdJsnS8oNtJJn9IP6k0zz5x6m9uXco" />
<!-- theme -->
<link rel="stylesheet" href="css/vue.css" title="vue" />
<link rel="stylesheet" href="css/dark.css" title="dark" disabled />
<link rel="stylesheet" href="css/buble.css" title="buble" disabled />
<link rel="stylesheet" href="css/pure.css" title="pure" disabled />
<style type="text/css">
.sidebar-nav >ul >li.file p >a {
font-size: 15px;
font-weight: 700;
color: #364149;
}
.sidebar-nav .folder {
cursor: pointer;
}
</style>
</head>
<body>
<div id="app">Loading ...</div>
<script>
window.$docsify = {
alias: {
'/': 'zh/README.md',
'/zh/.*/_sidebar.md': '/zh/_sidebar.md',
'/en/.*/_sidebar.md': '/en/_sidebar.md',
'/zh/.*/_navbar.md': '/zh/_navbar.md',
'/en/.*/_navbar.md': '/en/_navbar.md',
'/zh/(.*)': 'zh/$1',
'/en/(.*)': 'en/$1',
},
auto2top: true,
// Only coverpage is loaded when visiting the home page.
onlyCover: true,
coverpage: true,
loadSidebar: true,
loadNavbar: true,
mergeNavbar: true,
maxLevel: 6,
subMaxLevel: 5,
name: 'Apollo',
repo: 'https://github.com/ctripcorp/apollo/',
search: {
noData: {
'/zh/': '没有结果!',
'/en/': 'No results!',
'/': '没有结果!',
},
paths: 'auto',
placeholder: {
'/zh/': '搜索',
'/en/': 'Search',
'/': '搜索',
},
},
// click to copy.
copyCode: {
buttonText: {
'/zh/': '点击复制',
'/en/': 'Copy to clipboard',
'/': 'Copy to clipboard',
},
errorText: {
'/zh/': '错误',
'/en/': 'Error',
'/': 'Error',
},
successText: {
'/zh/': '复制成功',
'/en': 'Copied',
'/': 'Copied',
},
},
// docsify-pagination
pagination: {
crossChapter: true,
crossChapterText: true,
},
plugins: [
// Edit Document Button in each page
function (hook, vm) {
hook.beforeEach(function (html) {
if (/githubusercontent\.com/.test(vm.route.file)) {
url = vm.route.file
.replace('raw.githubusercontent.com', 'github.com')
.replace(/\/master/, '/blob/master')
} else {
url = 'https://github.com/ctripcorp/apollo/blob/master/docs/' + vm.route.file
}
var editHtml = '[:memo: Edit Document](' + url + ')\n\n'
return editHtml
+ html
+ '\n\n----\n\n'
+ '<a href="https://docsify.js.org" target="_blank" style="color: inherit; font-weight: normal; text-decoration: none;">Powered by docsify</a>'
})
},
],
};
</script>
<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/docsify.min.js"></script>
<!-- plugins -->
<!-- support search -->
<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/search.min.js"></script>
<!-- Support docsify sidebar catalog expand and collapse -->
<script src="//cdn.jsdelivr.net/npm/docsify-sidebar-collapse/dist/docsify-sidebar-collapse.min.js"></script>
<!-- Medium's image zoom -->
<script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/zoom-image.min.js"></script>
<!-- Add a simple Click to copy button to all preformatted code blocks to effortlessly allow users to copy example code from your docs -->
<script src="//cdn.jsdelivr.net/npm/docsify-copy-code"></script>
<!-- docsify-pagination -->
<script src="//cdn.jsdelivr.net/npm/docsify-pagination/dist/docsify-pagination.min.js"></script>
<!-- code highlight -->
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-bash.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-csharp.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-java.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-json.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-markdown.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-nginx.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-properties.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-sql.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-xml-doc.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-yaml.min.js"></script>
</body>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?d47d58dcc5ba5c0c7dccab29717379c6";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</html>
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/test/resources/sql/accesskey-test.sql | --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
INSERT INTO `AccessKey` (`Id`, `AppId`, `Secret`, `IsEnabled`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_CreatedTime`, `DataChange_LastModifiedBy`, `DataChange_LastTime`)
VALUES
(1, 'someAppId', 'someSecret', 0, 0, 'apollo', '2019-12-19 10:28:40', 'apollo', '2019-12-19 10:28:40'),
(2, '100004458', 'c715cbc80fc44171b43732c3119c9456', 0, 0, 'apollo', '2019-12-19 10:39:54', 'apollo', '2019-12-19 14:46:35'),
(3, '100004458', '25a0e68d2a3941edb1ed3ab6dd0646cd', 0, 1, 'apollo', '2019-12-19 13:44:13', 'apollo', '2019-12-19 13:44:19'),
(4, '100004458', '4003c4d7783443dc9870932bebf3b7fe', 0, 0, 'apollo', '2019-12-19 13:43:52', 'apollo', '2019-12-19 13:44:21');
| --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
INSERT INTO `AccessKey` (`Id`, `AppId`, `Secret`, `IsEnabled`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_CreatedTime`, `DataChange_LastModifiedBy`, `DataChange_LastTime`)
VALUES
(1, 'someAppId', 'someSecret', 0, 0, 'apollo', '2019-12-19 10:28:40', 'apollo', '2019-12-19 10:28:40'),
(2, '100004458', 'c715cbc80fc44171b43732c3119c9456', 0, 0, 'apollo', '2019-12-19 10:39:54', 'apollo', '2019-12-19 14:46:35'),
(3, '100004458', '25a0e68d2a3941edb1ed3ab6dd0646cd', 0, 1, 'apollo', '2019-12-19 13:44:13', 'apollo', '2019-12-19 13:44:19'),
(4, '100004458', '4003c4d7783443dc9870932bebf3b7fe', 0, 0, 'apollo', '2019-12-19 13:43:52', 'apollo', '2019-12-19 13:44:21');
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/AppNamespaceServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.jdbc.Sql;
import java.util.List;
public class AppNamespaceServiceTest extends AbstractIntegrationTest {
@Autowired
private AppNamespaceService appNamespaceService;
private final String APP = "app-test";
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespace() {
List<AppNamespace> appNamespaceList = appNamespaceService.findPublicAppNamespaces();
Assert.assertNotNull(appNamespaceList);
Assert.assertEquals(5, appNamespaceList.size());
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespaceByName() {
Assert.assertNotNull(appNamespaceService.findPublicAppNamespace("datasourcexml"));
Assert.assertNull(appNamespaceService.findPublicAppNamespace("TFF.song0711-02"));
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespaceByAppAndName() {
Assert.assertNotNull(appNamespaceService.findByAppIdAndName("100003173", "datasourcexml"));
Assert.assertNull(appNamespaceService.findByAppIdAndName("100003173", "TFF.song0711-02"));
}
@Test
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreateDefaultAppNamespace() {
appNamespaceService.createDefaultAppNamespace(APP);
AppNamespace appNamespace = appNamespaceService.findByAppIdAndName(APP, ConfigConsts.NAMESPACE_APPLICATION);
Assert.assertNotNull(appNamespace);
Assert.assertEquals(ConfigFileFormat.Properties.getValue(), appNamespace.getFormat());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("old");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExistedAsPrivateAppNamespace() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("private-01");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceNotExistedWithNoAppendnamespacePrefix() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("old");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
AppNamespace createdAppNamespace = appNamespaceService.createAppNamespaceInLocal(appNamespace, false);
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExistedWithNoAppendnamespacePrefix() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("datasource");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace, false);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace = appNamespaceService.findPublicAppNamespace(appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceWithWrongFormatNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setFormat(ConfigFileFormat.YAML.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace = appNamespaceService.findPublicAppNamespace(appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
Assert.assertEquals(ConfigFileFormat.YAML.getValue(), createdAppNamespace.getFormat());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("datasource");
appNamespace.setAppId("100003173");
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExistedInAnotherAppId() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("datasource");
appNamespace.setAppId("song0711-01");
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace =
appNamespaceService.findByAppIdAndName(appNamespace.getAppId(), appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExistedInAnotherAppIdAsPublic() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("SCC.song0711-03");
appNamespace.setAppId("100003173");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace =
appNamespaceService.findByAppIdAndName(appNamespace.getAppId(), appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
private AppNamespace assembleBaseAppNamespace() {
AppNamespace appNamespace = new AppNamespace();
appNamespace.setName("appNamespace");
appNamespace.setAppId("1000");
appNamespace.setFormat(ConfigFileFormat.XML.getValue());
return appNamespace;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.jdbc.Sql;
import java.util.List;
public class AppNamespaceServiceTest extends AbstractIntegrationTest {
@Autowired
private AppNamespaceService appNamespaceService;
private final String APP = "app-test";
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespace() {
List<AppNamespace> appNamespaceList = appNamespaceService.findPublicAppNamespaces();
Assert.assertNotNull(appNamespaceList);
Assert.assertEquals(5, appNamespaceList.size());
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespaceByName() {
Assert.assertNotNull(appNamespaceService.findPublicAppNamespace("datasourcexml"));
Assert.assertNull(appNamespaceService.findPublicAppNamespace("TFF.song0711-02"));
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespaceByAppAndName() {
Assert.assertNotNull(appNamespaceService.findByAppIdAndName("100003173", "datasourcexml"));
Assert.assertNull(appNamespaceService.findByAppIdAndName("100003173", "TFF.song0711-02"));
}
@Test
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreateDefaultAppNamespace() {
appNamespaceService.createDefaultAppNamespace(APP);
AppNamespace appNamespace = appNamespaceService.findByAppIdAndName(APP, ConfigConsts.NAMESPACE_APPLICATION);
Assert.assertNotNull(appNamespace);
Assert.assertEquals(ConfigFileFormat.Properties.getValue(), appNamespace.getFormat());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("old");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExistedAsPrivateAppNamespace() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("private-01");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceNotExistedWithNoAppendnamespacePrefix() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("old");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
AppNamespace createdAppNamespace = appNamespaceService.createAppNamespaceInLocal(appNamespace, false);
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExistedWithNoAppendnamespacePrefix() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("datasource");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace, false);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace = appNamespaceService.findPublicAppNamespace(appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceWithWrongFormatNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setFormat(ConfigFileFormat.YAML.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace = appNamespaceService.findPublicAppNamespace(appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
Assert.assertEquals(ConfigFileFormat.YAML.getValue(), createdAppNamespace.getFormat());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("datasource");
appNamespace.setAppId("100003173");
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExistedInAnotherAppId() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("datasource");
appNamespace.setAppId("song0711-01");
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace =
appNamespaceService.findByAppIdAndName(appNamespace.getAppId(), appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExistedInAnotherAppIdAsPublic() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("SCC.song0711-03");
appNamespace.setAppId("100003173");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace =
appNamespaceService.findByAppIdAndName(appNamespace.getAppId(), appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
private AppNamespace assembleBaseAppNamespace() {
AppNamespace appNamespace = new AppNamespace();
appNamespace.setName("appNamespace");
appNamespace.setAppId("1000");
appNamespace.setFormat(ConfigFileFormat.XML.getValue());
return appNamespace;
}
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/helm/apollo-service/templates/service-adminservice.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
kind: Service
apiVersion: v1
metadata:
name: {{ include "apollo.adminService.serviceName" . }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
type: {{ .Values.adminService.service.type }}
ports:
- name: http
protocol: TCP
port: {{ .Values.adminService.service.port }}
targetPort: {{ .Values.adminService.service.targetPort }}
selector:
app: {{ include "apollo.adminService.fullName" . }} | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
kind: Service
apiVersion: v1
metadata:
name: {{ include "apollo.adminService.serviceName" . }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
type: {{ .Values.adminService.service.type }}
ports:
- name: http
protocol: TCP
port: {{ .Values.adminService.service.port }}
targetPort: {{ .Values.adminService.service.targetPort }}
selector:
app: {{ include "apollo.adminService.fullName" . }} | -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/spi/TestProcessorHelper.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
public class TestProcessorHelper extends DefaultConfigPropertySourcesProcessorHelper {
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
throws BeansException {
super.postProcessBeanDefinitionRegistry(registry);
}
@Override
public int getOrder() {
return 0;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
public class TestProcessorHelper extends DefaultConfigPropertySourcesProcessorHelper {
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
throws BeansException {
super.postProcessBeanDefinitionRegistry(registry);
}
@Override
public int getOrder() {
return 0;
}
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/en/images/community/intellij-idea.svg | <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
<g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="0.7898" y1="40.0893" x2="33.3172" y2="40.0893">
<stop offset="0.2581" style="stop-color:#F97A12"/>
<stop offset="0.4591" style="stop-color:#B07B58"/>
<stop offset="0.7241" style="stop-color:#577BAE"/>
<stop offset="0.9105" style="stop-color:#1E7CE5"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_1_);" points="17.7,54.6 0.8,41.2 9.2,25.6 33.3,35 "/>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="25.7674" y1="24.88" x2="79.424" y2="54.57">
<stop offset="0" style="stop-color:#F97A12"/>
<stop offset="7.179946e-002" style="stop-color:#CB7A3E"/>
<stop offset="0.1541" style="stop-color:#9E7B6A"/>
<stop offset="0.242" style="stop-color:#757B91"/>
<stop offset="0.3344" style="stop-color:#537BB1"/>
<stop offset="0.4324" style="stop-color:#387CCC"/>
<stop offset="0.5381" style="stop-color:#237CE0"/>
<stop offset="0.6552" style="stop-color:#147CEF"/>
<stop offset="0.7925" style="stop-color:#0B7CF7"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_2_);" points="70,18.7 68.7,59.2 41.8,70 25.6,59.6 49.3,35 38.9,12.3 48.2,1.1 "/>
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="63.2277" y1="42.9153" x2="48.2903" y2="-1.7191">
<stop offset="0" style="stop-color:#FE315D"/>
<stop offset="7.840246e-002" style="stop-color:#CB417E"/>
<stop offset="0.1601" style="stop-color:#9E4E9B"/>
<stop offset="0.2474" style="stop-color:#755BB4"/>
<stop offset="0.3392" style="stop-color:#5365CA"/>
<stop offset="0.4365" style="stop-color:#386DDB"/>
<stop offset="0.5414" style="stop-color:#2374E9"/>
<stop offset="0.6576" style="stop-color:#1478F3"/>
<stop offset="0.794" style="stop-color:#0B7BF8"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_3_);" points="70,18.7 48.7,43.9 38.9,12.3 48.2,1.1 "/>
<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="10.7204" y1="16.473" x2="55.5237" y2="90.58">
<stop offset="0" style="stop-color:#FE315D"/>
<stop offset="4.023279e-002" style="stop-color:#F63462"/>
<stop offset="0.1037" style="stop-color:#DF3A71"/>
<stop offset="0.1667" style="stop-color:#C24383"/>
<stop offset="0.2912" style="stop-color:#AD4A91"/>
<stop offset="0.5498" style="stop-color:#755BB4"/>
<stop offset="0.9175" style="stop-color:#1D76ED"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_4_);" points="33.7,58.1 5.6,68.3 10.1,52.5 16,33.1 0,27.7 10.1,0 32.1,2.7 53.7,27.4 "/>
</g>
<g>
<rect x="13.7" y="13.5" style="fill:#000000;" width="43.2" height="43.2"/>
<rect x="17.7" y="48.6" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
<polygon style="fill:#FFFFFF;" points="29.4,22.4 29.4,19.1 20.4,19.1 20.4,22.4 23,22.4 23,33.7 20.4,33.7 20.4,37 29.4,37
29.4,33.7 26.9,33.7 26.9,22.4 "/>
<path style="fill:#FFFFFF;" d="M38,37.3c-1.4,0-2.6-0.3-3.5-0.8c-0.9-0.5-1.7-1.2-2.3-1.9l2.5-2.8c0.5,0.6,1,1,1.5,1.3
c0.5,0.3,1.1,0.5,1.7,0.5c0.7,0,1.3-0.2,1.8-0.7c0.4-0.5,0.6-1.2,0.6-2.3V19.1h4v11.7c0,1.1-0.1,2-0.4,2.8c-0.3,0.8-0.7,1.4-1.3,2
c-0.5,0.5-1.2,1-2,1.2C39.8,37.1,39,37.3,38,37.3"/>
</g>
</g>
</svg>
| <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
<g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="0.7898" y1="40.0893" x2="33.3172" y2="40.0893">
<stop offset="0.2581" style="stop-color:#F97A12"/>
<stop offset="0.4591" style="stop-color:#B07B58"/>
<stop offset="0.7241" style="stop-color:#577BAE"/>
<stop offset="0.9105" style="stop-color:#1E7CE5"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_1_);" points="17.7,54.6 0.8,41.2 9.2,25.6 33.3,35 "/>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="25.7674" y1="24.88" x2="79.424" y2="54.57">
<stop offset="0" style="stop-color:#F97A12"/>
<stop offset="7.179946e-002" style="stop-color:#CB7A3E"/>
<stop offset="0.1541" style="stop-color:#9E7B6A"/>
<stop offset="0.242" style="stop-color:#757B91"/>
<stop offset="0.3344" style="stop-color:#537BB1"/>
<stop offset="0.4324" style="stop-color:#387CCC"/>
<stop offset="0.5381" style="stop-color:#237CE0"/>
<stop offset="0.6552" style="stop-color:#147CEF"/>
<stop offset="0.7925" style="stop-color:#0B7CF7"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_2_);" points="70,18.7 68.7,59.2 41.8,70 25.6,59.6 49.3,35 38.9,12.3 48.2,1.1 "/>
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="63.2277" y1="42.9153" x2="48.2903" y2="-1.7191">
<stop offset="0" style="stop-color:#FE315D"/>
<stop offset="7.840246e-002" style="stop-color:#CB417E"/>
<stop offset="0.1601" style="stop-color:#9E4E9B"/>
<stop offset="0.2474" style="stop-color:#755BB4"/>
<stop offset="0.3392" style="stop-color:#5365CA"/>
<stop offset="0.4365" style="stop-color:#386DDB"/>
<stop offset="0.5414" style="stop-color:#2374E9"/>
<stop offset="0.6576" style="stop-color:#1478F3"/>
<stop offset="0.794" style="stop-color:#0B7BF8"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_3_);" points="70,18.7 48.7,43.9 38.9,12.3 48.2,1.1 "/>
<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="10.7204" y1="16.473" x2="55.5237" y2="90.58">
<stop offset="0" style="stop-color:#FE315D"/>
<stop offset="4.023279e-002" style="stop-color:#F63462"/>
<stop offset="0.1037" style="stop-color:#DF3A71"/>
<stop offset="0.1667" style="stop-color:#C24383"/>
<stop offset="0.2912" style="stop-color:#AD4A91"/>
<stop offset="0.5498" style="stop-color:#755BB4"/>
<stop offset="0.9175" style="stop-color:#1D76ED"/>
<stop offset="1" style="stop-color:#087CFA"/>
</linearGradient>
<polygon style="fill:url(#SVGID_4_);" points="33.7,58.1 5.6,68.3 10.1,52.5 16,33.1 0,27.7 10.1,0 32.1,2.7 53.7,27.4 "/>
</g>
<g>
<rect x="13.7" y="13.5" style="fill:#000000;" width="43.2" height="43.2"/>
<rect x="17.7" y="48.6" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
<polygon style="fill:#FFFFFF;" points="29.4,22.4 29.4,19.1 20.4,19.1 20.4,22.4 23,22.4 23,33.7 20.4,33.7 20.4,37 29.4,37
29.4,33.7 26.9,33.7 26.9,22.4 "/>
<path style="fill:#FFFFFF;" d="M38,37.3c-1.4,0-2.6-0.3-3.5-0.8c-0.9-0.5-1.7-1.2-2.3-1.9l2.5-2.8c0.5,0.6,1,1,1.5,1.3
c0.5,0.3,1.1,0.5,1.7,0.5c0.7,0,1.3-0.2,1.8-0.7c0.4-0.5,0.6-1.2,0.6-2.3V19.1h4v11.7c0,1.1-0.1,2-0.4,2.8c-0.3,0.8-0.7,1.4-1.3,2
c-0.5,0.5-1.2,1-2,1.2C39.8,37.1,39,37.3,38,37.3"/>
</g>
</g>
</svg>
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/annotation/ApolloConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.ctrip.framework.apollo.core.ConfigConsts;
/**
* Use this annotation to inject Apollo Config Instance.
*
* <p>Usage example:</p>
* <pre class="code">
* //Inject the config for "someNamespace"
* @ApolloConfig("someNamespace")
* private Config config;
* </pre>
*
* <p>Usage example with placeholder:</p>
* <pre class="code">
* // The namespace could also be specified as a placeholder, e.g. ${redis.namespace:xxx},
* // which will use the value of the key "redis.namespace" or "xxx" if this key is not configured.
* @ApolloConfig("${redis.namespace:xxx}")
* private Config config;
* </pre>
*
*
* @author Jason Song(song_s@ctrip.com)
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
@Documented
public @interface ApolloConfig {
/**
* Apollo namespace for the config, if not specified then default to application
*/
String value() default ConfigConsts.NAMESPACE_APPLICATION;
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.ctrip.framework.apollo.core.ConfigConsts;
/**
* Use this annotation to inject Apollo Config Instance.
*
* <p>Usage example:</p>
* <pre class="code">
* //Inject the config for "someNamespace"
* @ApolloConfig("someNamespace")
* private Config config;
* </pre>
*
* <p>Usage example with placeholder:</p>
* <pre class="code">
* // The namespace could also be specified as a placeholder, e.g. ${redis.namespace:xxx},
* // which will use the value of the key "redis.namespace" or "xxx" if this key is not configured.
* @ApolloConfig("${redis.namespace:xxx}")
* private Config config;
* </pre>
*
*
* @author Jason Song(song_s@ctrip.com)
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
@Documented
public @interface ApolloConfig {
/**
* Apollo namespace for the config, if not specified then default to application
*/
String value() default ConfigConsts.NAMESPACE_APPLICATION;
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/test/resources/sql/appnamespaceservice/init-appnamespace.sql | --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
INSERT INTO `appnamespace` (`Id`, `Name`, `AppId`, `Format`, `IsPublic`, `Comment`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_CreatedTime`, `DataChange_LastModifiedBy`, `DataChange_LastTime`)
VALUES
(139, 'FX.old', '100003173', 'properties', 1, '', 0, 'zhanglea', '2016-07-11 10:00:58', 'zhanglea', '2016-07-11 10:00:58'),
(140, 'SCC.song0711-03', 'song0711-01', 'properties', 1, '', 0, 'song_s', '2016-07-11 10:04:09', 'song_s', '2016-07-11 10:04:09'),
(141, 'SCC.song0711-04', 'song0711-01', 'properties', 1, '', 0, 'song_s', '2016-07-11 10:06:29', 'song_s', '2016-07-11 10:06:29'),
(142, 'application', 'song0711-02', 'properties', 1, 'default app namespace', 0, 'song_s', '2016-07-11 11:18:24', 'song_s', '2016-07-11 11:18:24'),
(143, 'TFF.song0711-02', 'song0711-02', 'properties', 0, '', 0, 'song_s', '2016-07-11 11:15:11', 'song_s', '2016-07-11 11:15:11'),
(144, 'datasourcexml', '100003173', 'properties', 1, '', 0, 'apollo', '2016-07-11 12:08:29', 'apollo', '2016-07-11 12:08:29'),
(145, 'datasource.xml', '100003173', 'xml', 0, '', 0, 'apollo', '2016-07-11 12:09:30', 'apollo', '2016-07-11 12:09:30'),
(146, 'FX.private-01', '100003173', 'properties', 0, '', 0, 'apollo', '2016-07-11 12:09:30', 'apollo', '2016-07-11 12:09:30'),
(147, 'datasource', '100003173', 'properties', 0, '', 0, 'apollo', '2016-07-11 12:09:30', 'apollo', '2016-07-11 12:09:30');
INSERT INTO `app` (`AppId`, `Name`, `OrgId`, `OrgName`, `OwnerName`, `OwnerEmail`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)
VALUES
('1000', 'apollo-test', 'FX', '框架', 'song_s', 'song_s@ctrip.com', 0, 'song_s', 'song_s'),
('song0711-01', 'song0711-01', 'SCC', '框架', 'song_s', 'song_s@ctrip.com', 0, 'song_s', 'song_s'),
('song0711-02', 'song0711-02', 'SCC', '框架', 'song_s', 'song_s@ctrip.com', 0, 'song_s', 'song_s'),
('100003173', 'apollo-portal', 'FX', '框架', 'song_s', 'song_s@ctrip.com', 0, 'song_s', 'song_s');
| --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
INSERT INTO `appnamespace` (`Id`, `Name`, `AppId`, `Format`, `IsPublic`, `Comment`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_CreatedTime`, `DataChange_LastModifiedBy`, `DataChange_LastTime`)
VALUES
(139, 'FX.old', '100003173', 'properties', 1, '', 0, 'zhanglea', '2016-07-11 10:00:58', 'zhanglea', '2016-07-11 10:00:58'),
(140, 'SCC.song0711-03', 'song0711-01', 'properties', 1, '', 0, 'song_s', '2016-07-11 10:04:09', 'song_s', '2016-07-11 10:04:09'),
(141, 'SCC.song0711-04', 'song0711-01', 'properties', 1, '', 0, 'song_s', '2016-07-11 10:06:29', 'song_s', '2016-07-11 10:06:29'),
(142, 'application', 'song0711-02', 'properties', 1, 'default app namespace', 0, 'song_s', '2016-07-11 11:18:24', 'song_s', '2016-07-11 11:18:24'),
(143, 'TFF.song0711-02', 'song0711-02', 'properties', 0, '', 0, 'song_s', '2016-07-11 11:15:11', 'song_s', '2016-07-11 11:15:11'),
(144, 'datasourcexml', '100003173', 'properties', 1, '', 0, 'apollo', '2016-07-11 12:08:29', 'apollo', '2016-07-11 12:08:29'),
(145, 'datasource.xml', '100003173', 'xml', 0, '', 0, 'apollo', '2016-07-11 12:09:30', 'apollo', '2016-07-11 12:09:30'),
(146, 'FX.private-01', '100003173', 'properties', 0, '', 0, 'apollo', '2016-07-11 12:09:30', 'apollo', '2016-07-11 12:09:30'),
(147, 'datasource', '100003173', 'properties', 0, '', 0, 'apollo', '2016-07-11 12:09:30', 'apollo', '2016-07-11 12:09:30');
INSERT INTO `app` (`AppId`, `Name`, `OrgId`, `OrgName`, `OwnerName`, `OwnerEmail`, `IsDeleted`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)
VALUES
('1000', 'apollo-test', 'FX', '框架', 'song_s', 'song_s@ctrip.com', 0, 'song_s', 'song_s'),
('song0711-01', 'song0711-01', 'SCC', '框架', 'song_s', 'song_s@ctrip.com', 0, 'song_s', 'song_s'),
('song0711-02', 'song0711-02', 'SCC', '框架', 'song_s', 'song_s@ctrip.com', 0, 'song_s', 'song_s'),
('100003173', 'apollo-portal', 'FX', '框架', 'song_s', 'song_s@ctrip.com', 0, 'song_s', 'song_s');
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/log4j2.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration monitorInterval="60">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="[apollo-client][%t]%d %-5p [%c] %m%n"/>
</Console>
<Async name="Async" includeLocation="true">
<AppenderRef ref="Console"/>
</Async>
</appenders>
<loggers>
<logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
<AppenderRef ref="Async" level="WARN"/>
</logger>
<root level="INFO">
<AppenderRef ref="Async"/>
</root>
</loggers>
</configuration>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration monitorInterval="60">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="[apollo-client][%t]%d %-5p [%c] %m%n"/>
</Console>
<Async name="Async" includeLocation="true">
<AppenderRef ref="Console"/>
</Async>
</appenders>
<loggers>
<logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
<AppenderRef ref="Async" level="WARN"/>
</logger>
<root level="INFO">
<AppenderRef ref="Async"/>
</root>
</loggers>
</configuration>
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/vendor/select2/select2.min.css | .select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
| .select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/RolePermission.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.po;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Entity
@Table(name = "RolePermission")
@SQLDelete(sql = "Update RolePermission set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class RolePermission extends BaseEntity {
@Column(name = "RoleId", nullable = false)
private long roleId;
@Column(name = "PermissionId", nullable = false)
private long permissionId;
public long getRoleId() {
return roleId;
}
public void setRoleId(long roleId) {
this.roleId = roleId;
}
public long getPermissionId() {
return permissionId;
}
public void setPermissionId(long permissionId) {
this.permissionId = permissionId;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.po;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Entity
@Table(name = "RolePermission")
@SQLDelete(sql = "Update RolePermission set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class RolePermission extends BaseEntity {
@Column(name = "RoleId", nullable = false)
private long roleId;
@Column(name = "PermissionId", nullable = false)
private long permissionId;
public long getRoleId() {
return roleId;
}
public void setRoleId(long roleId) {
this.roleId = roleId;
}
public long getPermissionId() {
return permissionId;
}
public void setPermissionId(long permissionId) {
this.permissionId = permissionId;
}
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/yaml/case1-new.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1001
batch: 2001
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1001
batch: 2001
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/src/test/resources/META-INF/services/com.ctrip.framework.apollo.spi.ApolloInjectorCustomizer | com.ctrip.framework.apollo.config.data.injector.ApolloMockInjectorCustomizer | com.ctrip.framework.apollo.config.data.injector.ApolloMockInjectorCustomizer | -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/integration/NotificationControllerIntegrationTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.integration;
import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache;
import com.google.common.base.Joiner;
import com.ctrip.framework.apollo.configservice.service.ReleaseMessageServiceWithCache;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class NotificationControllerIntegrationTest extends AbstractBaseIntegrationTest {
private String someAppId;
private String someCluster;
private String defaultNamespace;
private String somePublicNamespace;
private ExecutorService executorService;
@Autowired
private ReleaseMessageServiceWithCache releaseMessageServiceWithCache;
@Autowired
private AppNamespaceServiceWithCache appNamespaceServiceWithCache;
@Before
public void setUp() throws Exception {
ReflectionTestUtils.invokeMethod(releaseMessageServiceWithCache, "reset");
ReflectionTestUtils.invokeMethod(appNamespaceServiceWithCache, "reset");
someAppId = "someAppId";
someCluster = ConfigConsts.CLUSTER_NAME_DEFAULT;
defaultNamespace = ConfigConsts.NAMESPACE_APPLICATION;
somePublicNamespace = "somePublicNamespace";
executorService = Executors.newFixedThreadPool(1);
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithDefaultNamespace() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(someAppId, someCluster, defaultNamespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, defaultNamespace);
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(defaultNamespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithDefaultNamespaceAsFile() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(someAppId, someCluster, defaultNamespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, defaultNamespace + ".properties");
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(defaultNamespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithPrivateNamespaceAsFile() throws Exception {
String namespace = "someNamespace.xml";
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(someAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, namespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate
.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, namespace);
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(namespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release-message.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithDefaultNamespaceWithNotificationIdNull() throws Exception {
ResponseEntity<ApolloConfigNotification> result = restTemplate.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, defaultNamespace);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(defaultNamespace, notification.getNamespaceName());
assertEquals(10, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-message.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithDefaultNamespaceWithNotificationIdOutDated() throws Exception {
long someOutDatedNotificationId = 1;
ResponseEntity<ApolloConfigNotification> result = restTemplate.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}¬ificationId={notificationId}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, defaultNamespace, someOutDatedNotificationId);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(defaultNamespace, notification.getNamespaceName());
assertEquals(10, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWthPublicNamespaceAndNoDataCenter() throws Exception {
String publicAppId = "somePublicAppId";
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(publicAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, somePublicNamespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate
.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, somePublicNamespace);
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(somePublicNamespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWthPublicNamespaceAndDataCenter() throws Exception {
String publicAppId = "somePublicAppId";
String someDC = "someDC";
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(publicAppId, someDC, somePublicNamespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate
.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}&dataCenter={dataCenter}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, somePublicNamespace, someDC);
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(somePublicNamespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWthPublicNamespaceAsFile() throws Exception {
String publicAppId = "somePublicAppId";
String someDC = "someDC";
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(publicAppId, someDC, somePublicNamespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate
.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}&dataCenter={dataCenter}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, somePublicNamespace + ".properties", someDC);
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(somePublicNamespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-message.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithPublicNamespaceWithNotificationIdOutDated() throws Exception {
long someOutDatedNotificationId = 1;
ResponseEntity<ApolloConfigNotification> result = restTemplate.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}¬ificationId={notificationId}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, somePublicNamespace, someOutDatedNotificationId);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(somePublicNamespace, notification.getNamespaceName());
assertEquals(20, notification.getNotificationId());
}
private String assembleKey(String appId, String cluster, String namespace) {
return Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR).join(appId, cluster, namespace);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.integration;
import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache;
import com.google.common.base.Joiner;
import com.ctrip.framework.apollo.configservice.service.ReleaseMessageServiceWithCache;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class NotificationControllerIntegrationTest extends AbstractBaseIntegrationTest {
private String someAppId;
private String someCluster;
private String defaultNamespace;
private String somePublicNamespace;
private ExecutorService executorService;
@Autowired
private ReleaseMessageServiceWithCache releaseMessageServiceWithCache;
@Autowired
private AppNamespaceServiceWithCache appNamespaceServiceWithCache;
@Before
public void setUp() throws Exception {
ReflectionTestUtils.invokeMethod(releaseMessageServiceWithCache, "reset");
ReflectionTestUtils.invokeMethod(appNamespaceServiceWithCache, "reset");
someAppId = "someAppId";
someCluster = ConfigConsts.CLUSTER_NAME_DEFAULT;
defaultNamespace = ConfigConsts.NAMESPACE_APPLICATION;
somePublicNamespace = "somePublicNamespace";
executorService = Executors.newFixedThreadPool(1);
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithDefaultNamespace() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(someAppId, someCluster, defaultNamespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, defaultNamespace);
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(defaultNamespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithDefaultNamespaceAsFile() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(someAppId, someCluster, defaultNamespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, defaultNamespace + ".properties");
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(defaultNamespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithPrivateNamespaceAsFile() throws Exception {
String namespace = "someNamespace.xml";
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(someAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, namespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate
.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, namespace);
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(namespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release-message.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithDefaultNamespaceWithNotificationIdNull() throws Exception {
ResponseEntity<ApolloConfigNotification> result = restTemplate.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, defaultNamespace);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(defaultNamespace, notification.getNamespaceName());
assertEquals(10, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-message.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithDefaultNamespaceWithNotificationIdOutDated() throws Exception {
long someOutDatedNotificationId = 1;
ResponseEntity<ApolloConfigNotification> result = restTemplate.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}¬ificationId={notificationId}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, defaultNamespace, someOutDatedNotificationId);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(defaultNamespace, notification.getNamespaceName());
assertEquals(10, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWthPublicNamespaceAndNoDataCenter() throws Exception {
String publicAppId = "somePublicAppId";
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(publicAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, somePublicNamespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate
.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, somePublicNamespace);
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(somePublicNamespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWthPublicNamespaceAndDataCenter() throws Exception {
String publicAppId = "somePublicAppId";
String someDC = "someDC";
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(publicAppId, someDC, somePublicNamespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate
.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}&dataCenter={dataCenter}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, somePublicNamespace, someDC);
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(somePublicNamespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWthPublicNamespaceAsFile() throws Exception {
String publicAppId = "somePublicAppId";
String someDC = "someDC";
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(publicAppId, someDC, somePublicNamespace), stop);
ResponseEntity<ApolloConfigNotification> result = restTemplate
.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}&dataCenter={dataCenter}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, somePublicNamespace + ".properties", someDC);
stop.set(true);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(somePublicNamespace, notification.getNamespaceName());
assertNotEquals(0, notification.getNotificationId());
}
@Test(timeout = 5000L)
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-message.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testPollNotificationWithPublicNamespaceWithNotificationIdOutDated() throws Exception {
long someOutDatedNotificationId = 1;
ResponseEntity<ApolloConfigNotification> result = restTemplate.getForEntity(
"http://{baseurl}/notifications?appId={appId}&cluster={clusterName}&namespace={namespace}¬ificationId={notificationId}",
ApolloConfigNotification.class,
getHostUrl(), someAppId, someCluster, somePublicNamespace, someOutDatedNotificationId);
ApolloConfigNotification notification = result.getBody();
assertEquals(HttpStatus.OK, result.getStatusCode());
assertEquals(somePublicNamespace, notification.getNamespaceName());
assertEquals(20, notification.getNotificationId());
}
private String assembleKey(String appId, String cluster, String namespace) {
return Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR).join(appId, cluster, namespace);
}
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/config/ConfigPropertySourcesProcessor.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.config;
import com.ctrip.framework.apollo.spring.spi.ConfigPropertySourcesProcessorHelper;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
/**
* Apollo Property Sources processor for Spring XML Based Application
*
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigPropertySourcesProcessor extends PropertySourcesProcessor
implements BeanDefinitionRegistryPostProcessor {
private ConfigPropertySourcesProcessorHelper helper = ServiceBootstrap.loadPrimary(ConfigPropertySourcesProcessorHelper.class);
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
helper.postProcessBeanDefinitionRegistry(registry);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.config;
import com.ctrip.framework.apollo.spring.spi.ConfigPropertySourcesProcessorHelper;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
/**
* Apollo Property Sources processor for Spring XML Based Application
*
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigPropertySourcesProcessor extends PropertySourcesProcessor
implements BeanDefinitionRegistryPostProcessor {
private ConfigPropertySourcesProcessorHelper helper = ServiceBootstrap.loadPrimary(ConfigPropertySourcesProcessorHelper.class);
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
helper.postProcessBeanDefinitionRegistry(registry);
}
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/img/more.png | PNG
IHDR X IDATx^KV t{
h4hl@PZAK+i*Z4^ ( ̭s' d^UTfčqDdwO i 4ِ ,O t < @h =@v pƬJ H%fv .7fU @*)4۴K v1 RI٦] ˍY$ J
6 ]n̪$TRhi @rcV% D1JmjΕR'3I%5~?潠ڼξ'X!E2z1~63)FK7nԧ7*f8Ruן +ݼ\ocԅ27g_>Nb HQ~ 4 \ɨٛ {2 1M~;(ы1 a? Wmp\m|>=:^
dckw HbKm=L g뢁:& V/NS|&K( VוQ>Z_R? $"1^D2x%k1 HĢ(Xf`^Hw뒧<4>L 0}%C]N=j'ב2Gj*KE) Fo_&
Y#
i͏-_ VcK Hwado4 Qd`%>D с$y{HHzvaJƑ $+nt II^Hj 䁤 IIHj,6 IIZHjđ<V Y I\$5H GV@@8pA"h浽yl\y>pU? GfĥܫnFYFBNqˆ9XK'H![pr<_@@b s+HVp˫( Wtp˩U <^|pQ,V0l{|Nr ' " nGaG,\% { 5 8pT6$pQ ZCG@JG9 ) 8dqT
4$Q=R\ 8 Ƚ|sB8 # ,9e$ d"py q G) GByR/LI 8$*h@zf 8z0 7$p (ǡ n$XbO$ 4 ,nk\ ler>εRO-oi4p | qS&@ 3L 8 {= 9 E\J l]9A 3I?k /Ԑ' 8֑cOpx, 'p}$S?dKcHkyu Nu=FW>IqS.۵ gϨVks.N@6;Fw˾?doړE-Vݷni,1Zl7 $ &Zw?+ 5c~_ys8dd0$)ݓ+Ui5tA?AH4fɠ 丷X= uAr'ݷZJ?CL2i.l-3 e6ȼZ:{<{dmtԪijyAFڷp QN[ O^WCa_g CiېM. H."* `ghVtڻXr
}pbULšV@ַ_֪y'V)N(KXH 1:;>uV@N݉zO 2煤q(.FoھUn
$9a.%' Irq I=C Hj&e @@S[q4/ ɡ=c.8IL9
$)i{
w ӈ)^5G A Ҿk)}Jb\8 .$4M#D GP ޯAo $hFX)8 I
rpD "
$K HlKőc/*G2@@w/Z:{?^ h{[ IY& H//RDG@@bkőB5HzyR8~ 8rՃR̯
b p N@q7,p<5[ Eyf
$2H<쁀
8 ϯ Cչ$}{8U+:8}ƇSZ}O8?佮qPq',A֟ o( 8(Mprs) H/aG n8RIw 8dpT t$Q-RCG@JCy ) 8 u9 8 r+ /7'$ 2 8 ȒSFp8 H)"GX YwJH @zdp(!U>kv1õzn3Hѳ8 d@!c@a<pC x p}"i~y,i
@,(uzjyKUwIJZ@ vNH q1I$ptDpT !vdpr"J,|l$f6{uDpK/
^ r
|Mu ?\' 8ԏ$@' 8$\Ȓ' 8֍$`ޮ' 8$|.' 8ԋ$B''+/oԥRz|z<r, x\~Z꧅ٟ6prUFJ& 4-= ԚzfʘڹjۓɅLJ BAL ̺+ "$˔ @ʬ+J BAL ̺+ "$˔ @ʬ+J BAL ̺+ "$˔ @ʬ+J BAL ̺+ "$˔ @ʬ+J=n?0
. IENDB` | PNG
IHDR X IDATx^KV t{
h4hl@PZAK+i*Z4^ ( ̭s' d^UTfčqDdwO i 4ِ ,O t < @h =@v pƬJ H%fv .7fU @*)4۴K v1 RI٦] ˍY$ J
6 ]n̪$TRhi @rcV% D1JmjΕR'3I%5~?潠ڼξ'X!E2z1~63)FK7nԧ7*f8Ruן +ݼ\ocԅ27g_>Nb HQ~ 4 \ɨٛ {2 1M~;(ы1 a? Wmp\m|>=:^
dckw HbKm=L g뢁:& V/NS|&K( VוQ>Z_R? $"1^D2x%k1 HĢ(Xf`^Hw뒧<4>L 0}%C]N=j'ב2Gj*KE) Fo_&
Y#
i͏-_ VcK Hwado4 Qd`%>D с$y{HHzvaJƑ $+nt II^Hj 䁤 IIHj,6 IIZHjđ<V Y I\$5H GV@@8pA"h浽yl\y>pU? GfĥܫnFYFBNqˆ9XK'H![pr<_@@b s+HVp˫( Wtp˩U <^|pQ,V0l{|Nr ' " nGaG,\% { 5 8pT6$pQ ZCG@JG9 ) 8dqT
4$Q=R\ 8 Ƚ|sB8 # ,9e$ d"py q G) GByR/LI 8$*h@zf 8z0 7$p (ǡ n$XbO$ 4 ,nk\ ler>εRO-oi4p | qS&@ 3L 8 {= 9 E\J l]9A 3I?k /Ԑ' 8֑cOpx, 'p}$S?dKcHkyu Nu=FW>IqS.۵ gϨVks.N@6;Fw˾?doړE-Vݷni,1Zl7 $ &Zw?+ 5c~_ys8dd0$)ݓ+Ui5tA?AH4fɠ 丷X= uAr'ݷZJ?CL2i.l-3 e6ȼZ:{<{dmtԪijyAFڷp QN[ O^WCa_g CiېM. H."* `ghVtڻXr
}pbULšV@ַ_֪y'V)N(KXH 1:;>uV@N݉zO 2煤q(.FoھUn
$9a.%' Irq I=C Hj&e @@S[q4/ ɡ=c.8IL9
$)i{
w ӈ)^5G A Ҿk)}Jb\8 .$4M#D GP ޯAo $hFX)8 I
rpD "
$K HlKőc/*G2@@w/Z:{?^ h{[ IY& H//RDG@@bkőB5HzyR8~ 8rՃR̯
b p N@q7,p<5[ Eyf
$2H<쁀
8 ϯ Cչ$}{8U+:8}ƇSZ}O8?佮qPq',A֟ o( 8(Mprs) H/aG n8RIw 8dpT t$Q-RCG@JCy ) 8 u9 8 r+ /7'$ 2 8 ȒSFp8 H)"GX YwJH @zdp(!U>kv1õzn3Hѳ8 d@!c@a<pC x p}"i~y,i
@,(uzjyKUwIJZ@ vNH q1I$ptDpT !vdpr"J,|l$f6{uDpK/
^ r
|Mu ?\' 8ԏ$@' 8$\Ȓ' 8֍$`ޮ' 8$|.' 8ԋ$B''+/oԥRz|z<r, x\~Z꧅ٟ6prUFJ& 4-= ԚzfʘڹjۓɅLJ BAL ̺+ "$˔ @ʬ+J BAL ̺+ "$˔ @ʬ+J BAL ̺+ "$˔ @ʬ+J BAL ̺+ "$˔ @ʬ+J=n?0
. IENDB` | -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceLockTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.aop;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.NamespaceLock;
import com.ctrip.framework.apollo.biz.service.ItemService;
import com.ctrip.framework.apollo.biz.service.NamespaceLockService;
import com.ctrip.framework.apollo.biz.service.NamespaceService;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.exception.ServiceException;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.dao.DataIntegrityViolationException;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class NamespaceLockTest {
private static final String APP = "app-test";
private static final String CLUSTER = "cluster-test";
private static final String NAMESPACE = "namespace-test";
private static final String CURRENT_USER = "user-test";
private static final String ANOTHER_USER = "user-test2";
private static final long NAMESPACE_ID = 100;
@Mock
private NamespaceLockService namespaceLockService;
@Mock
private NamespaceService namespaceService;
@Mock
private ItemService itemService;
@Mock
private BizConfig bizConfig;
@InjectMocks
NamespaceAcquireLockAspect namespaceLockAspect;
@Test
public void acquireLockWithNotLockedAndSwitchON() {
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(true);
namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER);
verify(namespaceService, times(0)).findOne(APP, CLUSTER, NAMESPACE);
}
@Test
public void acquireLockWithNotLockedAndSwitchOFF() {
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false);
when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace());
when(namespaceLockService.findLock(anyLong())).thenReturn(null);
namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER);
verify(bizConfig).isNamespaceLockSwitchOff();
verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE);
verify(namespaceLockService).findLock(anyLong());
verify(namespaceLockService).tryLock(any());
}
@Test(expected = BadRequestException.class)
public void acquireLockWithAlreadyLockedByOtherGuy() {
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false);
when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace());
when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(mockNamespaceLock(ANOTHER_USER));
namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER);
verify(bizConfig).isNamespaceLockSwitchOff();
verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE);
verify(namespaceLockService).findLock(NAMESPACE_ID);
}
@Test
public void acquireLockWithAlreadyLockedBySelf() {
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false);
when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace());
when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(mockNamespaceLock(CURRENT_USER));
namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER);
verify(bizConfig).isNamespaceLockSwitchOff();
verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE);
verify(namespaceLockService).findLock(NAMESPACE_ID);
}
@Test
public void acquireLockWithNamespaceIdSwitchOn(){
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false);
when(namespaceService.findOne(NAMESPACE_ID)).thenReturn(mockNamespace());
when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(null);
namespaceLockAspect.acquireLock(NAMESPACE_ID, CURRENT_USER);
verify(bizConfig).isNamespaceLockSwitchOff();
verify(namespaceService).findOne(NAMESPACE_ID);
verify(namespaceLockService).findLock(NAMESPACE_ID);
verify(namespaceLockService).tryLock(any());
}
@Test(expected = ServiceException.class)
public void testDuplicateLock(){
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false);
when(namespaceService.findOne(NAMESPACE_ID)).thenReturn(mockNamespace());
when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(null);
when(namespaceLockService.tryLock(any())).thenThrow(DataIntegrityViolationException.class);
namespaceLockAspect.acquireLock(NAMESPACE_ID, CURRENT_USER);
verify(bizConfig).isNamespaceLockSwitchOff();
verify(namespaceService).findOne(NAMESPACE_ID);
verify(namespaceLockService, times(2)).findLock(NAMESPACE_ID);
verify(namespaceLockService).tryLock(any());
}
private Namespace mockNamespace() {
Namespace namespace = new Namespace();
namespace.setId(NAMESPACE_ID);
namespace.setAppId(APP);
namespace.setClusterName(CLUSTER);
namespace.setNamespaceName(NAMESPACE);
return namespace;
}
private NamespaceLock mockNamespaceLock(String locedUser) {
NamespaceLock lock = new NamespaceLock();
lock.setNamespaceId(NAMESPACE_ID);
lock.setDataChangeCreatedBy(locedUser);
return lock;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.aop;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.NamespaceLock;
import com.ctrip.framework.apollo.biz.service.ItemService;
import com.ctrip.framework.apollo.biz.service.NamespaceLockService;
import com.ctrip.framework.apollo.biz.service.NamespaceService;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.exception.ServiceException;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.dao.DataIntegrityViolationException;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class NamespaceLockTest {
private static final String APP = "app-test";
private static final String CLUSTER = "cluster-test";
private static final String NAMESPACE = "namespace-test";
private static final String CURRENT_USER = "user-test";
private static final String ANOTHER_USER = "user-test2";
private static final long NAMESPACE_ID = 100;
@Mock
private NamespaceLockService namespaceLockService;
@Mock
private NamespaceService namespaceService;
@Mock
private ItemService itemService;
@Mock
private BizConfig bizConfig;
@InjectMocks
NamespaceAcquireLockAspect namespaceLockAspect;
@Test
public void acquireLockWithNotLockedAndSwitchON() {
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(true);
namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER);
verify(namespaceService, times(0)).findOne(APP, CLUSTER, NAMESPACE);
}
@Test
public void acquireLockWithNotLockedAndSwitchOFF() {
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false);
when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace());
when(namespaceLockService.findLock(anyLong())).thenReturn(null);
namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER);
verify(bizConfig).isNamespaceLockSwitchOff();
verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE);
verify(namespaceLockService).findLock(anyLong());
verify(namespaceLockService).tryLock(any());
}
@Test(expected = BadRequestException.class)
public void acquireLockWithAlreadyLockedByOtherGuy() {
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false);
when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace());
when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(mockNamespaceLock(ANOTHER_USER));
namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER);
verify(bizConfig).isNamespaceLockSwitchOff();
verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE);
verify(namespaceLockService).findLock(NAMESPACE_ID);
}
@Test
public void acquireLockWithAlreadyLockedBySelf() {
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false);
when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace());
when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(mockNamespaceLock(CURRENT_USER));
namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER);
verify(bizConfig).isNamespaceLockSwitchOff();
verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE);
verify(namespaceLockService).findLock(NAMESPACE_ID);
}
@Test
public void acquireLockWithNamespaceIdSwitchOn(){
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false);
when(namespaceService.findOne(NAMESPACE_ID)).thenReturn(mockNamespace());
when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(null);
namespaceLockAspect.acquireLock(NAMESPACE_ID, CURRENT_USER);
verify(bizConfig).isNamespaceLockSwitchOff();
verify(namespaceService).findOne(NAMESPACE_ID);
verify(namespaceLockService).findLock(NAMESPACE_ID);
verify(namespaceLockService).tryLock(any());
}
@Test(expected = ServiceException.class)
public void testDuplicateLock(){
when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false);
when(namespaceService.findOne(NAMESPACE_ID)).thenReturn(mockNamespace());
when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(null);
when(namespaceLockService.tryLock(any())).thenThrow(DataIntegrityViolationException.class);
namespaceLockAspect.acquireLock(NAMESPACE_ID, CURRENT_USER);
verify(bizConfig).isNamespaceLockSwitchOff();
verify(namespaceService).findOne(NAMESPACE_ID);
verify(namespaceLockService, times(2)).findLock(NAMESPACE_ID);
verify(namespaceLockService).tryLock(any());
}
private Namespace mockNamespace() {
Namespace namespace = new Namespace();
namespace.setId(NAMESPACE_ID);
namespace.setAppId(APP);
namespace.setClusterName(CLUSTER);
namespace.setNamespaceName(NAMESPACE);
return namespace;
}
private NamespaceLock mockNamespaceLock(String locedUser) {
NamespaceLock lock = new NamespaceLock();
lock.setNamespaceId(NAMESPACE_ID);
lock.setDataChangeCreatedBy(locedUser);
return lock;
}
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-mockserver/src/main/java/com/ctrip/framework/apollo/mockserver/EmbeddedApollo.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.mockserver;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.ApolloClientSystemConsts;
import com.ctrip.framework.apollo.core.dto.ApolloConfig;
import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
import com.ctrip.framework.apollo.core.utils.ResourceUtils;
import com.ctrip.framework.apollo.internals.ConfigServiceLocator;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.junit.rules.ExternalResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Create by zhangzheng on 8/22/18 Email:zhangzheng@youzan.com
*/
public class EmbeddedApollo extends ExternalResource {
private static final Logger logger = LoggerFactory.getLogger(EmbeddedApollo.class);
private static final Type notificationType = new TypeToken<List<ApolloConfigNotification>>() {
}.getType();
private static Method CONFIG_SERVICE_LOCATOR_CLEAR;
private static ConfigServiceLocator CONFIG_SERVICE_LOCATOR;
private static final Gson GSON = new Gson();
private final Map<String, Map<String, String>> addedOrModifiedPropertiesOfNamespace = Maps.newConcurrentMap();
private final Map<String, Set<String>> deletedKeysOfNamespace = Maps.newConcurrentMap();
private MockWebServer server;
static {
try {
System.setProperty("apollo.longPollingInitialDelayInMills", "0");
CONFIG_SERVICE_LOCATOR = ApolloInjector.getInstance(ConfigServiceLocator.class);
CONFIG_SERVICE_LOCATOR_CLEAR = ConfigServiceLocator.class.getDeclaredMethod("initConfigServices");
CONFIG_SERVICE_LOCATOR_CLEAR.setAccessible(true);
} catch (NoSuchMethodException e) {
logger.error(e.getMessage(), e);
}
}
@Override
protected void before() throws Throwable {
clear();
server = new MockWebServer();
final Dispatcher dispatcher = new Dispatcher() {
@Override
public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
if (request.getPath().startsWith("/notifications/v2")) {
String notifications = request.getRequestUrl().queryParameter("notifications");
return new MockResponse().setResponseCode(200).setBody(mockLongPollBody(notifications));
}
if (request.getPath().startsWith("/configs")) {
List<String> pathSegments = request.getRequestUrl().pathSegments();
// appId and cluster might be used in the future
String appId = pathSegments.get(1);
String cluster = pathSegments.get(2);
String namespace = pathSegments.get(3);
return new MockResponse().setResponseCode(200).setBody(loadConfigFor(namespace));
}
return new MockResponse().setResponseCode(404);
}
};
server.setDispatcher(dispatcher);
server.start();
mockConfigServiceUrl("http://localhost:" + server.getPort());
super.before();
}
@Override
protected void after() {
try {
clear();
server.close();
} catch (Exception e) {
logger.error("stop apollo server error", e);
}
}
private void clear() throws Exception {
resetOverriddenProperties();
}
private void mockConfigServiceUrl(String url) throws Exception {
System.setProperty(ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE, url);
CONFIG_SERVICE_LOCATOR_CLEAR.invoke(CONFIG_SERVICE_LOCATOR);
}
private String loadConfigFor(String namespace) {
String filename = String.format("mockdata-%s.properties", namespace);
final Properties prop = ResourceUtils.readConfigFile(filename, new Properties());
Map<String, String> configurations = Maps.newHashMap();
for (String propertyName : prop.stringPropertyNames()) {
configurations.put(propertyName, prop.getProperty(propertyName));
}
ApolloConfig apolloConfig = new ApolloConfig("someAppId", "someCluster", namespace, "someReleaseKey");
Map<String, String> mergedConfigurations = mergeOverriddenProperties(namespace, configurations);
apolloConfig.setConfigurations(mergedConfigurations);
return GSON.toJson(apolloConfig);
}
private String mockLongPollBody(String notificationsStr) {
List<ApolloConfigNotification> oldNotifications = GSON.fromJson(notificationsStr, notificationType);
List<ApolloConfigNotification> newNotifications = new ArrayList<>();
for (ApolloConfigNotification notification : oldNotifications) {
newNotifications
.add(new ApolloConfigNotification(notification.getNamespaceName(), notification.getNotificationId() + 1));
}
return GSON.toJson(newNotifications);
}
/**
* 合并用户对namespace的修改
*/
private Map<String, String> mergeOverriddenProperties(String namespace, Map<String, String> configurations) {
if (addedOrModifiedPropertiesOfNamespace.containsKey(namespace)) {
configurations.putAll(addedOrModifiedPropertiesOfNamespace.get(namespace));
}
if (deletedKeysOfNamespace.containsKey(namespace)) {
for (String k : deletedKeysOfNamespace.get(namespace)) {
configurations.remove(k);
}
}
return configurations;
}
/**
* Add new property or update existed property
*/
public void addOrModifyProperty(String namespace, String someKey, String someValue) {
if (addedOrModifiedPropertiesOfNamespace.containsKey(namespace)) {
addedOrModifiedPropertiesOfNamespace.get(namespace).put(someKey, someValue);
} else {
Map<String, String> m = Maps.newConcurrentMap();
m.put(someKey, someValue);
addedOrModifiedPropertiesOfNamespace.put(namespace, m);
}
}
/**
* Delete existed property
*/
public void deleteProperty(String namespace, String someKey) {
if (deletedKeysOfNamespace.containsKey(namespace)) {
deletedKeysOfNamespace.get(namespace).add(someKey);
} else {
Set<String> m = Sets.newConcurrentHashSet();
m.add(someKey);
deletedKeysOfNamespace.put(namespace, m);
}
}
/**
* reset overridden properties
*/
public void resetOverriddenProperties() {
addedOrModifiedPropertiesOfNamespace.clear();
deletedKeysOfNamespace.clear();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.mockserver;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.ApolloClientSystemConsts;
import com.ctrip.framework.apollo.core.dto.ApolloConfig;
import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
import com.ctrip.framework.apollo.core.utils.ResourceUtils;
import com.ctrip.framework.apollo.internals.ConfigServiceLocator;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.junit.rules.ExternalResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Create by zhangzheng on 8/22/18 Email:zhangzheng@youzan.com
*/
public class EmbeddedApollo extends ExternalResource {
private static final Logger logger = LoggerFactory.getLogger(EmbeddedApollo.class);
private static final Type notificationType = new TypeToken<List<ApolloConfigNotification>>() {
}.getType();
private static Method CONFIG_SERVICE_LOCATOR_CLEAR;
private static ConfigServiceLocator CONFIG_SERVICE_LOCATOR;
private static final Gson GSON = new Gson();
private final Map<String, Map<String, String>> addedOrModifiedPropertiesOfNamespace = Maps.newConcurrentMap();
private final Map<String, Set<String>> deletedKeysOfNamespace = Maps.newConcurrentMap();
private MockWebServer server;
static {
try {
System.setProperty("apollo.longPollingInitialDelayInMills", "0");
CONFIG_SERVICE_LOCATOR = ApolloInjector.getInstance(ConfigServiceLocator.class);
CONFIG_SERVICE_LOCATOR_CLEAR = ConfigServiceLocator.class.getDeclaredMethod("initConfigServices");
CONFIG_SERVICE_LOCATOR_CLEAR.setAccessible(true);
} catch (NoSuchMethodException e) {
logger.error(e.getMessage(), e);
}
}
@Override
protected void before() throws Throwable {
clear();
server = new MockWebServer();
final Dispatcher dispatcher = new Dispatcher() {
@Override
public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
if (request.getPath().startsWith("/notifications/v2")) {
String notifications = request.getRequestUrl().queryParameter("notifications");
return new MockResponse().setResponseCode(200).setBody(mockLongPollBody(notifications));
}
if (request.getPath().startsWith("/configs")) {
List<String> pathSegments = request.getRequestUrl().pathSegments();
// appId and cluster might be used in the future
String appId = pathSegments.get(1);
String cluster = pathSegments.get(2);
String namespace = pathSegments.get(3);
return new MockResponse().setResponseCode(200).setBody(loadConfigFor(namespace));
}
return new MockResponse().setResponseCode(404);
}
};
server.setDispatcher(dispatcher);
server.start();
mockConfigServiceUrl("http://localhost:" + server.getPort());
super.before();
}
@Override
protected void after() {
try {
clear();
server.close();
} catch (Exception e) {
logger.error("stop apollo server error", e);
}
}
private void clear() throws Exception {
resetOverriddenProperties();
}
private void mockConfigServiceUrl(String url) throws Exception {
System.setProperty(ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE, url);
CONFIG_SERVICE_LOCATOR_CLEAR.invoke(CONFIG_SERVICE_LOCATOR);
}
private String loadConfigFor(String namespace) {
String filename = String.format("mockdata-%s.properties", namespace);
final Properties prop = ResourceUtils.readConfigFile(filename, new Properties());
Map<String, String> configurations = Maps.newHashMap();
for (String propertyName : prop.stringPropertyNames()) {
configurations.put(propertyName, prop.getProperty(propertyName));
}
ApolloConfig apolloConfig = new ApolloConfig("someAppId", "someCluster", namespace, "someReleaseKey");
Map<String, String> mergedConfigurations = mergeOverriddenProperties(namespace, configurations);
apolloConfig.setConfigurations(mergedConfigurations);
return GSON.toJson(apolloConfig);
}
private String mockLongPollBody(String notificationsStr) {
List<ApolloConfigNotification> oldNotifications = GSON.fromJson(notificationsStr, notificationType);
List<ApolloConfigNotification> newNotifications = new ArrayList<>();
for (ApolloConfigNotification notification : oldNotifications) {
newNotifications
.add(new ApolloConfigNotification(notification.getNamespaceName(), notification.getNotificationId() + 1));
}
return GSON.toJson(newNotifications);
}
/**
* 合并用户对namespace的修改
*/
private Map<String, String> mergeOverriddenProperties(String namespace, Map<String, String> configurations) {
if (addedOrModifiedPropertiesOfNamespace.containsKey(namespace)) {
configurations.putAll(addedOrModifiedPropertiesOfNamespace.get(namespace));
}
if (deletedKeysOfNamespace.containsKey(namespace)) {
for (String k : deletedKeysOfNamespace.get(namespace)) {
configurations.remove(k);
}
}
return configurations;
}
/**
* Add new property or update existed property
*/
public void addOrModifyProperty(String namespace, String someKey, String someValue) {
if (addedOrModifiedPropertiesOfNamespace.containsKey(namespace)) {
addedOrModifiedPropertiesOfNamespace.get(namespace).put(someKey, someValue);
} else {
Map<String, String> m = Maps.newConcurrentMap();
m.put(someKey, someValue);
addedOrModifiedPropertiesOfNamespace.put(namespace, m);
}
}
/**
* Delete existed property
*/
public void deleteProperty(String namespace, String someKey) {
if (deletedKeysOfNamespace.containsKey(namespace)) {
deletedKeysOfNamespace.get(namespace).add(someKey);
} else {
Set<String> m = Sets.newConcurrentHashSet();
m.add(someKey);
deletedKeysOfNamespace.put(namespace, m);
}
}
/**
* reset overridden properties
*/
public void resetOverriddenProperties() {
addedOrModifiedPropertiesOfNamespace.clear();
deletedKeysOfNamespace.clear();
}
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/BizTestConfiguration.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@EnableAutoConfiguration
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class, ApolloBizConfig.class})
public class BizTestConfiguration {
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@EnableAutoConfiguration
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class, ApolloBizConfig.class})
public class BizTestConfiguration {
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ReleaseRepository.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.Release;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;
import java.util.Set;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ReleaseRepository extends PagingAndSortingRepository<Release, Long> {
Release findFirstByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderByIdDesc(@Param("appId") String appId, @Param("clusterName") String clusterName,
@Param("namespaceName") String namespaceName);
Release findByIdAndIsAbandonedFalse(long id);
List<Release> findByAppIdAndClusterNameAndNamespaceNameOrderByIdDesc(String appId, String clusterName, String namespaceName, Pageable page);
List<Release> findByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderByIdDesc(String appId, String clusterName, String namespaceName, Pageable page);
List<Release> findByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseAndIdBetweenOrderByIdDesc(String appId, String clusterName, String namespaceName, long fromId, long toId);
List<Release> findByReleaseKeyIn(Set<String> releaseKey);
List<Release> findByIdIn(Set<Long> releaseIds);
@Modifying
@Query("update Release set isdeleted=1,DataChange_LastModifiedBy = ?4 where appId=?1 and clusterName=?2 and namespaceName = ?3")
int batchDelete(String appId, String clusterName, String namespaceName, String operator);
// For release history conversion program, need to delete after conversion it done
List<Release> findByAppIdAndClusterNameAndNamespaceNameOrderByIdAsc(String appId, String clusterName, String namespaceName);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.Release;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;
import java.util.Set;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ReleaseRepository extends PagingAndSortingRepository<Release, Long> {
Release findFirstByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderByIdDesc(@Param("appId") String appId, @Param("clusterName") String clusterName,
@Param("namespaceName") String namespaceName);
Release findByIdAndIsAbandonedFalse(long id);
List<Release> findByAppIdAndClusterNameAndNamespaceNameOrderByIdDesc(String appId, String clusterName, String namespaceName, Pageable page);
List<Release> findByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderByIdDesc(String appId, String clusterName, String namespaceName, Pageable page);
List<Release> findByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseAndIdBetweenOrderByIdDesc(String appId, String clusterName, String namespaceName, long fromId, long toId);
List<Release> findByReleaseKeyIn(Set<String> releaseKey);
List<Release> findByIdIn(Set<Long> releaseIds);
@Modifying
@Query("update Release set isdeleted=1,DataChange_LastModifiedBy = ?4 where appId=?1 and clusterName=?2 and namespaceName = ?3")
int batchDelete(String appId, String clusterName, String namespaceName, String operator);
// For release history conversion program, need to delete after conversion it done
List<Release> findByAppIdAndClusterNameAndNamespaceNameOrderByIdAsc(String appId, String clusterName, String namespaceName);
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/img/logo-simple.png | PNG
IHDR . sRGB pHYs YiTXtXML:com.adobe.xmp <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
<tiff:Orientation>1</tiff:Orientation>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
L'Y @ IDATxrF?HwLfʜ1O`eLVdfNPY$ZGUbo,?Aמ]'N-4DŒ,Q ~Ek4I >(6@`bo:3jAiwu%J G+qx-u fGo ;K@ @ 3r/"U[V[媭'A$QqqLn mr505 @ @ V,!u"Pd TZZu$g.tIr@ @ a Xf`GEPHp(YQ3U<z!P#g @ @ղ[qj5jvI)RK1ḏ"Huu!F@ @ %@}( Ip(N?a֑ [@ @ (,B5T l|N.GZU֩st %C @ hEFx+8J+QiTa@V|dL@ @ @|gX|ïJV^< KZmmTM @ Ԑ vj\*媗$jiW> vs%S\B6 @ C`Q8}%c(
VϮȊf)A1Mt8EJj4@ @ XQgaRGA"Y~Es0K_h @ PEUPGDz&Bg$kc5h@ @r* 5."Tq(ju?۫B @ \PEo:*Q5t&X=MjGI=3% @ oyC$H Kgrq.=vЉz
E , @ 0
)pDIKL(>)kI՝VKmz9 @ Y^4ҢJL6эFӲjچʋi[5s
w @ Ԟ E ,t0Ң @ YV4Eѕݝfx @ &@fQGkiKdEۅ
/gJEC@ @ 7XL;ˤ7q2` r.L9l8 @ @ BLCb5MϒMkZii@" @ # EI>vF6I.M}V|Me @ B%4P{Fv '"PTNҕ$Q&xҔ8 @ , Xd(N
N2!J `"L @ @ LC /jgIQZ9C HA㻩u @ ,'!@ % '@8
^C @ Rpųuk N9%
ueoawǩ"C @ rQ\C^HC! @ %@/j#PTۮ1F`G) @ ". (! @ ( @ "묂@Q{zUX @ 4@y.U(
a ^f @ Xo e|Ĺ $Z1Zv @ @S0
)=mahٲXA\2%A
8 @ @ VYdczE{krC0 @ @ YTힹYiAؖ<%sAi@ @ X4 F?ҭLk4|hI~f @ @M ,iv?E6YMB@^awg9 @ '@͢p8Y2u$}C*5 @ jJ`QM;֦[VsB) H;b8 @ N`) =ID%OyQJ(6U"͖AZRI{xSj!IY6俥~\@ @`R&%׀߮-Zj:Egwpِ#퀅)(tP%U6նצ~)0 @ 0!KiM R7 Kp(mhyjcS -HyQca o_-5C @ E"[$k&p'ǽ5;:QOuuyo=By6%Gߕw?ɜ @ @ ',:7^ItMQLkRzU]} :O˫LY[ij#0s~rw<N @ 0
bFk[Y.2S*AlZbԚijd-4S&eL#s! @ 4 EMNgdx +ꖑb
F˧oV9@ @E Ǣ9{A\A)Fn~eo!) @ &4{ $SxBȉ-$f
(L0c3*h 9?kV# @ @CYԐTVv1 /2N}J^TC/]O]! @ 8'r0+i2ݤ͓bjK>[5, vqUk}s @ @,\Ժ&R:~zò륖Jfi&8u @ 6Eas\Z G_FaPZFEbף/ B @ 8Eק4mKw?[Klװ vj/l˯R^1?"6 @ b"@fQLe:f$L;J1M:MK+\Ap" @ uSz,?[*;kw@wO4yrahXN.%3WM3"5 @ @]=![ HVQ'i^H}hWm[|@Ԧ]d@
@ PodջnF:.Go[־j$]T
wB @ (.:*"P40JBqڟ %ÈQ1@ @ ,jP E/bZ_2Z*uO
@ &@fQ7u*"P4vOuBarv3IT*>Y>v+{ Զ#P@ MRa}5ȬZmaNtAՂt Z3mr|ӼzG^^,`6\Kn
~cEJՋr @ @S )[|pm'}`wE :NCd.s̿ygc!~ C U$`OV%P~B @ {Ȣ}Gki7Ez%? Sx,@"o ; MF.]H ^_@ @ hE
õtb.k}V!3lF[UMݙdJhK^Wɵɵ\r Jut?k
@ N Xt
H]^غʛ?iGdh{ A^UA# :K2MROR۲. @ "' VA Q+Yd!M3 } `XLU357 LS[
! @ ,
RKK6QO1^8غ%A#}lr]G @ @ bLCʚ֕<.>vU\˦?i;@/UOdjZ*Sv|1R8/}6$m(+ Y @ !@f497qb K1^ϖ|*s$P4vwLѰΒy~)us:ZJB @ ,&V:9`&kL2{}#& IsΒJ,G^t9'α "! @ `u
LahHǜM4},KG5uLVGʢ-y0i@ @ (85 Pde0_'ʞ^٦Ac*ZP݁1 @ @Un-ЪV}2Yi˾7(* &{uHl +EU
@ @t }N5_4]ueouKԤ@1$7r2"3F߮-8H@ @ Q Xe4:O:%[LV#[u]z4kQ}y `c&#,좙2+· @ p E瑩$zE>&ea4sKE]$pvt @ h<E5b[J]f}+5}!#gZ*ٴ @ 0.E`Db3 f)M<QWnZpF!W3Թ99 H@ @ JFTD`$k) 0 peaZ
E3@ @յՎʵ]0iMSt Լ3O3QS) ld.@ @Qմcb
[w?
3J"\ȮLas6 zTb Fc! @ ,Jܿ&+of
[2T+W6{;7##:Mr'.d)Er @ @ 6b25Mi'"~֑eS fpҷYR\q(& @ @(~kEDŭ)h *г $Ļئd B @ :k Sh[iSWS*[MET4Yn<klYT%~tC @ A XD7X7bDW5p!Z +.YEJf/ E, @ h,U^Ӕ2wfFKt'ph$C @ 8f%ҍ+n(?/4%f
hmM' K}~miL6! @ DB`Q$ U̸VBsD TZ
O;,>nQyK.# @ @Eu>QfzE%?(hZ9 g&1e '@ @ (A`Q HQ5jMn=pT'
XPXnV+`+;zW! @ ]Z]%l:bjNֱ$ꍘ
@ @ dBIlKT{|#5l^)r]m̎m ؖL^A̙ @ ` "LXNf[1M;[ryu$ciwNA @ @ ̈fCA#ʶ.]rRgӅeF4Ӻ @ 2hߒPҝN+ TJ @ 5EސֳL$XE{6tſ@ @ ,rȓ Z}Qcl;pBoLå @ @)41ɉ hm=@&Ot @ @|gX $K>l:7 @ 05ES#DDf(L& '
@ q ,X߮u6iݏ>'@ @ @(~
@ @ EAtC,y @ ,
jB] /@ @ @{o۾.@`"/&: @ @ z7t?]#_RWQ C @ 8$@!\D%$ׅ`i"M(@ @ #,C TǶt plږTyxsr!n vb# @ W"\$X]iMnX.ĀK|w(ul @ P XT Ak K 픋|KPg EK! @ Xn%hklK
ll?g[۵m@ @ X]]`p` TNrX.$]tdl\Ԇ\b-5T{MZ)N4 @ jK`Qݺ6]/4ܿfԛY-io}N EpGH @ pH`Qݮx)7k= vuR8 %n2ɜzlj\B @ H:,R:*pXk'"%Ee[5j`]+:t% @ b @(^'wc4iDž2jՅ&v ?
rȜ,r @ @,Sc)7/h^YS.;F e
̅YZ/]u!d L@ @ 骱 fWZsG_Y
Q=
n {=uW'*~ ]'# @ @D.Ed+%J+m[KzpKnW%uR"S.2W&w? ֬EWzǕ+U֯qm= @ ,\7z<mIٶ/Y6cnH(@m mʓe0)sam_<F @ f`Z
9"!Gs$b+eew{VCSH}/[~
@ @x,
OXdnM Ɗ0Bm%EqUtU)kSkjjG#sfښdA @ h8E Mjܒ$q6E zT:G{&kg
d#,)-D25<[># @ i}$I?tՒR'VbaQJ ;TLcQyto\#/d\۱ @ <2
lLۙ
Nӭњ,E]dd[@qag2Uiä%hK͆Jk jV@ @"&4pM%Bͯ- Y7Z:{#pWb.
G_UtT+$HKlݏfg c @ &`5o^q?k[l;^s}ZWNza7v٪53Qkݕ|:|W @ K@Jp' |/̍wid
$0RG̲%z?gY&EtY1_@ 4 Eu<,&h-u%RhIol"H&9s @ ԑ Euc>TȘr].2:\3kט6
>k7C @ h,2j)Ųkf\ yy^96$и"z @ XE]_
bsL.ʕ5v0Iw4]ق @ P[j۵Cǒ<DvڟuB_4u;_;G @ @JA)[˦
V,]ؔyc7x܌?C @ h,EM$U~DevjKjáE!E 1 @ 09?f;ï<Ovݞ/=yϗ<і"! }R埽uM{@ > ͛|F;+?M@f XԌ~Vֶ"W'wLSsUd53d=!_Y` .۷nm)YlDMyffO>l *۷nĶEW=}|mrq`Z74LGs:qʹ4ɦi@W ?a~3 ۷
E jQ' oT~ Pɏ[⡅ @b.fT:"#l#eRhA MT>@ e $ykl[ ҲVaVn_i @?EWQqmIF%-(;k= eَLꙠ0h{,5i,UqT
ԉU$;dGޕ˒mtW=X @ &'@hrviu1W`$`qv%\42F2=d} m ȿ&e]R'zc@ y942Fi`a @ (E`Q)Lhn& -dG_U{Q*/6qdVHv-8@
:@@ @ @,$YIdU l܋g X̵tk vwcJȎ?iG/HvAu~y67TOHk .@ 5 pTܐLp7nˊ9iVb @ 8I@lM"`VKg/v% B]0*1S{e |h|0 h 6A
"za(O=ٕ4@ E<~:DF1Xs 0
a}o+x|CϚ krT,[l߈s읳 ZpjER0jjI @ ,rM8Dy1(DƲ)ƀquӸ$ظ4]h @2_-D,@ @ N`u ~rwEt#0 #V# ! tmUczN|@ @`Q:Lk]d|%`T*igr>gaWbsc7 ^^ [ p[9@ *'@.ƀ:e&`TIdQgHvڊ)]V@n^a:Z= XT dI"Ib.ѭ 'Fj`Qf"xzi` 0u#ph. ! @ E.kxhMLvNҲd-DC Hسak " 4 t9^[SvёI?\p/Ŀص mem
sf 8WKA`
@ Eawk vw\~) hfδ;6E)v @ C 8Sxr͛uf]; f X~?u8&o/c$ e,Hh#f9~l b!c6$齽= @Z <9#YJNeסhF:OxQfb! +a\o'|: @ V)v=Љza
*?eԱ(zjQ&H<ZP$;jUE*4@ $qO 5dA@ Xy/r R؊7>iJJ9n9)v jV )l-/lm: Ԕ v$nŮMrn瘩i4Y2z3bda- dݏ͒uOAϊ9s*d@ ;lUn7D@4Z[!Zr f}h%Cv 8m>{ѿ.^Ǘ2@ Qcjt[32=\۔U:Ǐ|-E;bKϧN1M;"h ˗Mya$ѽϞwE ~
b\ @ @씪Mb[y -YF eUMM[vE͘ HOݫ/_g ln<}<SqLU \L`Ō٢юwi}r|UdG-~*ŋC XӲ &8tOnIQGK?98, @ >3_[{TLMK~Se~6{/y@Ӵ.ŝKZZ/-u,JE @ x5u:Zh\%QԴ^`.6nR<!- 3 c-q?y6Y8>7dA" @ dMƭ1gIdq <S NM{a_l z J\;+d\Ԝ@^<*+gvUںϸS۴ @5uݞo{^ 9 ݓ|whs3j DI `nQĺúF 9a&j@ !@ 0>E@Ij0VkY1·UYmIp]u,)M#7oJ(l=~[vQj֭@ @DEYUj$O%p>JG/]uwA3_ fD] [Ŏ0@JRًV+Wpմqϛnr
@ 5Go
/x'jyy.ڑ`KϣJ?u jG` YtX'O>ݚHOk7y㞔 3] @վ:XNJC<6 ͪoYf2smQ'Ea"
%/@Mpdژ1[hOS@ ` "+%L$prY^IR¼W~ ?MJZCȒCCϞOG2V9s/^JK @ F`54\!AS.Z4*,|U:*9Kbݜk $:slJ]۪ukŵC &$`JKFUZވc1 ?C*8 $~V uf=+rF
ߺehl @EPTѕ w[ҩK
ؓG .ZV̄ <}RzރͦV5պqZV좩{ C`8h"reS׀3s3vT7
] P 'CZ :%Ze ^7 q!LM(`TLךZZ`rfE[bӗ5=w1ϡ9 PSo^ז=ϟoԣgf$6# &`'yN#*V(E= _/7X.}@6 `@$c1HӧOde4 Ӄ / @ pF`3ܕ0϶͊odH`.`ˍOxQ J m =5jeڻreL;@ i \V C֎CR7gy#Ů{8 ̟>{ xąuf }f꣰BOcp֭m~"n'
ak $;מ# c| ,*ϊęUʙ+46:QOd T%Szp^ˇyRދn̅ lHҺןz\eHR@ {*ouo_$俼:3So<:fJl IJ-5L@!Pg)+ /lCZ'iHF <WPkEE
E$hGY+5a[uUEagBfj
*~^%]?0yJk#pOj[tˬ$,XϻjSi5P33So#5~!E< ~:D\q-10En6Kze`Lsy2-J &qn0(E@yc\+lnf&|X
BOcʈE%:숸%ISŇo7D
eY&L Gp460&6Y~~Mj ECp'ӽh >P~!E|Z+ť;g.)u?gf4c( 08g2ɾ2Ĝ4;-i ukITZH~%2
nL[QY<!y1562+'ԡL?[ ier L㊞V0@`<mw?eK% 2sey\<(B PR' ='PdEVL 6ÅM+"rE\gEԡ<Y`Hvїr['EaYnE B $~W_|- Nl<OůOB|h Ԟّ%ԦDwFsvy /=05SLZ·Eh_,_ GSG$K>ڂ{LWV1^zR's*[izM>C. W~`/H/f3ϼy}&7N R`G6SN- P,[K 79dm/\Wd* 7q5cG2Wmw#/\6uhv%4KcVrՁU
JGrZϴUFF3eva߭m%ɥ9S~c̏6Zde@V[boYfFcoGA!֖7oA--hE-[$4=T$ԇfͲsZ*n) ƹZe#g߇#G3պ8vX' ʮ%Wbq9jh_p M}7VBMZoHQN:Qrm?+YR 2n" mi1!iۑA-vnhWHbҖ
"0,l tyA1a3=_cp}8A0zg,"9 ~ܠW 7kןS`ξnG judՀF~ ߸$7_ڤOz&bK9d/ 9֑9y &}(ƚ_H;1 eyػrEƷכh~*~s릞7Sbise .9*I=2LéҲUe7UlJ"Z匩]옊>Qo<InR Rhm=Vܪܗ^(Lm!ߢMeP$$;uv1o['먮_rkwvB71ô],ظu@>P^ݖLY-V
%Vrm v9Af4cjsT9Ͷ uK} Zmuu . |k'҇Mp[̒Ү}_k=ɗL,_n㭙l⍾%2fܐ)ӆv3s^^E ܳls9A,gcL嬽)voygIe_?$H4@9m}M%*D5Pdf8Il72]$jSl x_(33Aj̇ >|AGuL|5 PT4e6MMi@:=1EH|~_~;[$+ #o?gRdgą˵ {BA8юLaxLR (e JpjMt )7iN7II,&9~Ƀo>"pzݔ"F;1`)T]d%JE(JShsbmoZKýX7v*Wi>]jlIe.
4KEQ}C_jPڞ{yR;YÕbw&*7i]q9ɍj5W\7(qL31`o_O%h{= :x[O?'w1
fl5# ]dmI'ԮEܩdw)mIϟga[+y=@{|bǒդ@ыdLYTE іE$g`wm[ Y J3Ey@͊Zoa=e?XOJ`^KߌR[8Z¤8]$}L\0\ NzNΆ<6 l7(ل'sZS:jDThzyǺ̀E >j;aE)q07_HgSQ\W{k?5f Z>U@܇/@S!\07B>ٮYrQ&d *ƔUg :j ,250~Mu~ 5 ]2Eyһ!
D`V.ח۷>?lnHjXp=BE# T4knj]P=Sכ3-`)/ocbuaM"KLx4<+?-/<NgW][*42a|EȰܣi&hT{gq0\yz12˾7RO(e nn혋q 0%6u{/cVДիf~Էnn?ʵu?y 7n*AF̦942Rn`yEq=bLU#h\bē gY&FŲͅ8nj]P-%3kw
nĘL]/_nIWUSúEGk+-(}}
,Hnؐ( ̋Տ%h@=(/J\<}Noܧ' 8QRFQ&rlF^)RhĘEGSΆuT~X4nyQkE%ybhnK uQQ 5^{3ϟg"dwjA H/nB X!Mʪn2--nNt2'E1Fw Spq2+}U
%cSrSY9ipj~42v.2S _u
# LM['音q2 >Z `qչK4zv̬.}^=onƆ)[B,_m?k;MEƾE&lJ$ߑA-ouig5yhB
}p 01@' hLE,2DR(6!}ΙO>o۵|,j[Wz1]$%K"?`+>
{#W25LS5wuO uB4fz^XR2*? D& " @ IDATI_[?<{\
$"mlK yd]Zrp![t# 7_ =.+ jƘ{6SH}% mʅÓ / sx%ģJTOYFwR,˷?{w z}f&
=KXKP'q n/:*!+% :|( ʓ9\d;z]~og>x
3=Y;}12;|}? MtcJhj~;Y Kܟ<#^?P6d檴 ݊
#`J$+ľ-RǙ9&`oCc3ţM g\ؒ1Os|C2>|ϟgLƗ5R ޗKȶK1uȳ)c*`ѻ~7EOnEwکE}tf4Xjxԉ(%J}#2c?
ryHOp&َ&q B,xn 똸QZ+W25_w
7L* TLJiF8p 6 0NҬ
fQ1,WU7RnѫLQp>}Ky$b$A?)o<E3R(SFK(Ej *7>Kq<OS/jV_d^d T11^*"pȝ8} z!A`d]"] ZG[\NGmG`LT1tＳ*7_Z h ڊZU:3)\TBv\1}rnHhS[-IASh!(vZ2G[z 6 %Y ۺ;8ȘAd7Se$ QS}S\K29ei. f ) 0ۘ
rO$tI\"s
ZHJM@FFe L0:FqtVVxĎ lyPt2^ T'3LԢ1ӊoUosUNGꞫ )%"${|`SN] 0J*eL,j_` "] onY$jmW#A<cNñKB$ ŢQaSX3p_#)38얀e&KZ hfDy\HGJmj]"cXma^cj.}L,*
Y'ɦ'Tr^LS& g rqkUqM)Ú4J5Q ,S&E]ZyAO1آ[ }|ި= GGE+7xO@xWVS { 蒀ׂ8V?\?R c$< KA\Uٽ;$YJiZZ(j=sp0)ts_BE˫R/g=S|/7IZj"`F8=
n92U vLT'.䏖W F7);c SÅg^"@"[d,Hԣj\
E$hG8Vq5 g^K0bwիu/yR2Za= ?<&LO:獊O]NJcr|n=[u> {UiZ0]1ʃE&Pk Fgt`y6 e>{4g;}.2y30:Jwt=Ĵn~lՎDrpR;v8T@}k-'(}2ԊBux]Zh:;`$n
0@iLU,ehxM |qsyY?}QkY֖c$SgO"jNQ;xL1Oּ5ӛİ:JHe1 a_ 3+Egõ}d'qܩ^{*nn n ѯ/cXTe:U%7 gWהMQD{StW]UjD
M"F'5 5<5Sm`ѵ'.8I._,0&0yrqn4zn<t@jե~ zHplϸiǘrT% ERk<sn"cB ",z{i Fedﯖi7uO6 oT6\?-W~_})r5=ì4_#]t5w9N1uס)FhݢT.y%kk̽fjK
㱙k5uiy'n[a-*} f0r$_tQf(oۍϞ
0SR;ջ]l 0}Ly
NYB[dZZw%9O8R`< `FggW zXɴ 2<dĸ㴩@l͘.d 9Ӥ}N$]UŘK=1-X%f/jILZ Ni9<?[~7-De'g(gWY`dJgLּ&;15|dv:6 0]˿xɶ|OٍJIAamg2=yp n[f| Ɣ uLy __H| أT}T諶~>tֲՀL)+yyXksn4@h ۠<7b
F>P= N(M ٺ=?{X4ŃeVq7 gLc9ǔ`QݾZu|>q-@[%%떟 %͙Y)j=NI#ӊ&KR){Ѐ/u+k P]
nqʤM]=u"Y-N3/wc$h/G*=Ƙs i!)W/_f8V3:Uy[ڎiǟh6$kn|<5m?0Ȱ^oħI%@JC/4 Nrfy*ڒkI{L?;ap(g{^!2mL9
wV%HqBիNNFE#_&W]{
UeĦ[v$P\,MkAXV z)* a&hn3#PV%C$0*v9Uц \H&lhyll-Y9 c|6^4~;K `T&7ڝJڟ] Pn8WrD䘏)x ҲxhZ9àEqf1VnoLAC,|eδLr &} dZU?plu hxT@HcIȬ|&, ܕ[1_Uݢk YݏuZf45zz}]{nS?Z3~M织k9*"6'6 :65+Q 2!TԄVn0@Ɣ`)h d:lJeuZ5(NkZT_l #O&5' Q(Nü$U$T;l Whsu~>> ' -!}ʣ:4̄xh !1H?2^|krA3
Z8ӞHvD=gH̭,1m܀=> Ou\A4h/CM qǃ'|ӃUJC> _a\{AiV2%l~ǁ9n2S %:E 2#-<V/i $~nr3/:PCe qm9"SMo )lk |EfGt:|:;Y{<f*lVE}ֶRΧ-ˍJyQrx4E}^2ߛI$Z.avK =ޕ߸tdA
aƔH
aLY gUM&/Lӈߛj6/Pg_>|ʥ`](O@Tz}! 6O*Ŭ'
9fpHpwD eG;b lV: ޕ+o{N#4Vzٙ5hȗ1ў.ꨡ 6٧l}H'`LciKRcZHE %H[}v )|"7PVNeXP,,_t٪QL@#[RxUeӈ &j]~@ }q9ߪ<2A# ^-ǥ
6CpiW}jY L̊p':f_ 6 0$q,J6)νԙōhq6)wdN[#-cjzLY ;+D"?In HO?mJR4 :,>#^KD̘w|2Qh];#[Vxph[&& aWhVժ'#:U1 Z5:!':<Y}\>q9d'`hnrɕuIm]w`
d=~ڌLfg *wǔܻL53mKWdzIMGoNwUrK& )vmjug4!ڔmlW } ؔ ,E3 -&np,?$ RT 7ig\m{Jj}6
8 -YD4-2h6a3Sі,8hp15ua*3 $ \ٔ}^P&3WF4 UWzjör]lM[D.uzJ&e_K].ӎZVvL-/M y rˊ8 A5$%hoIC h8ٖAqok&hZǘ
FP٘*X;r#wgo9!ER& 3ԑ:hgnF(j}W~#c?uiߐ H`#um_[РќLg\=z>q\*Ƥ-mӤg<<I,o:a|#>ObSL$v/k&Vtԫ SSTdӹ ٻrdu*[L5)jn z3&;t X}$y42~;b:MNX OP3!W/rfկ MliOcT۷o/xЃ$qiD
93٧C+&fsg3*_W=: 43u^B7P:wr!CLD@+xI {3ݬ)Ac81u"NkJ:4kݲ9iV: Ȃ>P$^܇/蘒@+ L)!ӽd#c2{7;& S־~}.XPVZA U<h'7:0KbV)Sza3ZnjBi2M+>ƧibQբjDQ&R#b<-}5#hם$OdtSTz5 kC<B"B&F[+8h:6;!kcj`Ai)ӂ| իiHū̎{ a~-EIαy$$L%Z1As7v0p4\5,o,IpL\&XZ%ykGpB^Ty}hf0n]l>3
a aك5g0c.<CۻL
> 0&gJLVTah7ǥEV
~%q'_V{*ѶrEht3->j]ƛ5{f[
{ΒK- CLke9\ P}2(ߖ#p -1em%cj`zޖ:Ot.%y\tȡIsu*`Q;rޗG+@n2nL`Ͱs!?_HvB `!) L@ ! @
&0VׯwUZRĺ Jgo+;הNV:>UV#z-4 8\'$O zL r p *;CDл.
{j]04aړe´
@ pJ``YJ, Hv4Ύ.ٕ${%\2Q(j}ԡk2'/慌$hIlq]c0僻#1`LvæoLEzFuf:u @ xEu*24 :e`WmީQ̈ݏ2cKkxvѮɂ Q[2bШSLgJE%Q5W @?"$o[jQ)d c@[QT#*?P:!`B0_J0camDWӅ,-au ]T7o@bf> KvZ8`O>I TYM
bE"PQ!&: i@
zQ^ vdVGqbp- ϲavQ:YE ObY9s/^Jŗ VդC|7{vM; Wv((lDl& Y 5sS[P,T1Je ԤVQԁk= }cJLd+{+bԐ 0È좊aREQ([|w7M4KDcȩZ+r?A[˘ ԉjԅEmI=~=
`FQl[%Z%_AG^,^?awBϴLm'fcO&0CGVJ*_;vSk#AM)? A 3)ƽ87˗Ϲ&ϳqm
$ J~6g٦"` :M%aɺфB;,fQlT9. z2;BuKJ' $2ua'7ݏf[q ޒ~:r v$=/js|lGA#QNWw$&
d`Aի* mKϬ =@I|j\ԏp =5˜HS Ze>PwO'2'\O]IMfLM{T9.&7B{ЅPײ/ mcB֦ȅH} ]
B"`DΊ),owYlfa0 }뿹~=5S ɇzGN }*B46ݾ^Gn
퍑j_%HK[`s8| Xg43v[uiˢ0D*̢Βql/ϮH}TCGٸM7~?G
% LKYsT?R狦;#Ws}FO?m:b?g ,-D0]Y%ʛ4O& sGVoC$nkŧOnMjUC15%
EEKSVT15$ڟݒ{rsm>@ѶכJ'C&H$S ^4w}x:I~6F6
Okg#|Oiڸ* S xg:f._Lfv@|3I ϑ:S~
8<<R:7XdRp5q7NL2xHl;M%֍pζ__8
E/&?8 deϰ/Y$V#IFhn<sú|Rw\Y\T6L"]Nt^Y]noZga0aQoI&lSOc`QQ6\nY \o:֊L"DdFmrF ~3;6 ^`26ͧ|Z% {%#dB οV. Ty֗d0|Cn -0Wtnt& Թ"Y Wv/iihVN]p 'ﶥ.ЦFvozi^%MmͦI}rcNj0-9xfIt
[72?f8n?{TY"[N tʯp͚ -F0&[:3XTL8lDUt|x+*+D 2lӬlV#Onk EIp?( 0Fg00+/=O|rOv!pI8l0$>P _V 0Mq$mЀűRsh}8'L` GS2ԙW33RAp^CREݏ @tig~M\Ӿ1>0(h ](é#d{g>|ܒT|\3Oc0U.K1Uv!3ErCsYG fڙd1 `(z7\7?OfZѥof:Zqñl \Fn IZs챍i { P.
ϙfLEÛ q4I\O, ,EZ}cAT-E
~6s8QLܗB\&#ǹ/$霳N3Є>sUd^Xa֘]K d0}!>?Ř
3CSob]mCVѣGnDwՕF;Q(:")`$c4IPzwL%CE=GXb߆]8wJߛ#z0OzV%>S6iN%+1VHwrO?mTMb vw.nI &Ш@
?g٦{p2Jvd6mn}njd^L00lef] L2.>k"F ŋMy|4)tT=ҘtL#Z:/^toBP}rltj6>̴ZO=;LKs^iKLvesZTC$Y$*y[9
A!?9H`g knj1ܙV)}Mx ɣ<q/% 1T И:,zw*]~ZYEG_[:<|qZgU`xՇ0+xQ[/vl0 L/n:~ )]45E]y (KO}L3WLR`)2ԲSy!Dֹυ,ѽnLxʞ>}eZz[Uf^j%6`L٠8ihyޙЯNsUֺܸܿU`GoF`*&N7ׯr=98100,\Yj\v,X~#f"0_(zv)9 V6trZH2Na^aCpw~3Ͼz壟c\A* qL 9P=qZl$jޅu)Oj]FOe4;\k]$-=DgVs-yM}%dtCWV|A;{W.o9SS "3D0S\o承k%Q? xƴŨVh,cBaS-gQuWNѝg4eW(jоvrP<òͽN̕tw&ەFnKMzpr' (_bfS JfM- ܾy3~z z惚ɢ7>t[=qч2]|Ɣ
uL,>Fm[jz ַk -Vdvmt?I \"_ȂI_l D^x-$h}xS>{I սqps~3A @He"뙙UODeŔ=O
CT[KvϏm0ŏ:S~//$nQf%gPtqBvZ(Ҿ~t\`P%83\&s.:wc cO|n{9&5y&%=xh0" ~ DN
mXs/\?\#暑LBo' iVqE1Q}Lh+)@˦[nIVQg宂'wʵp, U8w ꤶ
ɕZQr ˻X~mӄEnجI&{ {yR*:b B;FxKu(R-Yn2UI j oLu3{칹 ^3^W_80GS;$1Kf:XӰ{Ӛ$[^C Z.]K Ai Kn=(O`vKhMR]K$[
Z<>rtϟo p #ӗMM75- M1ګ1,cM(:.h-ed
i LC@
9ĹN>OGdD0G2!^ZQ zB86ofKMX!Mk'/J1`iLa= oiSSMzS$&WCUv_86QjaS|%{>k<@ter=!`
{QtLM荫 s€֯s|$K3rU1e }lckGL~i`[zQ(QYܰ-nu I&IH~^d|u;~'յs~_ӝN(M))@Oh5 ζH<.IQG>4τ0k9%d`S(}W__0Bcŭap+HhCډU
m]T%~t7@cg.b#ѵ{{ qǏ}'+ ղSrJ{˘ r' i{WGUta&=Ry&0w#溩( M%é1#);]*EI6eo 㼒 h B gsYCհ ʓԇ]9:<N)XMsׂ L |칐Id|f2tg쁓zw֭ue)6gzvjz 1Ux<9zӺWS2"PϩWK
q7!P9<I7YmK ۮܹ1 SF5[֛o}dpґu0p_nW|AI <^,<]UugL}$ۯGd3fhq(}[y]'
/$љ
0`QԵ3= pzEW\dեȆ@pQnlR{%d{aj"[8 u0<&@͛r34HtH<ٮPnU?,|=~W:OTG!2KC_Qk_\LAۯɋm|c
ok:=lrlt)K-_#٩_v5
<BŴL- *<9}7oqm4b}M $ yIQQDRe I JHugn T(@ޗFJ gZ';vyvaZՀc`L_1u,+~Ҧu vlï @q $IGf6KnD [&@n]k ȷKԗ2EbsR,ٵޛE (Ar%ˊPP3
vj?<{'0:5 }!ϧRdd4T ^
(ckch:$8"_E*N- MBǶ.>_mHSZ=3:a4ԆC "/~vaJ}z'A- `eU6~?VG}`L?;_>jkt9wN[ t,1z ";& ԥzHf|wrraEbӧO: _adU:4ez
ߛ ˦m6M]ׁaLH7w|_iZ1ƔRMSG*ʩcʵ,JyC,ox`-X`N 8J۔Jz͕:MVdꃏ- ZBf9_˪/KGP~ 'QWE46%!aa
aj2I7椙6
^/yO ִm|o$MkóI,'#x gLg ,fRQx )+e-{(-EV[)"Yu[E:\7S/\ הZs
J,oo9/w<ݖ\ŧ;u!PF~zzW__ƞfChZNj8?;Cq<Pa.NLawC) YWt|"VW4-a} ZrE ^W"RgnYSa֓@F<֦Nt{\S)#-}4:wejsc\@qr@.NeR n&48 QGϗa,뇭CH%o0-M@'櫢\YQh5T׃k5My+>gsQZqy1B
7MjС1<aᚎ7~!gE@ox͐< =mVjRV-*%0qw `
52Ģ\g &_| V*]Ҭ5: S`dDR{kts"cjY-B!5UL9->8 @>K 9F7'{03wEEN(C[Fc(<[R1]K}/THb>sn95 ??G
[ks]ݠք ٌ/ 4V%=H`#c0Tw~S{_IkJDy7(
G,pc &;wϢ4LBx=ɪvڟE'K{e;%R&1vrS Ȯ{@aT8buQr LEESqQRo&-r ]]||\Yêw9,Z4S7vsvS}JkjVb3/B,y~8 @5 iW͑UT?yeZ@jb1J՟1F8Zy
-R&GG&[Vt47دQt~ 5hJ %fs"esT@7uI4.QzO1FZu(C؈sK/ s~Z]0(#4(q6W\S,
G,ʲv1
V('
&ϻ[Q&Հy'+E1)8.BSNGig\vs]2+;Zp"砃k*i*
G,ʃyw~o@ vnp4B 5U&k ֮ D`$
lw9{p:'za4QUή"7t$vG^wkZ8p?g\SZ5Ȳls N8F,:pI jG0.ϵnP3 $"
:vOwM$M4 p@Im@yUV;=*^GkjV~\S8BQ"/>]Նg"3S;O
ZA/Y QH, wS0N9ČgYy t Q[3OF)tEW87͓uM>6L#.Mm## pMMu"xuMd,h3#FvB C Aρm61@ 4?CR O\S7$
s3OBLQ `F>vv o!55THbQZXhNB{
;}mv̢h\^.--9lETz; wHeЅ'RRDrպɰk?I7H4ݴ[ 2]9VN
_^̦T##+ ޙu QE[qU'{}M|b;A8A1QE8 =$``Ei;sg~BQ1&tP2f;%6u}|q= ! ECG|:5pqTodE̗WF; ߰jPn0|q hQB0lnn ǒY7úSffEMQ7?
ˁ튄 -naHM+g*T9栙?MݾK@hda/owT|ya ܈ܺޞ~8s+je,L$;|GwR*}W}kuG}>"1NTZV0(|7{ (,Eg7 N`Q(O 7=ax?$~YXA g9,Jywѝ (EOvF椾
D {p'RZ$n{v=LH;G܍vv\S3suX,re?o-erZ{tx8W@d٦a P*a !ٲ|laFݚƺ{
DմJVϊ*Yy,+!&Q>\XhjA7ڬ1vtp@TQL1W
ݖ:Iۑ]'fb xGғS~Jj#"~F .$5UδEq/r<Qތ]R҆|5.R"+n 9v@! k[diM@ @N
Q3:>nGqV -=PٍJ<G
c" pMGD, znߓnhGk0ȁm M3yqs
+r!z_KZ'.캰).b ('U nÔ㸩{dHE#;ׂ1;Jr;CH?v fvUOA( S?-o?W7QU_(d9$FvB_! @ k&}<o+LD:!<ם T~gP,bң[[ܻiD(nU
/QEb2x^;Eۑ]'f '1
@ A N
.Mkjkjq/|-}oU$^.| ML :wߞCۘ @ @ \:wJApwc(Z&we.X
>pa
'I!a%f _! @ B$0LC3UB=Wh]VD B>S7?uׅӡꫭ5,`sii
gvF^Q\wwsC @ #Cd`n XͥˤܠCYopx<ۖ% $ qՕqsQ "i @ @-
B"Z M
_ ۡT$b |¶+R\ݹyhw}4lqh컰 @ ^A,]~h$xll5hscgv\
(M0iY}{Q%>Xoܜk&m(w @ yg"};x~ŃDLD[!VZ'.ǐp7Z IDAT8nQZJ13C8:<?7I4e+bOS: @ ΊEFoB;_w{rnb߁"Wgf,螽f zr%y :sSZ q6 w{Lc @ 8#Vȝ`\<hu_GV_9*r%}!{{~>QJZ}S@5Q
'7eUQE%ʅ\ 0 @ 8#Y_93o\F?tE\v<{&`N\Na~ѭw2ZP E6a
\5"4=;A @ .!5,?]GxvN&xM(sqmUxlbIhk"Pt.ig6@ @17ĢwSQNP(@fvUd<XYqbbk#YD|uD
5Hd' @ #X4Y ^
vF+j9`NJ6e٪ӵj|溟oono0H"'խadBQgWQEM ΅7&2 e` @ uS [{G"ұ*"c} Oc CaL 0(ӂ:p(ȆZu W
Ӵ @ kE[4ۇ m̾} ăn*Bֻ6 ŬshqqY!=|}&jGqB~Z Fs0_%I[<-+]t]& @ p1 ŢaMi E7AV o{M<?h
S˖.(yuHsVc/Rq Q]p,:5'FE @ P{EFEQ ao)jfW?\ݳòAEo h(PD6<lNcT Lַ6?#/{V Z(~a${\d9E
Z01@ iL]d*\T:/>Yt{0>[4AsgcgƉ"ϖ}VFQF[zɆVv{[t+EGIg=0qh @ )"~mX/UNCF`͙/EAآ&2NOO3 5cc,HЛ8>4 me2}E_Ɯ' @ nJ`X42\hMstsݿUю-=onVn6= EO!4 Q/S 2Mfφ>m ɧ[[}~$kbjMz{ '.@ @VtoupqqG- \OPхdxճ|/MѦOEEGgT<=?#o](8^e=U_[YC"Wz?i/8 {SO u7߶ , @{WEK+j\⠥X%M
h GA A[Vy! liL)O
W\}'4+|R+ EuXkF6]ݲ.jug.<}Lf & PĢ% Ԇb9:<WqjLb78:ҺmiC7V<P{z ډA}~XAk}ϊ"eu.>4>;85װ:GVC)-=h}__;vWf-IsU Lu47 I' "& @tsV"e Q47Q 6(`Vo<rd$Lɥڔ`Q0:癷?I{]i|c]ʽ}EݿC &XTg ieYG? NsOm)'ûIFid;>y"ntE的"X"a>Eo$Anb&/5t, @ @ (o
FV{OvJBaլ|=
>(2aⱊ,j~X.۴kD @ L%oQ?)JoFI+mń";;k NCMqS)(ݰIa$_h7> @ wF\7 !]߅GUM( w}YEB%4QB)B_5ьfi^%H&hɧ- @ Z,_(`pam>ZXH&=MIl*z=MV8YD_{dQ켶ʫPDTMO @ @Nf*]dEq&tijfWETF(X*͟$IKvD֗>
^[aK[r죄D .! @ p"3p+˒ τGic(w[fܸ)-Y쓨VhEջ@&@* w=W(ZVWS3 @ 5&0Xd+I X3ݨ<UJZҦYOttp3n T+4]kK3w( Q+lWڤdYzd"gOR@ x@`f|;]Ǐm4.jigDuy0?@Rk'q~&ky ^=ל{ @ omzeg;1|-JbZޞc)ljҳZ"WrA(C
3$5gsRIqVz4]fBp{３dӉCYߦNlc kEV1ySY4}FW[[kEw[h"_j8:k4~ꕝ۬>\/k89FݚקiN:%kgܼל4;nc @ kE֙/KL: uLmߕjpA~SgUǩ-k]U~@aVÎP:D`ȻaE&]|)&E_D k|Ud @ E6Ete<e+VY'x.s+uK;zA%:xr
yqԴEcEOȗM-G1 @ ܀ŢQ |w?:T֭wE#8fiPrCg,vzC3A ^R}YRvf=0 L+4 l @ gn,xFly66HPy.a
inűGEعvE&Z#Fs9yYٷ\ml @ rl\{zzbkJ8ZiiHiLVNԡ&фrV%6a-9lD)
ϙ gy @ r&XTtB7Y֝{pd廉DO/Cj]V3BKŵ1XT 6J3Ȯ{8ڤK @ pA 7Ȝ{(KhSBsSQn+:DA&-xz)TH
@o_ R_tMg^"_SYV? ! @ P
\"AVGqvh ]9ZZZj5[J-k-? k fĢXR=.j==oSў^8' Dg?gv.A @ ],:8G}ϲM :{zMgLLbhSem=ô?tbk;mP^F52Г`ڗpwY [[곭>QuaNCi f @ 9YdK<5X@.x%OT>Q7H{g{}U
%|1QE"֩eMU6 @ (ܧ~QqHO3|"B]QAĘԠ ԨS,6! @ f{JZwc S|#9ҡ$.BQ sVq7)h]fx @ $L,2Zs+YIr *4Y{9> 714 *h0M@ @-bݘߺ{!l(V[yETz;nB o(>B @ op*Yw&YD^" [ sK,»զtQ`V8}: 9f3@ KYH -..W . Xݬ[[>|Ij_}
M@H^G @ Pm[? q7cz`s'<Ս;כSUt}:EݪqA @.
>Q]Nǩ]~P'uW"v P
C @
P0я~
dH>PdkٕDD H(ZP?s0 @ @E6f FB0`+B`vK`]B$ @ 2 "ـʜP4qb&მXWf&8 @ @ib@0t +'JD4l @ @b2?G $ELjF%- @ hem?G I_
^B@'$}$Y/ | ? ga^B @&lF7 Pt9$IZ(
P} E+*fe @ u%Xdpa qW/Y9Ÿ,v:ES\B IrQz{|I3>~#ڿO>( @ ~m/{YіW~y7؏}|fCA";dy>RA:GZEY@ ,j ZÓ>kN@+essɫWnpp*њցiLKไD^Cs@ @`VފE<\\v Ϫ|gnO
_uri g| @ !Xd 6ш:F{PV$ڲg+ucT o/e E=}%@ @ AEaii *~
l'']~2igiip/WB8PDY@ @ (@0biic~։>7?BYLZZ] igE/@ xL 8X>\Xh+¨y|r]5KI^lmy@ IsQʕ<p'e1V; ,! @ * "m}xj z"x(#&$wI4Q 1@ V,O((}<Gh@ledƟ2n^@@_zMt vA @ Qb͡E v-(_ܚP(9~$mE6u.ּ- @
%P hLlb``7AOx@mʳ=O=ĭ)2IV%QSM&ǺXY{@ @RbјeD# PyޏlvKxr݄c%Oʙ{ @ JX4oՉ$L=Qc(=k[wrV$YQSHKym"v) @ !JE6a=[A4*I>7?HT ٳ3R EZ$}Ygi}W @ 'PyhhLHeNqғ/ ]oHb @ *I6bxL40-=Fc0=mw(?[u4W[#/@ Gvb)zdqh 2\j$ : eѭ(J:b7} ju5ns3S
@ @,ZEcKKK`e&v f
nthuBR'Bl'ŦޓH7ۡ @ 0 ĢS,E`hSP.~9jek#{#0JQPj LwTZj]j7 @ @,>5(fu=Ew_lmu4pZ ~&vR^ @ ^j, A[>ذz UoN6J SѮ&.Q)NB @1u#ێ],یR^_@ WFj˰=u\%Q
@ @n8:Gm+xjzJ
p8$IZcQ~mu#ZGZ3qHW!` @ $X`ZF5O HMuS
ݨZP߄\!` ":,u/<M#_/q%C @ S@, 7)D/a[S)R^(e{Hkn|~wM3;aЎ,ZHƄy @ B% 6 <\Xh/#"4^C @ ':x o IENDB` | PNG
IHDR . sRGB pHYs YiTXtXML:com.adobe.xmp <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
<tiff:Orientation>1</tiff:Orientation>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
L'Y @ IDATxrF?HwLfʜ1O`eLVdfNPY$ZGUbo,?Aמ]'N-4DŒ,Q ~Ek4I >(6@`bo:3jAiwu%J G+qx-u fGo ;K@ @ 3r/"U[V[媭'A$QqqLn mr505 @ @ V,!u"Pd TZZu$g.tIr@ @ a Xf`GEPHp(YQ3U<z!P#g @ @ղ[qj5jvI)RK1ḏ"Huu!F@ @ %@}( Ip(N?a֑ [@ @ (,B5T l|N.GZU֩st %C @ hEFx+8J+QiTa@V|dL@ @ @|gX|ïJV^< KZmmTM @ Ԑ vj\*媗$jiW> vs%S\B6 @ C`Q8}%c(
VϮȊf)A1Mt8EJj4@ @ XQgaRGA"Y~Es0K_h @ PEUPGDz&Bg$kc5h@ @r* 5."Tq(ju?۫B @ \PEo:*Q5t&X=MjGI=3% @ oyC$H Kgrq.=vЉz
E , @ 0
)pDIKL(>)kI՝VKmz9 @ Y^4ҢJL6эFӲjچʋi[5s
w @ Ԟ E ,t0Ң @ YV4Eѕݝfx @ &@fQGkiKdEۅ
/gJEC@ @ 7XL;ˤ7q2` r.L9l8 @ @ BLCb5MϒMkZii@" @ # EI>vF6I.M}V|Me @ B%4P{Fv '"PTNҕ$Q&xҔ8 @ , Xd(N
N2!J `"L @ @ LC /jgIQZ9C HA㻩u @ ,'!@ % '@8
^C @ Rpųuk N9%
ueoawǩ"C @ rQ\C^HC! @ %@/j#PTۮ1F`G) @ ". (! @ ( @ "묂@Q{zUX @ 4@y.U(
a ^f @ Xo e|Ĺ $Z1Zv @ @S0
)=mahٲXA\2%A
8 @ @ VYdczE{krC0 @ @ YTힹYiAؖ<%sAi@ @ X4 F?ҭLk4|hI~f @ @M ,iv?E6YMB@^awg9 @ '@͢p8Y2u$}C*5 @ jJ`QM;֦[VsB) H;b8 @ N`) =ID%OyQJ(6U"͖AZRI{xSj!IY6俥~\@ @`R&%׀߮-Zj:Egwpِ#퀅)(tP%U6նצ~)0 @ 0!KiM R7 Kp(mhyjcS -HyQca o_-5C @ E"[$k&p'ǽ5;:QOuuyo=By6%Gߕw?ɜ @ @ ',:7^ItMQLkRzU]} :O˫LY[ij#0s~rw<N @ 0
bFk[Y.2S*AlZbԚijd-4S&eL#s! @ 4 EMNgdx +ꖑb
F˧oV9@ @E Ǣ9{A\A)Fn~eo!) @ &4{ $SxBȉ-$f
(L0c3*h 9?kV# @ @CYԐTVv1 /2N}J^TC/]O]! @ 8'r0+i2ݤ͓bjK>[5, vqUk}s @ @,\Ժ&R:~zò륖Jfi&8u @ 6Eas\Z G_FaPZFEbף/ B @ 8Eק4mKw?[Klװ vj/l˯R^1?"6 @ b"@fQLe:f$L;J1M:MK+\Ap" @ uSz,?[*;kw@wO4yrahXN.%3WM3"5 @ @]=![ HVQ'i^H}hWm[|@Ԧ]d@
@ PodջnF:.Go[־j$]T
wB @ (.:*"P40JBqڟ %ÈQ1@ @ ,jP E/bZ_2Z*uO
@ &@fQ7u*"P4vOuBarv3IT*>Y>v+{ Զ#P@ MRa}5ȬZmaNtAՂt Z3mr|ӼzG^^,`6\Kn
~cEJՋr @ @S )[|pm'}`wE :NCd.s̿ygc!~ C U$`OV%P~B @ {Ȣ}Gki7Ez%? Sx,@"o ; MF.]H ^_@ @ hE
õtb.k}V!3lF[UMݙdJhK^Wɵɵ\r Jut?k
@ N Xt
H]^غʛ?iGdh{ A^UA# :K2MROR۲. @ "' VA Q+Yd!M3 } `XLU357 LS[
! @ ,
RKK6QO1^8غ%A#}lr]G @ @ bLCʚ֕<.>vU\˦?i;@/UOdjZ*Sv|1R8/}6$m(+ Y @ !@f497qb K1^ϖ|*s$P4vwLѰΒy~)us:ZJB @ ,&V:9`&kL2{}#& IsΒJ,G^t9'α "! @ `u
LahHǜM4},KG5uLVGʢ-y0i@ @ (85 Pde0_'ʞ^٦Ac*ZP݁1 @ @Un-ЪV}2Yi˾7(* &{uHl +EU
@ @t }N5_4]ueouKԤ@1$7r2"3F߮-8H@ @ Q Xe4:O:%[LV#[u]z4kQ}y `c&#,좙2+· @ p E瑩$zE>&ea4sKE]$pvt @ h<E5b[J]f}+5}!#gZ*ٴ @ 0.E`Db3 f)M<QWnZpF!W3Թ99 H@ @ JFTD`$k) 0 peaZ
E3@ @յՎʵ]0iMSt Լ3O3QS) ld.@ @Qմcb
[w?
3J"\ȮLas6 zTb Fc! @ ,Jܿ&+of
[2T+W6{;7##:Mr'.d)Er @ @ 6b25Mi'"~֑eS fpҷYR\q(& @ @(~kEDŭ)h *г $Ļئd B @ :k Sh[iSWS*[MET4Yn<klYT%~tC @ A XD7X7bDW5p!Z +.YEJf/ E, @ h,U^Ӕ2wfFKt'ph$C @ 8f%ҍ+n(?/4%f
hmM' K}~miL6! @ DB`Q$ U̸VBsD TZ
O;,>nQyK.# @ @Eu>QfzE%?(hZ9 g&1e '@ @ (A`Q HQ5jMn=pT'
XPXnV+`+;zW! @ ]Z]%l:bjNֱ$ꍘ
@ @ dBIlKT{|#5l^)r]m̎m ؖL^A̙ @ ` "LXNf[1M;[ryu$ciwNA @ @ ̈fCA#ʶ.]rRgӅeF4Ӻ @ 2hߒPҝN+ TJ @ 5EސֳL$XE{6tſ@ @ ,rȓ Z}Qcl;pBoLå @ @)41ɉ hm=@&Ot @ @|gX $K>l:7 @ 05ES#DDf(L& '
@ q ,X߮u6iݏ>'@ @ @(~
@ @ EAtC,y @ ,
jB] /@ @ @{o۾.@`"/&: @ @ z7t?]#_RWQ C @ 8$@!\D%$ׅ`i"M(@ @ #,C TǶt plږTyxsr!n vb# @ W"\$X]iMnX.ĀK|w(ul @ P XT Ak K 픋|KPg EK! @ Xn%hklK
ll?g[۵m@ @ X]]`p` TNrX.$]tdl\Ԇ\b-5T{MZ)N4 @ jK`Qݺ6]/4ܿfԛY-io}N EpGH @ pH`Qݮx)7k= vuR8 %n2ɜzlj\B @ H:,R:*pXk'"%Ee[5j`]+:t% @ b @(^'wc4iDž2jՅ&v ?
rȜ,r @ @,Sc)7/h^YS.;F e
̅YZ/]u!d L@ @ 骱 fWZsG_Y
Q=
n {=uW'*~ ]'# @ @D.Ed+%J+m[KzpKnW%uR"S.2W&w? ֬EWzǕ+U֯qm= @ ,\7z<mIٶ/Y6cnH(@m mʓe0)sam_<F @ f`Z
9"!Gs$b+eew{VCSH}/[~
@ @x,
OXdnM Ɗ0Bm%EqUtU)kSkjjG#sfښdA @ h8E Mjܒ$q6E zT:G{&kg
d#,)-D25<[># @ i}$I?tՒR'VbaQJ ;TLcQyto\#/d\۱ @ <2
lLۙ
Nӭњ,E]dd[@qag2Uiä%hK͆Jk jV@ @"&4pM%Bͯ- Y7Z:{#pWb.
G_UtT+$HKlݏfg c @ &`5o^q?k[l;^s}ZWNza7v٪53Qkݕ|:|W @ K@Jp' |/̍wid
$0RG̲%z?gY&EtY1_@ 4 Eu<,&h-u%RhIol"H&9s @ ԑ Euc>TȘr].2:\3kט6
>k7C @ h,2j)Ųkf\ yy^96$и"z @ XE]_
bsL.ʕ5v0Iw4]ق @ P[j۵Cǒ<DvڟuB_4u;_;G @ @JA)[˦
V,]ؔyc7x܌?C @ h,EM$U~DevjKjáE!E 1 @ 09?f;ï<Ovݞ/=yϗ<і"! }R埽uM{@ > ͛|F;+?M@f XԌ~Vֶ"W'wLSsUd53d=!_Y` .۷nm)YlDMyffO>l *۷nĶEW=}|mrq`Z74LGs:qʹ4ɦi@W ?a~3 ۷
E jQ' oT~ Pɏ[⡅ @b.fT:"#l#eRhA MT>@ e $ykl[ ҲVaVn_i @?EWQqmIF%-(;k= eَLꙠ0h{,5i,UqT
ԉU$;dGޕ˒mtW=X @ &'@hrviu1W`$`qv%\42F2=d} m ȿ&e]R'zc@ y942Fi`a @ (E`Q)Lhn& -dG_U{Q*/6qdVHv-8@
:@@ @ @,$YIdU l܋g X̵tk vwcJȎ?iG/HvAu~y67TOHk .@ 5 pTܐLp7nˊ9iVb @ 8I@lM"`VKg/v% B]0*1S{e |h|0 h 6A
"za(O=ٕ4@ E<~:DF1Xs 0
a}o+x|CϚ krT,[l߈s읳 ZpjER0jjI @ ,rM8Dy1(DƲ)ƀquӸ$ظ4]h @2_-D,@ @ N`u ~rwEt#0 #V# ! tmUczN|@ @`Q:Lk]d|%`T*igr>gaWbsc7 ^^ [ p[9@ *'@.ƀ:e&`TIdQgHvڊ)]V@n^a:Z= XT dI"Ib.ѭ 'Fj`Qf"xzi` 0u#ph. ! @ E.kxhMLvNҲd-DC Hسak " 4 t9^[SvёI?\p/Ŀص mem
sf 8WKA`
@ Eawk vw\~) hfδ;6E)v @ C 8Sxr͛uf]; f X~?u8&o/c$ e,Hh#f9~l b!c6$齽= @Z <9#YJNeסhF:OxQfb! +a\o'|: @ V)v=Љza
*?eԱ(zjQ&H<ZP$;jUE*4@ $qO 5dA@ Xy/r R؊7>iJJ9n9)v jV )l-/lm: Ԕ v$nŮMrn瘩i4Y2z3bda- dݏ͒uOAϊ9s*d@ ;lUn7D@4Z[!Zr f}h%Cv 8m>{ѿ.^Ǘ2@ Qcjt[32=\۔U:Ǐ|-E;bKϧN1M;"h ˗Mya$ѽϞwE ~
b\ @ @씪Mb[y -YF eUMM[vE͘ HOݫ/_g ln<}<SqLU \L`Ō٢юwi}r|UdG-~*ŋC XӲ &8tOnIQGK?98, @ >3_[{TLMK~Se~6{/y@Ӵ.ŝKZZ/-u,JE @ x5u:Zh\%QԴ^`.6nR<!- 3 c-q?y6Y8>7dA" @ dMƭ1gIdq <S NM{a_l z J\;+d\Ԝ@^<*+gvUںϸS۴ @5uݞo{^ 9 ݓ|whs3j DI `nQĺúF 9a&j@ !@ 0>E@Ij0VkY1·UYmIp]u,)M#7oJ(l=~[vQj֭@ @DEYUj$O%p>JG/]uwA3_ fD] [Ŏ0@JRًV+Wpմqϛnr
@ 5Go
/x'jyy.ڑ`KϣJ?u jG` YtX'O>ݚHOk7y㞔 3] @վ:XNJC<6 ͪoYf2smQ'Ea"
%/@Mpdژ1[hOS@ ` "+%L$prY^IR¼W~ ?MJZCȒCCϞOG2V9s/^JK @ F`54\!AS.Z4*,|U:*9Kbݜk $:slJ]۪ukŵC &$`JKFUZވc1 ?C*8 $~V uf=+rF
ߺehl @EPTѕ w[ҩK
ؓG .ZV̄ <}RzރͦV5պqZV좩{ C`8h"reS׀3s3vT7
] P 'CZ :%Ze ^7 q!LM(`TLךZZ`rfE[bӗ5=w1ϡ9 PSo^ז=ϟoԣgf$6# &`'yN#*V(E= _/7X.}@6 `@$c1HӧOde4 Ӄ / @ pF`3ܕ0϶͊odH`.`ˍOxQ J m =5jeڻreL;@ i \V C֎CR7gy#Ů{8 ̟>{ xąuf }f꣰BOcp֭m~"n'
ak $;מ# c| ,*ϊęUʙ+46:QOd T%Szp^ˇyRދn̅ lHҺןz\eHR@ {*ouo_$俼:3So<:fJl IJ-5L@!Pg)+ /lCZ'iHF <WPkEE
E$hGY+5a[uUEagBfj
*~^%]?0yJk#pOj[tˬ$,XϻjSi5P33So#5~!E< ~:D\q-10En6Kze`Lsy2-J &qn0(E@yc\+lnf&|X
BOcʈE%:숸%ISŇo7D
eY&L Gp460&6Y~~Mj ECp'ӽh >P~!E|Z+ť;g.)u?gf4c( 08g2ɾ2Ĝ4;-i ukITZH~%2
nL[QY<!y1562+'ԡL?[ ier L㊞V0@`<mw?eK% 2sey\<(B PR' ='PdEVL 6ÅM+"rE\gEԡ<Y`Hvїr['EaYnE B $~W_|- Nl<OůOB|h Ԟّ%ԦDwFsvy /=05SLZ·Eh_,_ GSG$K>ڂ{LWV1^zR's*[izM>C. W~`/H/f3ϼy}&7N R`G6SN- P,[K 79dm/\Wd* 7q5cG2Wmw#/\6uhv%4KcVrՁU
JGrZϴUFF3eva߭m%ɥ9S~c̏6Zde@V[boYfFcoGA!֖7oA--hE-[$4=T$ԇfͲsZ*n) ƹZe#g߇#G3պ8vX' ʮ%Wbq9jh_p M}7VBMZoHQN:Qrm?+YR 2n" mi1!iۑA-vnhWHbҖ
"0,l tyA1a3=_cp}8A0zg,"9 ~ܠW 7kןS`ξnG judՀF~ ߸$7_ڤOz&bK9d/ 9֑9y &}(ƚ_H;1 eyػrEƷכh~*~s릞7Sbise .9*I=2LéҲUe7UlJ"Z匩]옊>Qo<InR Rhm=Vܪܗ^(Lm!ߢMeP$$;uv1o['먮_rkwvB71ô],ظu@>P^ݖLY-V
%Vrm v9Af4cjsT9Ͷ uK} Zmuu . |k'҇Mp[̒Ү}_k=ɗL,_n㭙l⍾%2fܐ)ӆv3s^^E ܳls9A,gcL嬽)voygIe_?$H4@9m}M%*D5Pdf8Il72]$jSl x_(33Aj̇ >|AGuL|5 PT4e6MMi@:=1EH|~_~;[$+ #o?gRdgą˵ {BA8юLaxLR (e JpjMt )7iN7II,&9~Ƀo>"pzݔ"F;1`)T]d%JE(JShsbmoZKýX7v*Wi>]jlIe.
4KEQ}C_jPڞ{yR;YÕbw&*7i]q9ɍj5W\7(qL31`o_O%h{= :x[O?'w1
fl5# ]dmI'ԮEܩdw)mIϟga[+y=@{|bǒդ@ыdLYTE іE$g`wm[ Y J3Ey@͊Zoa=e?XOJ`^KߌR[8Z¤8]$}L\0\ NzNΆ<6 l7(ل'sZS:jDThzyǺ̀E >j;aE)q07_HgSQ\W{k?5f Z>U@܇/@S!\07B>ٮYrQ&d *ƔUg :j ,250~Mu~ 5 ]2Eyһ!
D`V.ח۷>?lnHjXp=BE# T4knj]P=Sכ3-`)/ocbuaM"KLx4<+?-/<NgW][*42a|EȰܣi&hT{gq0\yz12˾7RO(e nn혋q 0%6u{/cVДիf~Էnn?ʵu?y 7n*AF̦942Rn`yEq=bLU#h\bē gY&FŲͅ8nj]P-%3kw
nĘL]/_nIWUSúEGk+-(}}
,Hnؐ( ̋Տ%h@=(/J\<}Noܧ' 8QRFQ&rlF^)RhĘEGSΆuT~X4nyQkE%ybhnK uQQ 5^{3ϟg"dwjA H/nB X!Mʪn2--nNt2'E1Fw Spq2+}U
%cSrSY9ipj~42v.2S _u
# LM['音q2 >Z `qչK4zv̬.}^=onƆ)[B,_m?k;MEƾE&lJ$ߑA-ouig5yhB
}p 01@' hLE,2DR(6!}ΙO>o۵|,j[Wz1]$%K"?`+>
{#W25LS5wuO uB4fz^XR2*? D& " @ IDATI_[?<{\
$"mlK yd]Zrp![t# 7_ =.+ jƘ{6SH}% mʅÓ / sx%ģJTOYFwR,˷?{w z}f&
=KXKP'q n/:*!+% :|( ʓ9\d;z]~og>x
3=Y;}12;|}? MtcJhj~;Y Kܟ<#^?P6d檴 ݊
#`J$+ľ-RǙ9&`oCc3ţM g\ؒ1Os|C2>|ϟgLƗ5R ޗKȶK1uȳ)c*`ѻ~7EOnEwکE}tf4Xjxԉ(%J}#2c?
ryHOp&َ&q B,xn 똸QZ+W25_w
7L* TLJiF8p 6 0NҬ
fQ1,WU7RnѫLQp>}Ky$b$A?)o<E3R(SFK(Ej *7>Kq<OS/jV_d^d T11^*"pȝ8} z!A`d]"] ZG[\NGmG`LT1tＳ*7_Z h ڊZU:3)\TBv\1}rnHhS[-IASh!(vZ2G[z 6 %Y ۺ;8ȘAd7Se$ QS}S\K29ei. f ) 0ۘ
rO$tI\"s
ZHJM@FFe L0:FqtVVxĎ lyPt2^ T'3LԢ1ӊoUosUNGꞫ )%"${|`SN] 0J*eL,j_` "] onY$jmW#A<cNñKB$ ŢQaSX3p_#)38얀e&KZ hfDy\HGJmj]"cXma^cj.}L,*
Y'ɦ'Tr^LS& g rqkUqM)Ú4J5Q ,S&E]ZyAO1آ[ }|ި= GGE+7xO@xWVS { 蒀ׂ8V?\?R c$< KA\Uٽ;$YJiZZ(j=sp0)ts_BE˫R/g=S|/7IZj"`F8=
n92U vLT'.䏖W F7);c SÅg^"@"[d,Hԣj\
E$hG8Vq5 g^K0bwիu/yR2Za= ?<&LO:獊O]NJcr|n=[u> {UiZ0]1ʃE&Pk Fgt`y6 e>{4g;}.2y30:Jwt=Ĵn~lՎDrpR;v8T@}k-'(}2ԊBux]Zh:;`$n
0@iLU,ehxM |qsyY?}QkY֖c$SgO"jNQ;xL1Oּ5ӛİ:JHe1 a_ 3+Egõ}d'qܩ^{*nn n ѯ/cXTe:U%7 gWהMQD{StW]UjD
M"F'5 5<5Sm`ѵ'.8I._,0&0yrqn4zn<t@jե~ zHplϸiǘrT% ERk<sn"cB ",z{i Fedﯖi7uO6 oT6\?-W~_})r5=ì4_#]t5w9N1uס)FhݢT.y%kk̽fjK
㱙k5uiy'n[a-*} f0r$_tQf(oۍϞ
0SR;ջ]l 0}Ly
NYB[dZZw%9O8R`< `FggW zXɴ 2<dĸ㴩@l͘.d 9Ӥ}N$]UŘK=1-X%f/jILZ Ni9<?[~7-De'g(gWY`dJgLּ&;15|dv:6 0]˿xɶ|OٍJIAamg2=yp n[f| Ɣ uLy __H| أT}T諶~>tֲՀL)+yyXksn4@h ۠<7b
F>P= N(M ٺ=?{X4ŃeVq7 gLc9ǔ`QݾZu|>q-@[%%떟 %͙Y)j=NI#ӊ&KR){Ѐ/u+k P]
nqʤM]=u"Y-N3/wc$h/G*=Ƙs i!)W/_f8V3:Uy[ڎiǟh6$kn|<5m?0Ȱ^oħI%@JC/4 Nrfy*ڒkI{L?;ap(g{^!2mL9
wV%HqBիNNFE#_&W]{
UeĦ[v$P\,MkAXV z)* a&hn3#PV%C$0*v9Uц \H&lhyll-Y9 c|6^4~;K `T&7ڝJڟ] Pn8WrD䘏)x ҲxhZ9àEqf1VnoLAC,|eδLr &} dZU?plu hxT@HcIȬ|&, ܕ[1_Uݢk YݏuZf45zz}]{nS?Z3~M织k9*"6'6 :65+Q 2!TԄVn0@Ɣ`)h d:lJeuZ5(NkZT_l #O&5' Q(Nü$U$T;l Whsu~>> ' -!}ʣ:4̄xh !1H?2^|krA3
Z8ӞHvD=gH̭,1m܀=> Ou\A4h/CM qǃ'|ӃUJC> _a\{AiV2%l~ǁ9n2S %:E 2#-<V/i $~nr3/:PCe qm9"SMo )lk |EfGt:|:;Y{<f*lVE}ֶRΧ-ˍJyQrx4E}^2ߛI$Z.avK =ޕ߸tdA
aƔH
aLY gUM&/Lӈߛj6/Pg_>|ʥ`](O@Tz}! 6O*Ŭ'
9fpHpwD eG;b lV: ޕ+o{N#4Vzٙ5hȗ1ў.ꨡ 6٧l}H'`LciKRcZHE %H[}v )|"7PVNeXP,,_t٪QL@#[RxUeӈ &j]~@ }q9ߪ<2A# ^-ǥ
6CpiW}jY L̊p':f_ 6 0$q,J6)νԙōhq6)wdN[#-cjzLY ;+D"?In HO?mJR4 :,>#^KD̘w|2Qh];#[Vxph[&& aWhVժ'#:U1 Z5:!':<Y}\>q9d'`hnrɕuIm]w`
d=~ڌLfg *wǔܻL53mKWdzIMGoNwUrK& )vmjug4!ڔmlW } ؔ ,E3 -&np,?$ RT 7ig\m{Jj}6
8 -YD4-2h6a3Sі,8hp15ua*3 $ \ٔ}^P&3WF4 UWzjör]lM[D.uzJ&e_K].ӎZVvL-/M y rˊ8 A5$%hoIC h8ٖAqok&hZǘ
FP٘*X;r#wgo9!ER& 3ԑ:hgnF(j}W~#c?uiߐ H`#um_[РќLg\=z>q\*Ƥ-mӤg<<I,o:a|#>ObSL$v/k&Vtԫ SSTdӹ ٻrdu*[L5)jn z3&;t X}$y42~;b:MNX OP3!W/rfկ MliOcT۷o/xЃ$qiD
93٧C+&fsg3*_W=: 43u^B7P:wr!CLD@+xI {3ݬ)Ac81u"NkJ:4kݲ9iV: Ȃ>P$^܇/蘒@+ L)!ӽd#c2{7;& S־~}.XPVZA U<h'7:0KbV)Sza3ZnjBi2M+>ƧibQբjDQ&R#b<-}5#hם$OdtSTz5 kC<B"B&F[+8h:6;!kcj`Ai)ӂ| իiHū̎{ a~-EIαy$$L%Z1As7v0p4\5,o,IpL\&XZ%ykGpB^Ty}hf0n]l>3
a aك5g0c.<CۻL
> 0&gJLVTah7ǥEV
~%q'_V{*ѶrEht3->j]ƛ5{f[
{ΒK- CLke9\ P}2(ߖ#p -1em%cj`zޖ:Ot.%y\tȡIsu*`Q;rޗG+@n2nL`Ͱs!?_HvB `!) L@ ! @
&0VׯwUZRĺ Jgo+;הNV:>UV#z-4 8\'$O zL r p *;CDл.
{j]04aړe´
@ pJ``YJ, Hv4Ύ.ٕ${%\2Q(j}ԡk2'/慌$hIlq]c0僻#1`LvæoLEzFuf:u @ xEu*24 :e`WmީQ̈ݏ2cKkxvѮɂ Q[2bШSLgJE%Q5W @?"$o[jQ)d c@[QT#*?P:!`B0_J0camDWӅ,-au ]T7o@bf> KvZ8`O>I TYM
bE"PQ!&: i@
zQ^ vdVGqbp- ϲavQ:YE ObY9s/^Jŗ VդC|7{vM; Wv((lDl& Y 5sS[P,T1Je ԤVQԁk= }cJLd+{+bԐ 0È좊aREQ([|w7M4KDcȩZ+r?A[˘ ԉjԅEmI=~=
`FQl[%Z%_AG^,^?awBϴLm'fcO&0CGVJ*_;vSk#AM)? A 3)ƽ87˗Ϲ&ϳqm
$ J~6g٦"` :M%aɺфB;,fQlT9. z2;BuKJ' $2ua'7ݏf[q ޒ~:r v$=/js|lGA#QNWw$&
d`Aի* mKϬ =@I|j\ԏp =5˜HS Ze>PwO'2'\O]IMfLM{T9.&7B{ЅPײ/ mcB֦ȅH} ]
B"`DΊ),owYlfa0 }뿹~=5S ɇzGN }*B46ݾ^Gn
퍑j_%HK[`s8| Xg43v[uiˢ0D*̢Βql/ϮH}TCGٸM7~?G
% LKYsT?R狦;#Ws}FO?m:b?g ,-D0]Y%ʛ4O& sGVoC$nkŧOnMjUC15%
EEKSVT15$ڟݒ{rsm>@ѶכJ'C&H$S ^4w}x:I~6F6
Okg#|Oiڸ* S xg:f._Lfv@|3I ϑ:S~
8<<R:7XdRp5q7NL2xHl;M%֍pζ__8
E/&?8 deϰ/Y$V#IFhn<sú|Rw\Y\T6L"]Nt^Y]noZga0aQoI&lSOc`QQ6\nY \o:֊L"DdFmrF ~3;6 ^`26ͧ|Z% {%#dB οV. Ty֗d0|Cn -0Wtnt& Թ"Y Wv/iihVN]p 'ﶥ.ЦFvozi^%MmͦI}rcNj0-9xfIt
[72?f8n?{TY"[N tʯp͚ -F0&[:3XTL8lDUt|x+*+D 2lӬlV#Onk EIp?( 0Fg00+/=O|rOv!pI8l0$>P _V 0Mq$mЀűRsh}8'L` GS2ԙW33RAp^CREݏ @tig~M\Ӿ1>0(h ](é#d{g>|ܒT|\3Oc0U.K1Uv!3ErCsYG fڙd1 `(z7\7?OfZѥof:Zqñl \Fn IZs챍i { P.
ϙfLEÛ q4I\O, ,EZ}cAT-E
~6s8QLܗB\&#ǹ/$霳N3Є>sUd^Xa֘]K d0}!>?Ř
3CSob]mCVѣGnDwՕF;Q(:")`$c4IPzwL%CE=GXb߆]8wJߛ#z0OzV%>S6iN%+1VHwrO?mTMb vw.nI &Ш@
?g٦{p2Jvd6mn}njd^L00lef] L2.>k"F ŋMy|4)tT=ҘtL#Z:/^toBP}rltj6>̴ZO=;LKs^iKLvesZTC$Y$*y[9
A!?9H`g knj1ܙV)}Mx ɣ<q/% 1T И:,zw*]~ZYEG_[:<|qZgU`xՇ0+xQ[/vl0 L/n:~ )]45E]y (KO}L3WLR`)2ԲSy!Dֹυ,ѽnLxʞ>}eZz[Uf^j%6`L٠8ihyޙЯNsUֺܸܿU`GoF`*&N7ׯr=98100,\Yj\v,X~#f"0_(zv)9 V6trZH2Na^aCpw~3Ͼz壟c\A* qL 9P=qZl$jޅu)Oj]FOe4;\k]$-=DgVs-yM}%dtCWV|A;{W.o9SS "3D0S\o承k%Q? xƴŨVh,cBaS-gQuWNѝg4eW(jоvrP<òͽN̕tw&ەFnKMzpr' (_bfS JfM- ܾy3~z z惚ɢ7>t[=qч2]|Ɣ
uL,>Fm[jz ַk -Vdvmt?I \"_ȂI_l D^x-$h}xS>{I սqps~3A @He"뙙UODeŔ=O
CT[KvϏm0ŏ:S~//$nQf%gPtqBvZ(Ҿ~t\`P%83\&s.:wc cO|n{9&5y&%=xh0" ~ DN
mXs/\?\#暑LBo' iVqE1Q}Lh+)@˦[nIVQg宂'wʵp, U8w ꤶ
ɕZQr ˻X~mӄEnجI&{ {yR*:b B;FxKu(R-Yn2UI j oLu3{칹 ^3^W_80GS;$1Kf:XӰ{Ӛ$[^C Z.]K Ai Kn=(O`vKhMR]K$[
Z<>rtϟo p #ӗMM75- M1ګ1,cM(:.h-ed
i LC@
9ĹN>OGdD0G2!^ZQ zB86ofKMX!Mk'/J1`iLa= oiSSMzS$&WCUv_86QjaS|%{>k<@ter=!`
{QtLM荫 s€֯s|$K3rU1e }lckGL~i`[zQ(QYܰ-nu I&IH~^d|u;~'յs~_ӝN(M))@Oh5 ζH<.IQG>4τ0k9%d`S(}W__0Bcŭap+HhCډU
m]T%~t7@cg.b#ѵ{{ qǏ}'+ ղSrJ{˘ r' i{WGUta&=Ry&0w#溩( M%é1#);]*EI6eo 㼒 h B gsYCհ ʓԇ]9:<N)XMsׂ L |칐Id|f2tg쁓zw֭ue)6gzvjz 1Ux<9zӺWS2"PϩWK
q7!P9<I7YmK ۮܹ1 SF5[֛o}dpґu0p_nW|AI <^,<]UugL}$ۯGd3fhq(}[y]'
/$љ
0`QԵ3= pzEW\dեȆ@pQnlR{%d{aj"[8 u0<&@͛r34HtH<ٮPnU?,|=~W:OTG!2KC_Qk_\LAۯɋm|c
ok:=lrlt)K-_#٩_v5
<BŴL- *<9}7oqm4b}M $ yIQQDRe I JHugn T(@ޗFJ gZ';vyvaZՀc`L_1u,+~Ҧu vlï @q $IGf6KnD [&@n]k ȷKԗ2EbsR,ٵޛE (Ar%ˊPP3
vj?<{'0:5 }!ϧRdd4T ^
(ckch:$8"_E*N- MBǶ.>_mHSZ=3:a4ԆC "/~vaJ}z'A- `eU6~?VG}`L?;_>jkt9wN[ t,1z ";& ԥzHf|wrraEbӧO: _adU:4ez
ߛ ˦m6M]ׁaLH7w|_iZ1ƔRMSG*ʩcʵ,JyC,ox`-X`N 8J۔Jz͕:MVdꃏ- ZBf9_˪/KGP~ 'QWE46%!aa
aj2I7椙6
^/yO ִm|o$MkóI,'#x gLg ,fRQx )+e-{(-EV[)"Yu[E:\7S/\ הZs
J,oo9/w<ݖ\ŧ;u!PF~zzW__ƞfChZNj8?;Cq<Pa.NLawC) YWt|"VW4-a} ZrE ^W"RgnYSa֓@F<֦Nt{\S)#-}4:wejsc\@qr@.NeR n&48 QGϗa,뇭CH%o0-M@'櫢\YQh5T׃k5My+>gsQZqy1B
7MjС1<aᚎ7~!gE@ox͐< =mVjRV-*%0qw `
52Ģ\g &_| V*]Ҭ5: S`dDR{kts"cjY-B!5UL9->8 @>K 9F7'{03wEEN(C[Fc(<[R1]K}/THb>sn95 ??G
[ks]ݠք ٌ/ 4V%=H`#c0Tw~S{_IkJDy7(
G,pc &;wϢ4LBx=ɪvڟE'K{e;%R&1vrS Ȯ{@aT8buQr LEESqQRo&-r ]]||\Yêw9,Z4S7vsvS}JkjVb3/B,y~8 @5 iW͑UT?yeZ@jb1J՟1F8Zy
-R&GG&[Vt47دQt~ 5hJ %fs"esT@7uI4.QzO1FZu(C؈sK/ s~Z]0(#4(q6W\S,
G,ʲv1
V('
&ϻ[Q&Հy'+E1)8.BSNGig\vs]2+;Zp"砃k*i*
G,ʃyw~o@ vnp4B 5U&k ֮ D`$
lw9{p:'za4QUή"7t$vG^wkZ8p?g\SZ5Ȳls N8F,:pI jG0.ϵnP3 $"
:vOwM$M4 p@Im@yUV;=*^GkjV~\S8BQ"/>]Նg"3S;O
ZA/Y QH, wS0N9ČgYy t Q[3OF)tEW87͓uM>6L#.Mm## pMMu"xuMd,h3#FvB C Aρm61@ 4?CR O\S7$
s3OBLQ `F>vv o!55THbQZXhNB{
;}mv̢h\^.--9lETz; wHeЅ'RRDrպɰk?I7H4ݴ[ 2]9VN
_^̦T##+ ޙu QE[qU'{}M|b;A8A1QE8 =$``Ei;sg~BQ1&tP2f;%6u}|q= ! ECG|:5pqTodE̗WF; ߰jPn0|q hQB0lnn ǒY7úSffEMQ7?
ˁ튄 -naHM+g*T9栙?MݾK@hda/owT|ya ܈ܺޞ~8s+je,L$;|GwR*}W}kuG}>"1NTZV0(|7{ (,Eg7 N`Q(O 7=ax?$~YXA g9,Jywѝ (EOvF椾
D {p'RZ$n{v=LH;G܍vv\S3suX,re?o-erZ{tx8W@d٦a P*a !ٲ|laFݚƺ{
DմJVϊ*Yy,+!&Q>\XhjA7ڬ1vtp@TQL1W
ݖ:Iۑ]'fb xGғS~Jj#"~F .$5UδEq/r<Qތ]R҆|5.R"+n 9v@! k[diM@ @N
Q3:>nGqV -=PٍJ<G
c" pMGD, znߓnhGk0ȁm M3yqs
+r!z_KZ'.캰).b ('U nÔ㸩{dHE#;ׂ1;Jr;CH?v fvUOA( S?-o?W7QU_(d9$FvB_! @ k&}<o+LD:!<ם T~gP,bң[[ܻiD(nU
/QEb2x^;Eۑ]'f '1
@ A N
.Mkjkjq/|-}oU$^.| ML :wߞCۘ @ @ \:wJApwc(Z&we.X
>pa
'I!a%f _! @ B$0LC3UB=Wh]VD B>S7?uׅӡꫭ5,`sii
gvF^Q\wwsC @ #Cd`n XͥˤܠCYopx<ۖ% $ qՕqsQ "i @ @-
B"Z M
_ ۡT$b |¶+R\ݹyhw}4lqh컰 @ ^A,]~h$xll5hscgv\
(M0iY}{Q%>Xoܜk&m(w @ yg"};x~ŃDLD[!VZ'.ǐp7Z IDAT8nQZJ13C8:<?7I4e+bOS: @ ΊEFoB;_w{rnb߁"Wgf,螽f zr%y :sSZ q6 w{Lc @ 8#Vȝ`\<hu_GV_9*r%}!{{~>QJZ}S@5Q
'7eUQE%ʅ\ 0 @ 8#Y_93o\F?tE\v<{&`N\Na~ѭw2ZP E6a
\5"4=;A @ .!5,?]GxvN&xM(sqmUxlbIhk"Pt.ig6@ @17ĢwSQNP(@fvUd<XYqbbk#YD|uD
5Hd' @ #X4Y ^
vF+j9`NJ6e٪ӵj|溟oono0H"'խadBQgWQEM ΅7&2 e` @ uS [{G"ұ*"c} Oc CaL 0(ӂ:p(ȆZu W
Ӵ @ kE[4ۇ m̾} ăn*Bֻ6 ŬshqqY!=|}&jGqB~Z Fs0_%I[<-+]t]& @ p1 ŢaMi E7AV o{M<?h
S˖.(yuHsVc/Rq Q]p,:5'FE @ P{EFEQ ao)jfW?\ݳòAEo h(PD6<lNcT Lַ6?#/{V Z(~a${\d9E
Z01@ iL]d*\T:/>Yt{0>[4AsgcgƉ"ϖ}VFQF[zɆVv{[t+EGIg=0qh @ )"~mX/UNCF`͙/EAآ&2NOO3 5cc,HЛ8>4 me2}E_Ɯ' @ nJ`X42\hMstsݿUю-=onVn6= EO!4 Q/S 2Mfφ>m ɧ[[}~$kbjMz{ '.@ @VtoupqqG- \OPхdxճ|/MѦOEEGgT<=?#o](8^e=U_[YC"Wz?i/8 {SO u7߶ , @{WEK+j\⠥X%M
h GA A[Vy! liL)O
W\}'4+|R+ EuXkF6]ݲ.jug.<}Lf & PĢ% Ԇb9:<WqjLb78:ҺmiC7V<P{z ډA}~XAk}ϊ"eu.>4>;85װ:GVC)-=h}__;vWf-IsU Lu47 I' "& @tsV"e Q47Q 6(`Vo<rd$Lɥڔ`Q0:癷?I{]i|c]ʽ}EݿC &XTg ieYG? NsOm)'ûIFid;>y"ntE的"X"a>Eo$Anb&/5t, @ @ (o
FV{OvJBaլ|=
>(2aⱊ,j~X.۴kD @ L%oQ?)JoFI+mń";;k NCMqS)(ݰIa$_h7> @ wF\7 !]߅GUM( w}YEB%4QB)B_5ьfi^%H&hɧ- @ Z,_(`pam>ZXH&=MIl*z=MV8YD_{dQ켶ʫPDTMO @ @Nf*]dEq&tijfWETF(X*͟$IKvD֗>
^[aK[r죄D .! @ p"3p+˒ τGic(w[fܸ)-Y쓨VhEջ@&@* w=W(ZVWS3 @ 5&0Xd+I X3ݨ<UJZҦYOttp3n T+4]kK3w( Q+lWڤdYzd"gOR@ x@`f|;]Ǐm4.jigDuy0?@Rk'q~&ky ^=ל{ @ omzeg;1|-JbZޞc)ljҳZ"WrA(C
3$5gsRIqVz4]fBp{３dӉCYߦNlc kEV1ySY4}FW[[kEw[h"_j8:k4~ꕝ۬>\/k89FݚקiN:%kgܼל4;nc @ kE֙/KL: uLmߕjpA~SgUǩ-k]U~@aVÎP:D`ȻaE&]|)&E_D k|Ud @ E6Ete<e+VY'x.s+uK;zA%:xr
yqԴEcEOȗM-G1 @ ܀ŢQ |w?:T֭wE#8fiPrCg,vzC3A ^R}YRvf=0 L+4 l @ gn,xFly66HPy.a
inűGEعvE&Z#Fs9yYٷ\ml @ rl\{zzbkJ8ZiiHiLVNԡ&фrV%6a-9lD)
ϙ gy @ r&XTtB7Y֝{pd廉DO/Cj]V3BKŵ1XT 6J3Ȯ{8ڤK @ pA 7Ȝ{(KhSBsSQn+:DA&-xz)TH
@o_ R_tMg^"_SYV? ! @ P
\"AVGqvh ]9ZZZj5[J-k-? k fĢXR=.j==oSў^8' Dg?gv.A @ ],:8G}ϲM :{zMgLLbhSem=ô?tbk;mP^F52Г`ڗpwY [[곭>QuaNCi f @ 9YdK<5X@.x%OT>Q7H{g{}U
%|1QE"֩eMU6 @ (ܧ~QqHO3|"B]QAĘԠ ԨS,6! @ f{JZwc S|#9ҡ$.BQ sVq7)h]fx @ $L,2Zs+YIr *4Y{9> 714 *h0M@ @-bݘߺ{!l(V[yETz;nB o(>B @ op*Yw&YD^" [ sK,»զtQ`V8}: 9f3@ KYH -..W . Xݬ[[>|Ij_}
M@H^G @ Pm[? q7cz`s'<Ս;כSUt}:EݪqA @.
>Q]Nǩ]~P'uW"v P
C @
P0я~
dH>PdkٕDD H(ZP?s0 @ @E6f FB0`+B`vK`]B$ @ 2 "ـʜP4qb&მXWf&8 @ @ib@0t +'JD4l @ @b2?G $ELjF%- @ hem?G I_
^B@'$}$Y/ | ? ga^B @&lF7 Pt9$IZ(
P} E+*fe @ u%Xdpa qW/Y9Ÿ,v:ES\B IrQz{|I3>~#ڿO>( @ ~m/{YіW~y7؏}|fCA";dy>RA:GZEY@ ,j ZÓ>kN@+essɫWnpp*њցiLKไD^Cs@ @`VފE<\\v Ϫ|gnO
_uri g| @ !Xd 6ш:F{PV$ڲg+ucT o/e E=}%@ @ AEaii *~
l'']~2igiip/WB8PDY@ @ (@0biic~։>7?BYLZZ] igE/@ xL 8X>\Xh+¨y|r]5KI^lmy@ IsQʕ<p'e1V; ,! @ * "m}xj z"x(#&$wI4Q 1@ V,O((}<Gh@ledƟ2n^@@_zMt vA @ Qb͡E v-(_ܚP(9~$mE6u.ּ- @
%P hLlb``7AOx@mʳ=O=ĭ)2IV%QSM&ǺXY{@ @RbјeD# PyޏlvKxr݄c%Oʙ{ @ JX4oՉ$L=Qc(=k[wrV$YQSHKym"v) @ !JE6a=[A4*I>7?HT ٳ3R EZ$}Ygi}W @ 'PyhhLHeNqғ/ ]oHb @ *I6bxL40-=Fc0=mw(?[u4W[#/@ Gvb)zdqh 2\j$ : eѭ(J:b7} ju5ns3S
@ @,ZEcKKK`e&v f
nthuBR'Bl'ŦޓH7ۡ @ 0 ĢS,E`hSP.~9jek#{#0JQPj LwTZj]j7 @ @,>5(fu=Ew_lmu4pZ ~&vR^ @ ^j, A[>ذz UoN6J SѮ&.Q)NB @1u#ێ],یR^_@ WFj˰=u\%Q
@ @n8:Gm+xjzJ
p8$IZcQ~mu#ZGZ3qHW!` @ $X`ZF5O HMuS
ݨZP߄\!` ":,u/<M#_/q%C @ S@, 7)D/a[S)R^(e{Hkn|~wM3;aЎ,ZHƄy @ B% 6 <\Xh/#"4^C @ ':x o IENDB` | -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/ConfigTextResolver.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.component.txtresolver;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import java.util.List;
/**
* users can modify config in text mode.so need resolve text.
*/
public interface ConfigTextResolver {
ItemChangeSets resolve(long namespaceId, String configText, List<ItemDTO> baseItems);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.component.txtresolver;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import java.util.List;
/**
* users can modify config in text mode.so need resolve text.
*/
public interface ConfigTextResolver {
ItemChangeSets resolve(long namespaceId, String configText, List<ItemDTO> baseItems);
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/scripts/controller/ClusterController.js | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
cluster_module.controller('ClusterController',
['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'EnvService', 'ClusterService',
'AppUtil',
function ($scope, $location, $window, $translate, toastr, AppService, EnvService, ClusterService,
AppUtil) {
var params = AppUtil.parseParams($location.$$url);
$scope.appId = params.appid;
$scope.step = 1;
$scope.submitBtnDisabled = false;
EnvService.find_all_envs().then(function (result) {
$scope.envs = [];
result.forEach(function (env) {
$scope.envs.push({ name: env, checked: false });
});
$(".apollo-container").removeClass("hidden");
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Cluster.LoadingEnvironmentError'));
});
$scope.clusterName = '';
$scope.switchChecked = function (env, $event) {
env.checked = !env.checked;
$event.stopPropagation();
};
$scope.toggleEnvCheckedStatus = function (env) {
env.checked = !env.checked;
};
$scope.create = function () {
var noEnvChecked = true;
$scope.envs.forEach(function (env) {
if (env.checked) {
noEnvChecked = false;
$scope.submitBtnDisabled = true;
ClusterService.create_cluster($scope.appId, env.name,
{
name: $scope.clusterName,
appId: $scope.appId
}).then(function (result) {
toastr.success(env.name, $translate.instant('Cluster.ClusterCreated'));
$scope.step = 2;
$scope.submitBtnDisabled = false;
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Cluster.ClusterCreateFailed'));
$scope.submitBtnDisabled = false;
})
}
});
if (noEnvChecked) {
toastr.warning($translate.instant('Cluster.PleaseChooseEnvironment'));
}
};
}]);
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
cluster_module.controller('ClusterController',
['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'EnvService', 'ClusterService',
'AppUtil',
function ($scope, $location, $window, $translate, toastr, AppService, EnvService, ClusterService,
AppUtil) {
var params = AppUtil.parseParams($location.$$url);
$scope.appId = params.appid;
$scope.step = 1;
$scope.submitBtnDisabled = false;
EnvService.find_all_envs().then(function (result) {
$scope.envs = [];
result.forEach(function (env) {
$scope.envs.push({ name: env, checked: false });
});
$(".apollo-container").removeClass("hidden");
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Cluster.LoadingEnvironmentError'));
});
$scope.clusterName = '';
$scope.switchChecked = function (env, $event) {
env.checked = !env.checked;
$event.stopPropagation();
};
$scope.toggleEnvCheckedStatus = function (env) {
env.checked = !env.checked;
};
$scope.create = function () {
var noEnvChecked = true;
$scope.envs.forEach(function (env) {
if (env.checked) {
noEnvChecked = false;
$scope.submitBtnDisabled = true;
ClusterService.create_cluster($scope.appId, env.name,
{
name: $scope.clusterName,
appId: $scope.appId
}).then(function (result) {
toastr.success(env.name, $translate.instant('Cluster.ClusterCreated'));
$scope.step = 2;
$scope.submitBtnDisabled = false;
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Cluster.ClusterCreateFailed'));
$scope.submitBtnDisabled = false;
})
}
});
if (noEnvChecked) {
toastr.warning($translate.instant('Cluster.PleaseChooseEnvironment'));
}
};
}]);
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/config/RefreshablePropertySource.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.config;
import org.springframework.core.env.MapPropertySource;
import java.util.Map;
public abstract class RefreshablePropertySource extends MapPropertySource {
public RefreshablePropertySource(String name, Map<String, Object> source) {
super(name, source);
}
@Override
public Object getProperty(String name) {
return this.source.get(name);
}
/**
* refresh property
*/
protected abstract void refresh();
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.config;
import org.springframework.core.env.MapPropertySource;
import java.util.Map;
public abstract class RefreshablePropertySource extends MapPropertySource {
public RefreshablePropertySource(String name, Map<String, Object> source) {
super(name, source);
}
@Override
public Object getProperty(String name) {
return this.source.get(name);
}
/**
* refresh property
*/
protected abstract void refresh();
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/resources/banner.txt | _ _ _
/ \ _ __ ___ | | | ___
/ _ \ | '_ \ / _ \| | |/ _ \
/ ___ \| |_) | (_) | | | (_) |
/_/ \_\ .__/ \___/|_|_|\___/
|_|
:: Spring Boot :: ${spring-boot.formatted-version}
| _ _ _
/ \ _ __ ___ | | | ___
/ _ \ | '_ \ / _ \| | |/ _ \
/ ___ \| |_) | (_) | | | (_) |
/_/ \_\ .__/ \___/|_|_|\___/
|_|
:: Spring Boot :: ${spring-boot.formatted-version}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./doc/images/create-cluster.png | PNG
IHDR }
iCCPICC Profile HT̤ZBޑN 5A: %A
(""X**EւX-
,
Xxyߜo|on= G(Le Hd\QLS 4 n%017=>EqxZ!ˋM K禠|3\( M:C8(Eh( YY=3'$
Q G =ZgfrQ
eS/@ eGnr>F))|eщfDÉ.Ld#%Y<
4) " tdkV+aA̒9fp;tnQsα8)e9g9IK$l Ǧ{q ߓ=9 !s[2Is$u8HsS)q9H!B/CRJ 3\%$`ɳDONd}; ~ X3@Flnl?>!邞X&[51b >{3g bkBTݷH|-F vt_(kZu HG Ж2gkгM@h=`vf
3ڱ ! \ RkFP 6Tԃ#h9p \}xx 0 A B4HR!C bAAP4 1AP%tj~NB+P?t Ơ)0 VuE0 v}x 9p>p|߁2@c!HH!RT#H'҃BWg C01{7&Ťac1zLf3bX;,Ǯ`˱VE ctq68o\$.Wۋkuqø < 7; | ?D OBA@# g7 D6ю@%CN
q$K%9BH
R3" L ے\r(2y"G1QSĔ:J> Jա:Sԭy')['AJMkiJ r7_etdd82edN LdddSdeeȎt<xrr5riMF6.F8.MOя{raYUCf$3Jw_,pY`˂7|TXPТpG"SC1Iqbc%RJ.*ZH_hp᱅ae 55ו'TTUT*UΫRe:&Q S9Ϊ`3]
渺XzFFFcM&K3NL[s\KM_kVm6K;A{vG ]p::
l &GzT='4j8}~^> !lhm7ko55U
S]3L&~&y&&i-Z}QϢVɦL əu570W߶ZxZlxcihkjU7kkuM *f]ںn=e._Iu.>xAÁpaБxqI݉TYә\E%kWSWkG7;un]{{GGO
x&q/+5^]Xo_l6 Ys[OD{`I{ `x RUK
n R0T/T & <!c{xi`Ģu"" Qڨe v.Yn`+V\Y2yUҫ8Gcãr8՜v̞qw%ϙWu-} W7#~,)<ߍ_蝸?cR@R]TrxrK
!%:@N$/4v|EP :jv?2 32?[}<K6Ku= {K Ϝ`ptU_q:uCcwoܐa$+~#icLJo
ԙ?MRc-|/^-2-*/Z-O?Mm[b]on`NKeKsJwh+c߹jrHĻ+*:vkkeB*ת={>}UrAm:5̚gV[n>BMCCrcI$n;p# [-EGQDr'OiAmm '}Nvwwjk)SUO!?3u6Dչsݫ 8 }/^y|KO]r*j5kmf[kuo
}}tyKٷYrn{OAɇ
<.w[O]0w | F}V\yè1ϱ^|U{^>_#GވL-~' R>L~,3sϗ/'WGS)SSB3c48 ޢ> ԬG hO<g. BrC訃3 h8B8 Y-r;jMʧޡoh 0ͧC֘>Ż @ IDATx\՞? t&uTHHH!% -,(7F7[/ۋ6jw|{lʽ.WJ&%]1 L40PG >33 3Oys>9y\vlۏN" czJH4Ȏ R`z *P|!hG[[+:ڿǏ?/>~d"pe!h8
^#왓2e
a"' (Ο?V<y&N (4nڤ;&,&LQ`H.P~ ʄZUa}{A@!#^#I3l
YQ?/'H|pk y+A@
PD R`!#%~%@H EzI! &2_"+0jQ^ ^q%xy^|3J-Fmo]8B#^adY 3 t83USsrD4
E ֹ.[ޞKH%(̻+ AUu
r wpؚqV%/EYE b"(FMQ +؏Yp1R Aj`4@YRǁ"n2^!PA8g"ys(§*)TDc^aTd,jC՞0GEcr@:p)NkCG0ĦȎ?&Xn6G#1[OB"ehb}^Xz/W%{L6,<GM| kѾg? 'mgo@Q|TY__!>nNtnQ7X0eP;{i?dgArdߠt/`^x8ccϕ mB7 Q.?_1+X< =+^6?F@l{K)=Vb3Ӂ *#额>C1]ڢ[4pC#.rM_`G˃7wvhcxB_ Plc(-Gdh ځ&ju +a<a|}~1:oW)HGoiz*#g?/Wy= 73g[T omӧ7O5֮;yO3$yl+ i V<4$ l,ZjHb' b`{ Vo
9VW~E6q>O (49sԾ-6[3ͪU]̪6궔GWb =k# jj+Q+,T}B1~?
z1icM\t aUV^s\`kɭ{pNEA٫kasң8z( =H^ WČĤذu{iHƕr1-CV g$~j2~ ZhJ+jGgBKiy^6}2 <w>@;WRT-(Q_=toGӅESd]ڄ.ŕ7*Wڴ5+}n-ڂ) H#CUH:Ц` H?۸#g*?¤%o%wDEKӷ'ݵq~_!|eKw(Pw?N'~O:<Nh8_r|=*?ډ]a:e"B9p~9`4 ,-!^ ȧZ.:)\iAǎj/ VJXf*za~E s"J2gIh}㚳0uUXy,vͧH&1M=_>lݝ HsX4
a<:? *r:6 iγZN₾CRw`FD8iT"\ ?#.@8D[
9ײ@+9!H2&2ȵ gO|VԲm`rY| +q)W?YwR#B2Ä<7KgU r_AMqX`zo0ýw* U<,9]&#)|-!^M(X|ÞS|Xrw d`F#;PJ MmX_;cvP>7i1G"3d{5cy`52c;mCmx&JT0lDȰqN81̼ y s`df /̱f,BXFؚ 4NuG4'7hƕVȔIr >ڈ/ d|W aS\o_/FI,=)eB_N:T`;G3, S17"oC984s?7 [B\vnŦ[0 }^6Ƃhl,H8,mO&w>~Gx /vT<l "?/G.s?qW~/n|G; {?0RK
WQ |)9j,Ikc`0aS Z*vS-LhK_ vw=Nяꏫj.'|oSNmJ N+,d֢O >kv!Gޤ@xe; oN:PQY|
$~m[|!hbLPKs k] jQ~%"+ `?UÌxCaA ZR A힣{È|0*D(ۺՊ G/[3(zȽ}OpH,{8ٛ M-ukz#擸*?I9f9+xt믛^ ~g<pbG, k5PQz/
Y2),.3+U0s#6b CZf,`
)TU 杰Oȉ۵Sx8> m-'|u_6Ctd, hYOyKGS)|TL0 fWfWh7Zn;F<'9߷_ PQA^t ,2Dc Lsgwd!K)BSt[[e2ܝ-G$&wIHjtyFI7m$S:l3d&ܳ
+ A暃 WGtZx82/'Ow Lj*IvLTG, pq
hAHMʕp,0@3ax]7&l"mޘP$ٹ}Sܑq <B>.abxWWKasz_oh.i+}}5smev_Q B×W
س _"}]lNX])?wq ;- U`nmbu\G `lETTTFBC5hߊ}w0j>qxV\uȸ UBݫdg_ Ua Ǖo}=7MRۮLj_Dc# J8;mͫ1oj*\I ӛR`z(
+ڏ\y#g;H:Ӊ\)0Ht" y% R`. D@
L'J"pA\"@"ЉN,DH D2D.oOۻuWQ@drmZNp_d~aHE@
_XD?R`"}%~)H__EzJ# ?.W")0~aHE@
_XD?R`"}%~)H__EzJ# ?.W")0~aHE@
_XD?R`"}%~)@ooP[jQlBy3%9\7ú yzx\b̞M@]M5N2f<>ފ
̀) 7FkGh
Fc(fϵ ˉ*j?xk hF;ݕte \#w[dDhlXf_0W׳U.6l}!{1k%+rH{n l윙Ϭŷ*X!/eoAI br3l5[^wȒxeBs
kzs'R Frh bq=, A֭(㎉{Ґ<Iy(msED;GNeز bҞM81Ʋ
+`\JTg.ߑ9
z
]XDj-*I"BF: gu#l
L4;ebufVM^%^N1EAët&
%n:bMX".Cn*$LvlFg*UKXV"31Q9 b;EHªL!D*vjyL ˔W˴{\%ڿLMADN5_Y. ܓH00RԊAo8wV ƕwGȰ$
(xfb4,f;*8~mِFzT|+WV~\KȈ((gYq *%Z'q'X?,G9\)`\Z DtvkPxvʾrB Y$yx# ZY8d"+FB
2 J4LX*PWbx0M7,iH_J-^Ƙ`rVQ)avlaQHi?W]Go *$ 7ģf(sɺaGC
*42 T# Idͻip#l<kQZ#Z'r?tvu9Po*n G!u9Ϋh> i98$9xJbM;7Qi4CU9Qb[0
N40g \P>4@%*z 32 (DfUQ ` w[HU8g9gcQ'7 :yw>OCʍ)&*N-4'<l2 Q#BϽjDATO7rQr%q^! WjΎGr 4Є(m
WPq}M<46a;IA Ev1 f6c611Nȉ5PJLukτO$P[`
CaP
)74d=Kc@ey^V]l>
nfvs"fh @GJyϕiȸ7&˯~''J 2ckj_(L͚p\{͜
4
&vN/'>by
%{ϧ*S%jZH{2֢orY0`چ %#%k˹ъmbnhUg\`>ҏ:1qզ9ʞrycFb.68s:¹Sa?Fb'}S4Iq9(Ԛ :Vjk<ΤY( abFDYPU:cDi8n ֬jqLJâif|;q bhaXY\?v'<6F>͍ma]ZRC뇕z' OÄ6,PNUU^%.؆.\cDW(~s<%bw s 7U4XQULqb|+WBnTf' U(C\
"~81Xx&GDRe^&z#Q[>F<E
sgѽ^/ǯ* )%Ejʱ*,{ ڎ16x|U|8] 2 0S P &j'"h?w!FT=&i6Z 1BýΑpxjG0ӵ)X~A6\9^E#zT69PKa j=ϝͅ 0t5hCe l|![RR=z'KzuyQZJ4 Oׄ-HkEޡ=DxlQh19Zږ9_=b-in|42~j9+m3W)p
+DkL\Q.;sGQ ~S"**Ҩ6"9 ㈘t:8qVil =P Y[Vu60v4a%T3 ЈpMX< aJ889\t{>Sp, rC#0z&wm4Lڼ3_eU)l&.ŗb<J\~]t3ҩk> BϻTU0
X%P
B`
m*?T&RC_ڿy]Z]dBGZۤ\7rz ZIK$D$G;kJe B@
joY>" )0em>(.yK^6me $&hjmYE@d
L|! fπ" f@ᕉ4HN髲Z SRqmX
h$ w"8ǁbn.G(m\$,0I۞OvVEY O]wmǗ!{-D SbûJQXVƊq_sǧ d" jY`HsI$ a":h6eE$eOS,ZT"` 2ΆE!i
] Yqwݕj;{M-M#ZQMN.ս#t (a~VNުw 'W½d=PKQ`oەU 9dbbϽӘb[_$#w7Mʀ%DO
aOʼ^AαQ!I!F/WL$3 QId-Cq!PQH aT`ElBwu(\W{8R% ch(;_ilEA;?Yޓ1_zOl_T/ S8W{p4) FVQt$2"@8Ge'.dr"#gui U$LְR{4#PԑݞĤQk4ɞ|n)&N{ְ|
$ft} }"y
PbGV!=[X`ߘ/m#:$znpMPj5Z*wYM\)aݕt]2/
Ɖ 8RCSu6"N4kvt*,2@oA*vJe- $S~gJ6:gv
65 O ~fҘF4g\!r5C;Q~㢓"AMu fs1̗幍ug9
X}~ )*2Fd}`^u-8:rɫ0W=N= kWl5<SwN"ǞcV,b \g@:>3b |CL̹Jq @<v*J<|\#quQ
k=Qqd ZVnlqb@0_R]s` ˤ85\R9U<" ַy<'L
t }e.8ME]%{(yftV7yi `| V<tVmؚ}t&+/: +׳y*@.3 Z4R "GK8PJ#[8OsՋµ,r# VU"^q@#t^.'~#0mCe2aX}ꉒ>ku
FehX o %Z\FhH 4:حoQY&5aH_ pX[-63pVjFY!:A\{/oCYq>vWaOQUèi ) DɈ!}Pl Vph/~qƥH`k?=~3I4٦k$i!aM-ƒ5V\L5m`P}L1_6 HL[%l=S'Y7Y B ĭQyu&]7PXҿ c9"
71xF>gtbm*Gdݗ[&(hr*0{9Rr46`Fj(#zw4 Oĺ/ w6γ!X,bFDQDZ 5UzCafgI\w$@=ZUi 4Ofd E@YM*[5-SY^Bm{̸>r1Db.V ޛ3rt ԙhEA)X`>ۄ#00Ձo :=y-:ZϞ %bkf I53bnIc -YJso踛H ^Ĉ&DYoF[%TyG\6rE!b$cU
Y~DqevzZ..:/m2a/۾u+9 qQ6] . AR% *H\C[Jy4ד HCV#
̳X ?
V0㛝4s|0Ε^g2 PRpO[\}6X%뇼T.#+ڋcs:*RH>]wȼA@"ԭ ɵuQ] g67 ޓ
VS9D n ]n'\~.? taeP(FGw3Qr5~. y4F ks)f!f[߲qR˥cR+,D`3m K03Ku3m K03Ku6TÇ"MۣG$C@woY? 6% B !2ᇀfC^k߬G35 N!ۦs}U5qcb8߈PhE n "-@A4rYf_\SlK^eGV炗>SoBnmG~|H1w$8`e/w9S`b3R_q^8Pi1ZS]8UD'p# S `G6̸Ľ͙f+
w ZXz͈&P@4vvQz,AlTb r .JrF9E1ֵ/_p&on31FMYn]%m oő3Gi "G@`@꩜֓`-~:
.ޓвLx1[S5̱wa "6+{tۋȾB~ Yrݯe 0 1 (jᾒtۀ7Q4R3LFp Q98N]̜bi(vNߍ
챡dvaI )찻%D
EHD~ eB-(+(B3y#I}#X $mXtxA 9%M9M/[w\ <!?I` ,+\ϻ$=\\eͯxSHۜ;a0]~RncBv.^(}u|S U߸gJNv`!9
p }GXʀ) X_G䛾 diTt5L
VawnvJ@
2nۆE+'M:]i/F @-eS#E.Zy"e2)z<:^1y`WqWQiʎ&~]*ψ6-!E"HN[$3"'w9E%O i06E- Ȳ\^k¢ 3*H[$̥F$(b`ZQnm]Jl
2̛YJap!IX%;I6˰\ւ,HgnZK &141`G0k6L0V u
&G%#Ѥ,z bsg]BjđPᐤrJ6Z(,(srDoߋG}h le*x*6Km8:܅92F7!ۙV {7쪱"Gh<ek2E v0Am:tBv^% %-Xr<2m(^_<Y+X)=ь
ҵ'`U(Ǯ8r,Ab_y(Vˊ>"u&' Qj`7FbEY -\\_|Qcr(y'.8zpհJ,$p1}#XbDX#p 舢/HAB ;wVҕ l4HUo_b5 GF,waE ;~Gr WX:1NCX弧`{9ɿ5]< ݨjK}3#~F?pKDzU-BXǙ*l|ׂUbdь\9_zϣ]=<. WF r>
fxWoT_sU+! nSXGvs3ϳ,$2+s9i
3FmOYMdm*Ljӹ1YVƧ"k|ב{`3P[Pd8
g;N|ӐαFC@ ]9-?jF!}#іO_½˒*6fJḍ4] yKb⥗5h">e+ KyTF{z N{!
,+W%kGiV/qTnڌvW8!]K 5 B6$Ӟ*fA:i`=ow!r }X1;|:-O h ҕ+X^-; E dn\R\o*ip,YyBcBisK>|$-=
J# 6~\J/47&?͕z9r'^[́Ȁs63s ;4#*S*WF#Ȋ8bL?0(ׄק)#ҰyhSL a|Vkq t J6T!H Кϓk&d(q9 TgB`;Qy'5Rn1 \ ] 5 v|9E{τCv>N~
&O՞1
c "Q~xѨMROF;.",nEP<g4{ģpM<fr),=Nj $.]-k; eLZ"+
.x# f Y^! Wp )0*VR(? ۩o.$KFrYyd" M!_f=3Lx3ˬ C'0B6ໃ 6-k?gG[yXf*u]8wg]?N"p ~qסF>WQ5Un&\ Ҭ9+
}n?4֢Z~ӧ|qsby%9C 0vsa%Y!"22Øo+2GuKcl;Zs$Fm?w[q=K9:2DA
^-#vu$2QI fP[V%%y&sgS !rc'SWSLfӖNB^ܮ;tv!0Crvm%^ fԒ-Š :TFvx8i֯H TF*,{n " ;ꎊH
:@l{B* Ly(dz6T#7Q j H^=A Kوzn-Ftqk TT٤tؽo XyT< z{3
w7I`8l(y}ʾ( aqRy G
` AÒ N}\ecBKf`!M"48 (dW'':1eXG@һ: b"bOzҠZ5X L~jdyMB;A љ~N@lnՄ%~IV,@ZmeTGa# y8
&'Eӎm؛<`Dz&y0bY $ dfP 8jt X\2eB _Ѩ-`Za`zdp52 KKuR
fY$2o E G3Җ!h9/y!'ub/A=!hx 1,ކYߨb2,*)&}iw@=fJkX,I'Q~}
#k2D aufˇ
+˜&_N}@wdƉ+ \һƮ p.ײsNص3Ofw4LfX>V4O(D\2Jϫ\ިk53Gzo$
;3T#1YvԸE4e1vxh X U.h4j༫1"!j14;Ǔu 藼cIT*P8d4AS! 7' v WXS =)d'Cy:(z"| 3R3z$ڸ@c|Lxx{!|c&hO!#VD}c+"3P]^[1wE;$ϱZMerᜋҀX^|tM&8+sy& H`.rsT=qPT 2w lxc%zWXr7'<4|uyO1W[xV |sԊ/|'ct41]4#s *%<k$G(Xlx5
زeTP1AZ3wNڷ-Fh$Kt!< ?kF׃Ij
mkenf
Yq=6c:+)IH+et
ѾśE\Q&F"4!,7gV_H0kZN3D, ͣ4 lCqM5ˠy7XKRD\K+Y 6>1c='[iz˴Nl !BhCZy6 <noNje!қw$ϻ,MDAE!w;K#mJ \:/JQH1t~ nCw2,L J8;WE; q~=/
ES+&N]$9?["T'wR̹P|a?Z:#nsI8? Za91 ]T]Hc=nYOڭ_Sh"d=. %)#̘ HE!NSLz9!(ݿ;
Λ<Ê$ϟʢbרȅ+7]$9(<6Pi|=C`5Lϊ%CeE Wvi
QP@!Н3Pt- ̠
[e%D@
^ `ɠ)0Hz^%JHXI+b{)42F@.+DI6`ˬ?R` "R`lG` Ư]r:XQ(z7F&;E,%/ᦱ};9 I'!]a 3 P 6m ʀ 2 Y,Xmo.S|Z]̢$IbSF+sG<UrGK^` !^wԾ9$0,Df0/Yu9TB5QF\ s}Ko-$-Dy^nuNۮJowfB"%/02<o <5 Q
8#ڏziBގ$pKn}1͵ሞEܹ& hn@ÌhXf[}pY*8mmP:{ zړdC,faԄ M!x9^.Č.hߛd9%+.ź| %6^oAVWJT7R\< 9rXOhSGPrN<.`EUIMQzrX N3#06ݣSRKSDU
rwX SpRȠibiHmUD~+U,S 7ߞJp9r49syf<g0s?x4'CZ|mn mz.WbRaCdy;ujXM3P?#5I}
@ĭ@c,œ+;t*,h2[ѦLf ]7}'r<4]"μ 39?A3n @휵~vk*~ET*#dmDю*m4ӑFJZ4~Ym|(H uS,;NWpߖr/# (xi^wE 1}'[v{,XêgR닼F8^,<3ǝ/+8̶SU[$iI:ab
rWe*)0&<M ]hC|X]ڗrPuN[d.F TSB-sN7=<Ol G[kQH^:)H^
)*K< 0 7"ُt!yt&2?. g"Xf{0]~φ"cJȧUz5G#:Clu0ZD$'-¤D mڱ-!3o`' SܕiK^:lX?z
8^m$aUۋ]@ :3ႰW8r+qXHs/"^AzxG)L"/ rS=kJj58Z XA('z39<E+SΌZ<ԙ~1/t }%|3+($et\gĒXꨉ20)|]K?3A &CKq6 yuNOq 뷻L2>WI~6jju>
#UｋKίeX VjMF S=Fv*j 0\~+=$ݙLd{4riM*.σG'<nis
ӑX:OPp6sZb1}:pgɒ Yq֠weLGBT^iZDGՙKR@5pgoFR *gmSkyH併09Jk T2j%
Z#32gaé 41!WY0hN]킿dYիȔǁ2r5!\s%Vxm 4=$A Ƹ.yvCս()X蛳+@l#bF-7h605YN1L˵KxuKBdva"0ZY5b 0lw"fT#=LIrQd,O#UI s
lM2P_EoPV6"td= 8=#84j4ﮤ Ǽ*Wc ͟J}6m _g#/AIZ4-״F6)a<IlbHئMu/?-@m$ւx Uj~rQ̝E YQ@7qs+P"ZEEe9ӘnNxnk!*w
Y
J$<y;m
'Ģ-ڝUkl660w2.5w+nU;QKօZr
'1ۂ
7`v=8 !L&A{kZHegKL4lcIzoeXe(sP8<v<<_Զp 4"l *IDATX_-]ݏ
4ʶoN-\=G2w Wew FkZ?p֢ԺzLZRXpڕ!ּd[:/ 3J<X"-\ @:V،>ano
¥SɳP&Kiiq"MnGPUCu}a+W
m>$
ޖ3rʟF}U
L믾*4ݡr)W Xf;s\ m#cɉG ktd._*K]큏!o9
r9cˀh ' .,tó/4ޠ58O!hF"=)rJ;9*_n[3\% G]!*%"o !JXLaI6@ÌvXk9wB q2! tlM0rS+]AFA݇eMQ
go_L=Ջ.HFR`FW{)0}PF ]H]-kG@}t! -b%U#H
3^֮πF6R`Fv3R`PF@
n_Y~F@
L?*H+kHg@er#)0#}e)0 Lnd# fd]?#%0]vΟwRsF29p@@!(d"lm%tQB9
kɓ'qYi!&G$B~/@ZM? ~@w8otр˩Y0v_~_qiH ̈r.3'cƌ%n7.vH7/PFP@ Ih@=
u)0}EP UHU-+WAT! fT5l_WeQQܲ}E@
L_GR`FUs)0}EP UHU-+WAT! fT5l_WeQQܲ}E@
L_GR`FUs.;.U_jdrr_ b0Y!,gN)S<JIFEp<y'M
(4^#4 &d %nrp{;d2y^xI \^KF 9FY*?Ř@d %}A@
L_ГqG R`F]
)0}AO uHuM.+=w! f5p_dQQ}A@
L_ГqG R`F]
A h>yϞKye\"yOK mjA{%ec.Ct4 )'O[wCȺ?Ie]JE 9}ޥ~Bie&"Cgg[˯|*58&\.7uOz\\tt8pQtP|-vϵi~BXr6lg{j?2x_{)7Q+ <~<q,w9;_{gd;==x^8uc9BTbܡzxǎ: hEw ¹o&MpFp{ʋDo; ¬[5wf?S#F'̹sm\a [̷݃JQzx@0 Td<p= wq_CJ(OawXv
(9F8 'AL:{>=} h;_w#3LE/gu@ q)Gؔ&34vLNx*!6ʁC1u^"n=ct$^TT 2cRg̝9HM CӞ9; ~z gYx/ޠ@O= (dGكSxf2R#9(ċoGOcQ zI& ȜoF;6۱Iy / L0}T >-eส'/ǍP ?v=+, =_)$p, өY3Gmӝś[åt~珢]SQZ Js2L|xz+xjSsؚOnny ůR]h9l&rv^Wq4D`\ <xov 7h0o"e$8<Jp /ن@|<_|gq4s"bϧ@4t #tbgts؏'X:^q2vt[_i
nj KL_D#VnD!&4|=)n_cB~%V&x0{
#"Pn4 wa k"(n1s̪C|<E_=f&ޏkw"mcϿzWL@
/wDy\
cq'by !
<=wx bt4wE~E0MI+I
JzހG1{lV Zth\UkANk=NA孈5pŬ4NS8\+lAEXx]&9Ԅ݇x@6$ZL0]Us߷B`ƍ
J n F;r cVrVfg`܃"4| Q^
T u;|q.Df,cqZB%&I!P&<mV54Ĺ?Ѕ, Bî5 uϗȋAG_]|
|]r9fϼJv|߁# =` T8Zlڿ F_9eP^^JO1ir+4Sz)86?{ .$gDz Mc
|m"c\Ż zID"V0"qj;zlkB?㟷' {0ёGL.\]g3&:oN'zh
T>S14'cRW>95 v
OT]Qq
kkj4)0 Ǟ<nUz # 4mn rrE8e% _ erKi\:ج")0w787?f]~ E|77[_ !o]qLf>n^w|MJW*PICwXXT(qUFtz \_a
@xR(G)0fUzu`>fѾ5q#&$ ;p5)jd.O:aw;(Dž ywNOS*:WɞU[hh)\ee @O3Ž Lkei9.|[f$"}G>\^Dҷ ݷ
?q!>qtWRPKC|˃xjR1^|k7^grnDg1⋃AlG03\8Пȿ+f!t̺i>~ ng0z;̟,Fَ97Aq0LwkRD er 5m$A"ӔK+\t}K1DWyL|
K@7a&o
cA7Nn &ެK7t D> x.J` OZ.Nq {yP;?wϯ{f+s
Μms'ZuI{%>j}/ؿҕ|*>N"p)!P__!~tQF|':)0Z|-R/Y f@`TԖ 2ёڲ^U&:R3R[Vk@3 DG*R`Fjz
R`VHE@
HmYYA@
̀* H-+5 HXe#. I$"0=@?)+t4I62Xb3H@lFR`FF;Z R` h@ˤ d. rw% U aPxȴ{_<FX/x, ;e4J'Kqq̌W_sqGyh:M2G毥rπs8]Dmݾ c9_ZX<On ?i7?8KQg6?ZW9ҠUey/1$7ٞ^ޝ<a@
L$x3{;B ^e u :rN$]]P _϶++ӯ$#)0#]e)0Lvd"^%˿O\Yx$ 0;>ڟ7ߞDIy5 r9;,̏?z 3P5IF "0.ؽ5qC0~y-7=c?^{
5> !\ yk^k*N|-v zl^y*vk &-h9@G-sn ڃ'q>}Mg-Hځ fMKc%0=6
8|\Eئ AU5ABb[[f2YJ|Vi++8Q,B-Mas=- 7 \QfW> ,m4uQ+ >, ع% OgS&AֲTh2uv~r 3apSAN4N!3Mqg~^xK3bPc%Swd;**E+s:s?o返<%g30>ھ
EQ(z,XB{ӄ*^<LOgNO9S
7DZp 1nU֡_ ; v`
STc;?r .(v濎XtvVjQPW> ;X9V?9Y)[&Ni, n?=I4OLEjJsQAĦ#`1*v~=kz6j " lp#}oQV D50_ !:]bľ
V\p
~F, Hgr
l2ǗLo/J`{t*V[n{+eƹV>_Sv|5 Z Cx`7~2w7N%O`t'YH ̛c4 B59; 3?mE˿ǞCQzD=\U.+Zq-sh`Q@mW GLuѠ FOci RpA7\iAEFM\`_ `SPp'\Wޭa] ?iw?E_@i 8zK2RbݝKef1M@dt-6S,_si^jE%{0+9 ]4q^3<y6@~H|
¯;3{c=]`xAn((*fNh-قWjE5ix*s> caSh'x,'K iaw$4 U)
x&פx4I"<j)=1!UPo7졕#fnh(][p]iGi| E]`Pp "T$n-yuwQ5λ]!|[qˣ3O ;s;ޠ-wς_9Ք}]UlY
rM:^8ֶsUka2&2'TsQ<
%xaڸ
㸁OQ=TQ.q$:.v? Q3M+j{+Rw>a>p.x lg㍷B_d@ʧ{vaװ/+S){\|g"/?- Ňut 1;9-
+ 61Bj?=nR Tc1# cdnU<: -
8ʄ8!PN|]V)N_1b }{2vt-]mct3aʩpwkQ Ů bjԠ?|h/[E=tʡ\E(:q B;ND"=RŷMa/\cPpQWrI6q9z7c;Ώu'%~|B S
6UsWB&mhUM2-Je) pfIy2.;%
L=0 u!08{Զؠsn+pإ o,''\V
y UXo+i)'q_Ħ(\`q3xM>ʪa9}'&8@Nޡi"' >ijAujWr) +0ҍA5$[Qn ؑӏK0؞!NJRB#"e?څD , ̋|2` :/%Lo&;ʽep&c)<x5贈$DAp ɠX۪bc7zo DM*)
a|*3O " Ӻ KۀDmix
&ؐ nSI#x9 L{ 9m MP1<:5yi&4A*Q >!Ø"զ<' ܼp X V2C\0Ô5LD Eͧ
ؖ9s ~o>VY^@dyJPە:7cY+JIK?
̓a N D5en y%Ϧj__~g_rG) ,˩$_,Q{
c]r<FĒJU<gq<u3 h G`&03g & E>aIV蝌w|B:]=ݤpQ7 7K< Yݴy(ك?ƚ_ z65t3.U$# F ~蹷dd 3@
q"?kM ODP->ebS&qKS,Eo9_%!0?)P')PtIvx} @:֝s Æ zhR
Xnfdo#w8a>\' 'ww8a>\' }=' G`~楗^$#JXHipl,> y+NU2|A&38VV 0d03 'Lfp䭬8aVDafN[Y%p¬ 0JY%͇8a2#oe J&33pdG*A`? Zr` E)go^#wEt3F~ߢ?L?aG` ,曇38+ e1ɲ 0#qDbfEhBn^"+qT?UÑqvKXQp Fq[O}踹 6y1ro5(+/cL.U0>hK}xZ'<3V.a+բI>cu85sHy qvMKa S/ # ^AX&7Y % -]iJDym=vFj)3*Du8Jŀwʐ'ΆRs3#*뼐 G<
ɀ_JT"QXoE'Ռ2d
Z"b0{qJkP_D Y&>FZ"o`쀧 פ1"pC5bl%jrg"-zkt"|ؔVH}[i e"^Ef+&o,DK1\ݣ#ǂj/ m܅3 B`kFUp=h`az9 G~U;Db{ D&Q- Қ?#4W
>B2:6?C+n~Յ<0S%.c sa15WܒgYXxv4L
'7t fH3ض߯Q>'R/&mOh=[~4
Au f_cǾZXPlp@\e%Sb)
#2SMi[( P tp|sR$
*0#
CjˠLA^ q f9ÈqӂmRZ덪ל[7 z5G͐#(e(LpADZ%qȗƼS%Zaxy2 #DݼV|k`^'ѯjmdvFnmE[R\sV ͊:Y!%Mɯ$ħLr|uyŧF_2D&Z4[,X/0~S%@V 9[5c|h
1tˠQJԌeRfE i%$3<Xʷ<(?Xb)$j ފ
cGWp
\Ly2 #Kt
~Pv9xq aZдh_/C^*ke1ҨkKݚ*xVL#,HZP wPwV jkQE㨪!j?{U8ס8|UI c37jPWiI&U }^H-h)A,,ÑNt oD{}DӔ}vm2JK1P#W>dF {i0 8m$D2@bZ)mZOiq_k}O&T<
eLeZƌ J1'B
W 0S;0< +Edr#*je?ZO`1 MDD+3ҭ:ZGZW@I4B';zwL K#_R="^S -z vz܅D\Xf
|lrp4c0z(?? \?<+T;Ña* = 7uKA85!t}jN&d$(0g>F 7Lj.<H e*EedZЖM06y?ގbL.ogX 1!s04ZӃRkOM()@3ΙTF X z6ȦǦwٰq03Md}03,u;b?(~]AGl.ZP, 4k /#'Dz09--vմ+ y9$R ̓Q !_|&?c {p$G X#@4\$?c8L[=8=}P.*㴁4#(i&:H|O㐶iKCvh
k֊ތ"Bq4 xU*䴓Ow;ӎ:NKal?coe৴cFd8PDͧhg_Ga
f "sJU`qnfU~'f .QxP%ihbd%(BZi.Q3wN3UՅO=
D߭L>d, &T`YRn2G{d Sua!W{,r=5ъYewnas0QFc1q_a뛌
Z#zM-O& P9{ 1鿩PdB;{ԢRVJK=XNN HAW7i"E4튄 u;2mEcoWr IҒc!@V ]kMQ.Blu.0u34ͭ_D%cЃV*0CNц& ҽ*iӋ\?e' ԈN `TXB3D]p ;ʝZO
&')l8TGkoyZäaxO@gǾD&~۠FŒ4&y$v4}EE]=_)|1%n
-2xw&h Mh&:L~x&텷Ԉ&lAœ h5/nrz7յ/OC; b,kX3Ø;i"FN}":E7#|m#wlQ8v&U6ET?m,),T6My*qjwk9rد60+0\
I -L
K {"Eg+ C&Z +% RU j]2&dfW# p]D\0-̢߫Ev<{)
"v&1yNKb^O0 /m<;e"9s?Y0=5TVZ(ƳdHr+-jDmɍ ,B`Y|, #,,yl yNDq1N.NDq1N.NDq1N.NDq1N.NDq1N.NDq1N.NDq19_ c6̏_$&Y ~,NEċpp$G"YHG 'L ~,NEċp?]zuO IENDB` | PNG
IHDR }
iCCPICC Profile HT̤ZBޑN 5A: %A
(""X**EւX-
,
Xxyߜo|on= G(Le Hd\QLS 4 n%017=>EqxZ!ˋM K禠|3\( M:C8(Eh( YY=3'$
Q G =ZgfrQ
eS/@ eGnr>F))|eщfDÉ.Ld#%Y<
4) " tdkV+aA̒9fp;tnQsα8)e9g9IK$l Ǧ{q ߓ=9 !s[2Is$u8HsS)q9H!B/CRJ 3\%$`ɳDONd}; ~ X3@Flnl?>!邞X&[51b >{3g bkBTݷH|-F vt_(kZu HG Ж2gkгM@h=`vf
3ڱ ! \ RkFP 6Tԃ#h9p \}xx 0 A B4HR!C bAAP4 1AP%tj~NB+P?t Ơ)0 VuE0 v}x 9p>p|߁2@c!HH!RT#H'҃BWg C01{7&Ťac1zLf3bX;,Ǯ`˱VE ctq68o\$.Wۋkuqø < 7; | ?D OBA@# g7 D6ю@%CN
q$K%9BH
R3" L ے\r(2y"G1QSĔ:J> Jա:Sԭy')['AJMkiJ r7_etdd82edN LdddSdeeȎt<xrr5riMF6.F8.MOя{raYUCf$3Jw_,pY`˂7|TXPТpG"SC1Iqbc%RJ.*ZH_hp᱅ae 55ו'TTUT*UΫRe:&Q S9Ϊ`3]
渺XzFFFcM&K3NL[s\KM_kVm6K;A{vG ]p::
l &GzT='4j8}~^> !lhm7ko55U
S]3L&~&y&&i-Z}QϢVɦL əu570W߶ZxZlxcihkjU7kkuM *f]ںn=e._Iu.>xAÁpaБxqI݉TYә\E%kWSWkG7;un]{{GGO
x&q/+5^]Xo_l6 Ys[OD{`I{ `x RUK
n R0T/T & <!c{xi`Ģu"" Qڨe v.Yn`+V\Y2yUҫ8Gcãr8՜v̞qw%ϙWu-} W7#~,)<ߍ_蝸?cR@R]TrxrK
!%:@N$/4v|EP :jv?2 32?[}<K6Ku= {K Ϝ`ptU_q:uCcwoܐa$+~#icLJo
ԙ?MRc-|/^-2-*/Z-O?Mm[b]on`NKeKsJwh+c߹jrHĻ+*:vkkeB*ת={>}UrAm:5̚gV[n>BMCCrcI$n;p# [-EGQDr'OiAmm '}Nvwwjk)SUO!?3u6Dչsݫ 8 }/^y|KO]r*j5kmf[kuo
}}tyKٷYrn{OAɇ
<.w[O]0w | F}V\yè1ϱ^|U{^>_#GވL-~' R>L~,3sϗ/'WGS)SSB3c48 ޢ> ԬG hO<g. BrC訃3 h8B8 Y-r;jMʧޡoh 0ͧC֘>Ż @ IDATx\՞? t&uTHHH!% -,(7F7[/ۋ6jw|{lʽ.WJ&%]1 L40PG >33 3Oys>9y\vlۏN" czJH4Ȏ R`z *P|!hG[[+:ڿǏ?/>~d"pe!h8
^#왓2e
a"' (Ο?V<y&N (4nڤ;&,&LQ`H.P~ ʄZUa}{A@!#^#I3l
YQ?/'H|pk y+A@
PD R`!#%~%@H EzI! &2_"+0jQ^ ^q%xy^|3J-Fmo]8B#^adY 3 t83USsrD4
E ֹ.[ޞKH%(̻+ AUu
r wpؚqV%/EYE b"(FMQ +؏Yp1R Aj`4@YRǁ"n2^!PA8g"ys(§*)TDc^aTd,jC՞0GEcr@:p)NkCG0ĦȎ?&Xn6G#1[OB"ehb}^Xz/W%{L6,<GM| kѾg? 'mgo@Q|TY__!>nNtnQ7X0eP;{i?dgArdߠt/`^x8ccϕ mB7 Q.?_1+X< =+^6?F@l{K)=Vb3Ӂ *#额>C1]ڢ[4pC#.rM_`G˃7wvhcxB_ Plc(-Gdh ځ&ju +a<a|}~1:oW)HGoiz*#g?/Wy= 73g[T omӧ7O5֮;yO3$yl+ i V<4$ l,ZjHb' b`{ Vo
9VW~E6q>O (49sԾ-6[3ͪU]̪6궔GWb =k# jj+Q+,T}B1~?
z1icM\t aUV^s\`kɭ{pNEA٫kasң8z( =H^ WČĤذu{iHƕr1-CV g$~j2~ ZhJ+jGgBKiy^6}2 <w>@;WRT-(Q_=toGӅESd]ڄ.ŕ7*Wڴ5+}n-ڂ) H#CUH:Ц` H?۸#g*?¤%o%wDEKӷ'ݵq~_!|eKw(Pw?N'~O:<Nh8_r|=*?ډ]a:e"B9p~9`4 ,-!^ ȧZ.:)\iAǎj/ VJXf*za~E s"J2gIh}㚳0uUXy,vͧH&1M=_>lݝ HsX4
a<:? *r:6 iγZN₾CRw`FD8iT"\ ?#.@8D[
9ײ@+9!H2&2ȵ gO|VԲm`rY| +q)W?YwR#B2Ä<7KgU r_AMqX`zo0ýw* U<,9]&#)|-!^M(X|ÞS|Xrw d`F#;PJ MmX_;cvP>7i1G"3d{5cy`52c;mCmx&JT0lDȰqN81̼ y s`df /̱f,BXFؚ 4NuG4'7hƕVȔIr >ڈ/ d|W aS\o_/FI,=)eB_N:T`;G3, S17"oC984s?7 [B\vnŦ[0 }^6Ƃhl,H8,mO&w>~Gx /vT<l "?/G.s?qW~/n|G; {?0RK
WQ |)9j,Ikc`0aS Z*vS-LhK_ vw=Nяꏫj.'|oSNmJ N+,d֢O >kv!Gޤ@xe; oN:PQY|
$~m[|!hbLPKs k] jQ~%"+ `?UÌxCaA ZR A힣{È|0*D(ۺՊ G/[3(zȽ}OpH,{8ٛ M-ukz#擸*?I9f9+xt믛^ ~g<pbG, k5PQz/
Y2),.3+U0s#6b CZf,`
)TU 杰Oȉ۵Sx8> m-'|u_6Ctd, hYOyKGS)|TL0 fWfWh7Zn;F<'9߷_ PQA^t ,2Dc Lsgwd!K)BSt[[e2ܝ-G$&wIHjtyFI7m$S:l3d&ܳ
+ A暃 WGtZx82/'Ow Lj*IvLTG, pq
hAHMʕp,0@3ax]7&l"mޘP$ٹ}Sܑq <B>.abxWWKasz_oh.i+}}5smev_Q B×W
س _"}]lNX])?wq ;- U`nmbu\G `lETTTFBC5hߊ}w0j>qxV\uȸ UBݫdg_ Ua Ǖo}=7MRۮLj_Dc# J8;mͫ1oj*\I ӛR`z(
+ڏ\y#g;H:Ӊ\)0Ht" y% R`. D@
L'J"pA\"@"ЉN,DH D2D.oOۻuWQ@drmZNp_d~aHE@
_XD?R`"}%~)H__EzJ# ?.W")0~aHE@
_XD?R`"}%~)H__EzJ# ?.W")0~aHE@
_XD?R`"}%~)@ooP[jQlBy3%9\7ú yzx\b̞M@]M5N2f<>ފ
̀) 7FkGh
Fc(fϵ ˉ*j?xk hF;ݕte \#w[dDhlXf_0W׳U.6l}!{1k%+rH{n l윙Ϭŷ*X!/eoAI br3l5[^wȒxeBs
kzs'R Frh bq=, A֭(㎉{Ґ<Iy(msED;GNeز bҞM81Ʋ
+`\JTg.ߑ9
z
]XDj-*I"BF: gu#l
L4;ebufVM^%^N1EAët&
%n:bMX".Cn*$LvlFg*UKXV"31Q9 b;EHªL!D*vjyL ˔W˴{\%ڿLMADN5_Y. ܓH00RԊAo8wV ƕwGȰ$
(xfb4,f;*8~mِFzT|+WV~\KȈ((gYq *%Z'q'X?,G9\)`\Z DtvkPxvʾrB Y$yx# ZY8d"+FB
2 J4LX*PWbx0M7,iH_J-^Ƙ`rVQ)avlaQHi?W]Go *$ 7ģf(sɺaGC
*42 T# Idͻip#l<kQZ#Z'r?tvu9Po*n G!u9Ϋh> i98$9xJbM;7Qi4CU9Qb[0
N40g \P>4@%*z 32 (DfUQ ` w[HU8g9gcQ'7 :yw>OCʍ)&*N-4'<l2 Q#BϽjDATO7rQr%q^! WjΎGr 4Є(m
WPq}M<46a;IA Ev1 f6c611Nȉ5PJLukτO$P[`
CaP
)74d=Kc@ey^V]l>
nfvs"fh @GJyϕiȸ7&˯~''J 2ckj_(L͚p\{͜
4
&vN/'>by
%{ϧ*S%jZH{2֢orY0`چ %#%k˹ъmbnhUg\`>ҏ:1qզ9ʞrycFb.68s:¹Sa?Fb'}S4Iq9(Ԛ :Vjk<ΤY( abFDYPU:cDi8n ֬jqLJâif|;q bhaXY\?v'<6F>͍ma]ZRC뇕z' OÄ6,PNUU^%.؆.\cDW(~s<%bw s 7U4XQULqb|+WBnTf' U(C\
"~81Xx&GDRe^&z#Q[>F<E
sgѽ^/ǯ* )%Ejʱ*,{ ڎ16x|U|8] 2 0S P &j'"h?w!FT=&i6Z 1BýΑpxjG0ӵ)X~A6\9^E#zT69PKa j=ϝͅ 0t5hCe l|![RR=z'KzuyQZJ4 Oׄ-HkEޡ=DxlQh19Zږ9_=b-in|42~j9+m3W)p
+DkL\Q.;sGQ ~S"**Ҩ6"9 ㈘t:8qVil =P Y[Vu60v4a%T3 ЈpMX< aJ889\t{>Sp, rC#0z&wm4Lڼ3_eU)l&.ŗb<J\~]t3ҩk> BϻTU0
X%P
B`
m*?T&RC_ڿy]Z]dBGZۤ\7rz ZIK$D$G;kJe B@
joY>" )0em>(.yK^6me $&hjmYE@d
L|! fπ" f@ᕉ4HN髲Z SRqmX
h$ w"8ǁbn.G(m\$,0I۞OvVEY O]wmǗ!{-D SbûJQXVƊq_sǧ d" jY`HsI$ a":h6eE$eOS,ZT"` 2ΆE!i
] Yqwݕj;{M-M#ZQMN.ս#t (a~VNުw 'W½d=PKQ`oەU 9dbbϽӘb[_$#w7Mʀ%DO
aOʼ^AαQ!I!F/WL$3 QId-Cq!PQH aT`ElBwu(\W{8R% ch(;_ilEA;?Yޓ1_zOl_T/ S8W{p4) FVQt$2"@8Ge'.dr"#gui U$LְR{4#PԑݞĤQk4ɞ|n)&N{ְ|
$ft} }"y
PbGV!=[X`ߘ/m#:$znpMPj5Z*wYM\)aݕt]2/
Ɖ 8RCSu6"N4kvt*,2@oA*vJe- $S~gJ6:gv
65 O ~fҘF4g\!r5C;Q~㢓"AMu fs1̗幍ug9
X}~ )*2Fd}`^u-8:rɫ0W=N= kWl5<SwN"ǞcV,b \g@:>3b |CL̹Jq @<v*J<|\#quQ
k=Qqd ZVnlqb@0_R]s` ˤ85\R9U<" ַy<'L
t }e.8ME]%{(yftV7yi `| V<tVmؚ}t&+/: +׳y*@.3 Z4R "GK8PJ#[8OsՋµ,r# VU"^q@#t^.'~#0mCe2aX}ꉒ>ku
FehX o %Z\FhH 4:حoQY&5aH_ pX[-63pVjFY!:A\{/oCYq>vWaOQUèi ) DɈ!}Pl Vph/~qƥH`k?=~3I4٦k$i!aM-ƒ5V\L5m`P}L1_6 HL[%l=S'Y7Y B ĭQyu&]7PXҿ c9"
71xF>gtbm*Gdݗ[&(hr*0{9Rr46`Fj(#zw4 Oĺ/ w6γ!X,bFDQDZ 5UzCafgI\w$@=ZUi 4Ofd E@YM*[5-SY^Bm{̸>r1Db.V ޛ3rt ԙhEA)X`>ۄ#00Ձo :=y-:ZϞ %bkf I53bnIc -YJso踛H ^Ĉ&DYoF[%TyG\6rE!b$cU
Y~DqevzZ..:/m2a/۾u+9 qQ6] . AR% *H\C[Jy4ד HCV#
̳X ?
V0㛝4s|0Ε^g2 PRpO[\}6X%뇼T.#+ڋcs:*RH>]wȼA@"ԭ ɵuQ] g67 ޓ
VS9D n ]n'\~.? taeP(FGw3Qr5~. y4F ks)f!f[߲qR˥cR+,D`3m K03Ku3m K03Ku6TÇ"MۣG$C@woY? 6% B !2ᇀfC^k߬G35 N!ۦs}U5qcb8߈PhE n "-@A4rYf_\SlK^eGV炗>SoBnmG~|H1w$8`e/w9S`b3R_q^8Pi1ZS]8UD'p# S `G6̸Ľ͙f+
w ZXz͈&P@4vvQz,AlTb r .JrF9E1ֵ/_p&on31FMYn]%m oő3Gi "G@`@꩜֓`-~:
.ޓвLx1[S5̱wa "6+{tۋȾB~ Yrݯe 0 1 (jᾒtۀ7Q4R3LFp Q98N]̜bi(vNߍ
챡dvaI )찻%D
EHD~ eB-(+(B3y#I}#X $mXtxA 9%M9M/[w\ <!?I` ,+\ϻ$=\\eͯxSHۜ;a0]~RncBv.^(}u|S U߸gJNv`!9
p }GXʀ) X_G䛾 diTt5L
VawnvJ@
2nۆE+'M:]i/F @-eS#E.Zy"e2)z<:^1y`WqWQiʎ&~]*ψ6-!E"HN[$3"'w9E%O i06E- Ȳ\^k¢ 3*H[$̥F$(b`ZQnm]Jl
2̛YJap!IX%;I6˰\ւ,HgnZK &141`G0k6L0V u
&G%#Ѥ,z bsg]BjđPᐤrJ6Z(,(srDoߋG}h le*x*6Km8:܅92F7!ۙV {7쪱"Gh<ek2E v0Am:tBv^% %-Xr<2m(^_<Y+X)=ь
ҵ'`U(Ǯ8r,Ab_y(Vˊ>"u&' Qj`7FbEY -\\_|Qcr(y'.8zpհJ,$p1}#XbDX#p 舢/HAB ;wVҕ l4HUo_b5 GF,waE ;~Gr WX:1NCX弧`{9ɿ5]< ݨjK}3#~F?pKDzU-BXǙ*l|ׂUbdь\9_zϣ]=<. WF r>
fxWoT_sU+! nSXGvs3ϳ,$2+s9i
3FmOYMdm*Ljӹ1YVƧ"k|ב{`3P[Pd8
g;N|ӐαFC@ ]9-?jF!}#іO_½˒*6fJḍ4] yKb⥗5h">e+ KyTF{z N{!
,+W%kGiV/qTnڌvW8!]K 5 B6$Ӟ*fA:i`=ow!r }X1;|:-O h ҕ+X^-; E dn\R\o*ip,YyBcBisK>|$-=
J# 6~\J/47&?͕z9r'^[́Ȁs63s ;4#*S*WF#Ȋ8bL?0(ׄק)#ҰyhSL a|Vkq t J6T!H Кϓk&d(q9 TgB`;Qy'5Rn1 \ ] 5 v|9E{τCv>N~
&O՞1
c "Q~xѨMROF;.",nEP<g4{ģpM<fr),=Nj $.]-k; eLZ"+
.x# f Y^! Wp )0*VR(? ۩o.$KFrYyd" M!_f=3Lx3ˬ C'0B6ໃ 6-k?gG[yXf*u]8wg]?N"p ~qסF>WQ5Un&\ Ҭ9+
}n?4֢Z~ӧ|qsby%9C 0vsa%Y!"22Øo+2GuKcl;Zs$Fm?w[q=K9:2DA
^-#vu$2QI fP[V%%y&sgS !rc'SWSLfӖNB^ܮ;tv!0Crvm%^ fԒ-Š :TFvx8i֯H TF*,{n " ;ꎊH
:@l{B* Ly(dz6T#7Q j H^=A Kوzn-Ftqk TT٤tؽo XyT< z{3
w7I`8l(y}ʾ( aqRy G
` AÒ N}\ecBKf`!M"48 (dW'':1eXG@һ: b"bOzҠZ5X L~jdyMB;A љ~N@lnՄ%~IV,@ZmeTGa# y8
&'Eӎm؛<`Dz&y0bY $ dfP 8jt X\2eB _Ѩ-`Za`zdp52 KKuR
fY$2o E G3Җ!h9/y!'ub/A=!hx 1,ކYߨb2,*)&}iw@=fJkX,I'Q~}
#k2D aufˇ
+˜&_N}@wdƉ+ \һƮ p.ײsNص3Ofw4LfX>V4O(D\2Jϫ\ިk53Gzo$
;3T#1YvԸE4e1vxh X U.h4j༫1"!j14;Ǔu 藼cIT*P8d4AS! 7' v WXS =)d'Cy:(z"| 3R3z$ڸ@c|Lxx{!|c&hO!#VD}c+"3P]^[1wE;$ϱZMerᜋҀX^|tM&8+sy& H`.rsT=qPT 2w lxc%zWXr7'<4|uyO1W[xV |sԊ/|'ct41]4#s *%<k$G(Xlx5
زeTP1AZ3wNڷ-Fh$Kt!< ?kF׃Ij
mkenf
Yq=6c:+)IH+et
ѾśE\Q&F"4!,7gV_H0kZN3D, ͣ4 lCqM5ˠy7XKRD\K+Y 6>1c='[iz˴Nl !BhCZy6 <noNje!қw$ϻ,MDAE!w;K#mJ \:/JQH1t~ nCw2,L J8;WE; q~=/
ES+&N]$9?["T'wR̹P|a?Z:#nsI8? Za91 ]T]Hc=nYOڭ_Sh"d=. %)#̘ HE!NSLz9!(ݿ;
Λ<Ê$ϟʢbרȅ+7]$9(<6Pi|=C`5Lϊ%CeE Wvi
QP@!Н3Pt- ̠
[e%D@
^ `ɠ)0Hz^%JHXI+b{)42F@.+DI6`ˬ?R` "R`lG` Ư]r:XQ(z7F&;E,%/ᦱ};9 I'!]a 3 P 6m ʀ 2 Y,Xmo.S|Z]̢$IbSF+sG<UrGK^` !^wԾ9$0,Df0/Yu9TB5QF\ s}Ko-$-Dy^nuNۮJowfB"%/02<o <5 Q
8#ڏziBގ$pKn}1͵ሞEܹ& hn@ÌhXf[}pY*8mmP:{ zړdC,faԄ M!x9^.Č.hߛd9%+.ź| %6^oAVWJT7R\< 9rXOhSGPrN<.`EUIMQzrX N3#06ݣSRKSDU
rwX SpRȠibiHmUD~+U,S 7ߞJp9r49syf<g0s?x4'CZ|mn mz.WbRaCdy;ujXM3P?#5I}
@ĭ@c,œ+;t*,h2[ѦLf ]7}'r<4]"μ 39?A3n @휵~vk*~ET*#dmDю*m4ӑFJZ4~Ym|(H uS,;NWpߖr/# (xi^wE 1}'[v{,XêgR닼F8^,<3ǝ/+8̶SU[$iI:ab
rWe*)0&<M ]hC|X]ڗrPuN[d.F TSB-sN7=<Ol G[kQH^:)H^
)*K< 0 7"ُt!yt&2?. g"Xf{0]~φ"cJȧUz5G#:Clu0ZD$'-¤D mڱ-!3o`' SܕiK^:lX?z
8^m$aUۋ]@ :3ႰW8r+qXHs/"^AzxG)L"/ rS=kJj58Z XA('z39<E+SΌZ<ԙ~1/t }%|3+($et\gĒXꨉ20)|]K?3A &CKq6 yuNOq 뷻L2>WI~6jju>
#UｋKίeX VjMF S=Fv*j 0\~+=$ݙLd{4riM*.σG'<nis
ӑX:OPp6sZb1}:pgɒ Yq֠weLGBT^iZDGՙKR@5pgoFR *gmSkyH併09Jk T2j%
Z#32gaé 41!WY0hN]킿dYիȔǁ2r5!\s%Vxm 4=$A Ƹ.yvCս()X蛳+@l#bF-7h605YN1L˵KxuKBdva"0ZY5b 0lw"fT#=LIrQd,O#UI s
lM2P_EoPV6"td= 8=#84j4ﮤ Ǽ*Wc ͟J}6m _g#/AIZ4-״F6)a<IlbHئMu/?-@m$ւx Uj~rQ̝E YQ@7qs+P"ZEEe9ӘnNxnk!*w
Y
J$<y;m
'Ģ-ڝUkl660w2.5w+nU;QKօZr
'1ۂ
7`v=8 !L&A{kZHegKL4lcIzoeXe(sP8<v<<_Զp 4"l *IDATX_-]ݏ
4ʶoN-\=G2w Wew FkZ?p֢ԺzLZRXpڕ!ּd[:/ 3J<X"-\ @:V،>ano
¥SɳP&Kiiq"MnGPUCu}a+W
m>$
ޖ3rʟF}U
L믾*4ݡr)W Xf;s\ m#cɉG ktd._*K]큏!o9
r9cˀh ' .,tó/4ޠ58O!hF"=)rJ;9*_n[3\% G]!*%"o !JXLaI6@ÌvXk9wB q2! tlM0rS+]AFA݇eMQ
go_L=Ջ.HFR`FW{)0}PF ]H]-kG@}t! -b%U#H
3^֮πF6R`Fv3R`PF@
n_Y~F@
L?*H+kHg@er#)0#}e)0 Lnd# fd]?#%0]vΟwRsF29p@@!(d"lm%tQB9
kɓ'qYi!&G$B~/@ZM? ~@w8otр˩Y0v_~_qiH ̈r.3'cƌ%n7.vH7/PFP@ Ih@=
u)0}EP UHU-+WAT! fT5l_WeQQܲ}E@
L_GR`FUs)0}EP UHU-+WAT! fT5l_WeQQܲ}E@
L_GR`FUs.;.U_jdrr_ b0Y!,gN)S<JIFEp<y'M
(4^#4 &d %nrp{;d2y^xI \^KF 9FY*?Ř@d %}A@
L_ГqG R`F]
)0}AO uHuM.+=w! f5p_dQQ}A@
L_ГqG R`F]
A h>yϞKye\"yOK mjA{%ec.Ct4 )'O[wCȺ?Ie]JE 9}ޥ~Bie&"Cgg[˯|*58&\.7uOz\\tt8pQtP|-vϵi~BXr6lg{j?2x_{)7Q+ <~<q,w9;_{gd;==x^8uc9BTbܡzxǎ: hEw ¹o&MpFp{ʋDo; ¬[5wf?S#F'̹sm\a [̷݃JQzx@0 Td<p= wq_CJ(OawXv
(9F8 'AL:{>=} h;_w#3LE/gu@ q)Gؔ&34vLNx*!6ʁC1u^"n=ct$^TT 2cRg̝9HM CӞ9; ~z gYx/ޠ@O= (dGكSxf2R#9(ċoGOcQ zI& ȜoF;6۱Iy / L0}T >-eส'/ǍP ?v=+, =_)$p, өY3Gmӝś[åt~珢]SQZ Js2L|xz+xjSsؚOnny ůR]h9l&rv^Wq4D`\ <xov 7h0o"e$8<Jp /ن@|<_|gq4s"bϧ@4t #tbgts؏'X:^q2vt[_i
nj KL_D#VnD!&4|=)n_cB~%V&x0{
#"Pn4 wa k"(n1s̪C|<E_=f&ޏkw"mcϿzWL@
/wDy\
cq'by !
<=wx bt4wE~E0MI+I
JzހG1{lV Zth\UkANk=NA孈5pŬ4NS8\+lAEXx]&9Ԅ݇x@6$ZL0]Us߷B`ƍ
J n F;r cVrVfg`܃"4| Q^
T u;|q.Df,cqZB%&I!P&<mV54Ĺ?Ѕ, Bî5 uϗȋAG_]|
|]r9fϼJv|߁# =` T8Zlڿ F_9eP^^JO1ir+4Sz)86?{ .$gDz Mc
|m"c\Ż zID"V0"qj;zlkB?㟷' {0ёGL.\]g3&:oN'zh
T>S14'cRW>95 v
OT]Qq
kkj4)0 Ǟ<nUz # 4mn rrE8e% _ erKi\:ج")0w787?f]~ E|77[_ !o]qLf>n^w|MJW*PICwXXT(qUFtz \_a
@xR(G)0fUzu`>fѾ5q#&$ ;p5)jd.O:aw;(Dž ywNOS*:WɞU[hh)\ee @O3Ž Lkei9.|[f$"}G>\^Dҷ ݷ
?q!>qtWRPKC|˃xjR1^|k7^grnDg1⋃AlG03\8Пȿ+f!t̺i>~ ng0z;̟,Fَ97Aq0LwkRD er 5m$A"ӔK+\t}K1DWyL|
K@7a&o
cA7Nn &ެK7t D> x.J` OZ.Nq {yP;?wϯ{f+s
Μms'ZuI{%>j}/ؿҕ|*>N"p)!P__!~tQF|':)0Z|-R/Y f@`TԖ 2ёڲ^U&:R3R[Vk@3 DG*R`Fjz
R`VHE@
HmYYA@
̀* H-+5 HXe#. I$"0=@?)+t4I62Xb3H@lFR`FF;Z R` h@ˤ d. rw% U aPxȴ{_<FX/x, ;e4J'Kqq̌W_sqGyh:M2G毥rπs8]Dmݾ c9_ZX<On ?i7?8KQg6?ZW9ҠUey/1$7ٞ^ޝ<a@
L$x3{;B ^e u :rN$]]P _϶++ӯ$#)0#]e)0Lvd"^%˿O\Yx$ 0;>ڟ7ߞDIy5 r9;,̏?z 3P5IF "0.ؽ5qC0~y-7=c?^{
5> !\ yk^k*N|-v zl^y*vk &-h9@G-sn ڃ'q>}Mg-Hځ fMKc%0=6
8|\Eئ AU5ABb[[f2YJ|Vi++8Q,B-Mas=- 7 \QfW> ,m4uQ+ >, ع% OgS&AֲTh2uv~r 3apSAN4N!3Mqg~^xK3bPc%Swd;**E+s:s?o返<%g30>ھ
EQ(z,XB{ӄ*^<LOgNO9S
7DZp 1nU֡_ ; v`
STc;?r .(v濎XtvVjQPW> ;X9V?9Y)[&Ni, n?=I4OLEjJsQAĦ#`1*v~=kz6j " lp#}oQV D50_ !:]bľ
V\p
~F, Hgr
l2ǗLo/J`{t*V[n{+eƹV>_Sv|5 Z Cx`7~2w7N%O`t'YH ̛c4 B59; 3?mE˿ǞCQzD=\U.+Zq-sh`Q@mW GLuѠ FOci RpA7\iAEFM\`_ `SPp'\Wޭa] ?iw?E_@i 8zK2RbݝKef1M@dt-6S,_si^jE%{0+9 ]4q^3<y6@~H|
¯;3{c=]`xAn((*fNh-قWjE5ix*s> caSh'x,'K iaw$4 U)
x&פx4I"<j)=1!UPo7졕#fnh(][p]iGi| E]`Pp "T$n-yuwQ5λ]!|[qˣ3O ;s;ޠ-wς_9Ք}]UlY
rM:^8ֶsUka2&2'TsQ<
%xaڸ
㸁OQ=TQ.q$:.v? Q3M+j{+Rw>a>p.x lg㍷B_d@ʧ{vaװ/+S){\|g"/?- Ňut 1;9-
+ 61Bj?=nR Tc1# cdnU<: -
8ʄ8!PN|]V)N_1b }{2vt-]mct3aʩpwkQ Ů bjԠ?|h/[E=tʡ\E(:q B;ND"=RŷMa/\cPpQWrI6q9z7c;Ώu'%~|B S
6UsWB&mhUM2-Je) pfIy2.;%
L=0 u!08{Զؠsn+pإ o,''\V
y UXo+i)'q_Ħ(\`q3xM>ʪa9}'&8@Nޡi"' >ijAujWr) +0ҍA5$[Qn ؑӏK0؞!NJRB#"e?څD , ̋|2` :/%Lo&;ʽep&c)<x5贈$DAp ɠX۪bc7zo DM*)
a|*3O " Ӻ KۀDmix
&ؐ nSI#x9 L{ 9m MP1<:5yi&4A*Q >!Ø"զ<' ܼp X V2C\0Ô5LD Eͧ
ؖ9s ~o>VY^@dyJPە:7cY+JIK?
̓a N D5en y%Ϧj__~g_rG) ,˩$_,Q{
c]r<FĒJU<gq<u3 h G`&03g & E>aIV蝌w|B:]=ݤpQ7 7K< Yݴy(ك?ƚ_ z65t3.U$# F ~蹷dd 3@
q"?kM ODP->ebS&qKS,Eo9_%!0?)P')PtIvx} @:֝s Æ zhR
Xnfdo#w8a>\' 'ww8a>\' }=' G`~楗^$#JXHipl,> y+NU2|A&38VV 0d03 'Lfp䭬8aVDafN[Y%p¬ 0JY%͇8a2#oe J&33pdG*A`? Zr` E)go^#wEt3F~ߢ?L?aG` ,曇38+ e1ɲ 0#qDbfEhBn^"+qT?UÑqvKXQp Fq[O}踹 6y1ro5(+/cL.U0>hK}xZ'<3V.a+բI>cu85sHy qvMKa S/ # ^AX&7Y % -]iJDym=vFj)3*Du8Jŀwʐ'ΆRs3#*뼐 G<
ɀ_JT"QXoE'Ռ2d
Z"b0{qJkP_D Y&>FZ"o`쀧 פ1"pC5bl%jrg"-zkt"|ؔVH}[i e"^Ef+&o,DK1\ݣ#ǂj/ m܅3 B`kFUp=h`az9 G~U;Db{ D&Q- Қ?#4W
>B2:6?C+n~Յ<0S%.c sa15WܒgYXxv4L
'7t fH3ض߯Q>'R/&mOh=[~4
Au f_cǾZXPlp@\e%Sb)
#2SMi[( P tp|sR$
*0#
CjˠLA^ q f9ÈqӂmRZ덪ל[7 z5G͐#(e(LpADZ%qȗƼS%Zaxy2 #DݼV|k`^'ѯjmdvFnmE[R\sV ͊:Y!%Mɯ$ħLr|uyŧF_2D&Z4[,X/0~S%@V 9[5c|h
1tˠQJԌeRfE i%$3<Xʷ<(?Xb)$j ފ
cGWp
\Ly2 #Kt
~Pv9xq aZдh_/C^*ke1ҨkKݚ*xVL#,HZP wPwV jkQE㨪!j?{U8ס8|UI c37jPWiI&U }^H-h)A,,ÑNt oD{}DӔ}vm2JK1P#W>dF {i0 8m$D2@bZ)mZOiq_k}O&T<
eLeZƌ J1'B
W 0S;0< +Edr#*je?ZO`1 MDD+3ҭ:ZGZW@I4B';zwL K#_R="^S -z vz܅D\Xf
|lrp4c0z(?? \?<+T;Ña* = 7uKA85!t}jN&d$(0g>F 7Lj.<H e*EedZЖM06y?ގbL.ogX 1!s04ZӃRkOM()@3ΙTF X z6ȦǦwٰq03Md}03,u;b?(~]AGl.ZP, 4k /#'Dz09--vմ+ y9$R ̓Q !_|&?c {p$G X#@4\$?c8L[=8=}P.*㴁4#(i&:H|O㐶iKCvh
k֊ތ"Bq4 xU*䴓Ow;ӎ:NKal?coe৴cFd8PDͧhg_Ga
f "sJU`qnfU~'f .QxP%ihbd%(BZi.Q3wN3UՅO=
D߭L>d, &T`YRn2G{d Sua!W{,r=5ъYewnas0QFc1q_a뛌
Z#zM-O& P9{ 1鿩PdB;{ԢRVJK=XNN HAW7i"E4튄 u;2mEcoWr IҒc!@V ]kMQ.Blu.0u34ͭ_D%cЃV*0CNц& ҽ*iӋ\?e' ԈN `TXB3D]p ;ʝZO
&')l8TGkoyZäaxO@gǾD&~۠FŒ4&y$v4}EE]=_)|1%n
-2xw&h Mh&:L~x&텷Ԉ&lAœ h5/nrz7յ/OC; b,kX3Ø;i"FN}":E7#|m#wlQ8v&U6ET?m,),T6My*qjwk9rد60+0\
I -L
K {"Eg+ C&Z +% RU j]2&dfW# p]D\0-̢߫Ev<{)
"v&1yNKb^O0 /m<;e"9s?Y0=5TVZ(ƳdHr+-jDmɍ ,B`Y|, #,,yl yNDq1N.NDq1N.NDq1N.NDq1N.NDq1N.NDq1N.NDq19_ c6̏_$&Y ~,NEċpp$G"YHG 'L ~,NEċp?]zuO IENDB` | -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/zh/_navbar.md | - 社区
- [团队](zh/community/team.md)
- [社区治理](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
- [贡献指南](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
- [致谢](zh/community/thank-you.md)
- Translations
- [:uk: English](/en/)
- [:cn: 中文](/zh/) | - 社区
- [团队](zh/community/team.md)
- [社区治理](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
- [贡献指南](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
- [致谢](zh/community/thank-you.md)
- Translations
- [:uk: English](/en/)
- [:cn: 中文](/zh/) | -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./.git/logs/HEAD | 0000000000000000000000000000000000000000 6657a58831a544606f78177b61d92bb959ccce94 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704839356 +0000 clone: from https://github.com/apolloconfig/apollo.git
6657a58831a544606f78177b61d92bb959ccce94 01b02325d1def997c1b80831c0e0ac4c262e1390 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842283 +0000 checkout: moving from master to 01b02325d1def997c1b80831c0e0ac4c262e1390
01b02325d1def997c1b80831c0e0ac4c262e1390 06fcb2afa2e362a37820333176f96e867661ec96 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842283 +0000 checkout: moving from 01b02325d1def997c1b80831c0e0ac4c262e1390 to 06fcb2afa2e362a37820333176f96e867661ec96
06fcb2afa2e362a37820333176f96e867661ec96 d56a92f7ccba7b4bfaad63fbd915d7680b25090e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842289 +0000 checkout: moving from 06fcb2afa2e362a37820333176f96e867661ec96 to d56a92f7ccba7b4bfaad63fbd915d7680b25090e
d56a92f7ccba7b4bfaad63fbd915d7680b25090e b67db2b20029a8e95377b599129d749dee19fb9b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842289 +0000 checkout: moving from d56a92f7ccba7b4bfaad63fbd915d7680b25090e to b67db2b20029a8e95377b599129d749dee19fb9b
b67db2b20029a8e95377b599129d749dee19fb9b bc55ba65451ab5aabf8a050a0c0e4287b84954f2 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842293 +0000 checkout: moving from b67db2b20029a8e95377b599129d749dee19fb9b to bc55ba65451ab5aabf8a050a0c0e4287b84954f2
bc55ba65451ab5aabf8a050a0c0e4287b84954f2 6812a1a670fb0a3afa15f535d5dcade8ff4f818a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842293 +0000 checkout: moving from bc55ba65451ab5aabf8a050a0c0e4287b84954f2 to 6812a1a670fb0a3afa15f535d5dcade8ff4f818a
6812a1a670fb0a3afa15f535d5dcade8ff4f818a 57cca962e3408a73516621e7c40490ec4b4c70e1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842303 +0000 checkout: moving from 6812a1a670fb0a3afa15f535d5dcade8ff4f818a to 57cca962e3408a73516621e7c40490ec4b4c70e1
57cca962e3408a73516621e7c40490ec4b4c70e1 1deb136c2c40eeb581c43863ee786b8bd0c754f1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842303 +0000 checkout: moving from 57cca962e3408a73516621e7c40490ec4b4c70e1 to 1deb136c2c40eeb581c43863ee786b8bd0c754f1
1deb136c2c40eeb581c43863ee786b8bd0c754f1 84c1d0bfe64086ab2f794f5c4a1b658b6f1e5949 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842307 +0000 checkout: moving from 1deb136c2c40eeb581c43863ee786b8bd0c754f1 to 84c1d0bfe64086ab2f794f5c4a1b658b6f1e5949
84c1d0bfe64086ab2f794f5c4a1b658b6f1e5949 a23b3a841563cea3aa8ff09d398d367955ebbb63 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842307 +0000 checkout: moving from 84c1d0bfe64086ab2f794f5c4a1b658b6f1e5949 to a23b3a841563cea3aa8ff09d398d367955ebbb63
a23b3a841563cea3aa8ff09d398d367955ebbb63 57cca962e3408a73516621e7c40490ec4b4c70e1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842309 +0000 checkout: moving from a23b3a841563cea3aa8ff09d398d367955ebbb63 to 57cca962e3408a73516621e7c40490ec4b4c70e1
57cca962e3408a73516621e7c40490ec4b4c70e1 a4df1a32d9696e74b708005f7c8245f3477c7e34 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842329 +0000 checkout: moving from 57cca962e3408a73516621e7c40490ec4b4c70e1 to a4df1a32d9696e74b708005f7c8245f3477c7e34
a4df1a32d9696e74b708005f7c8245f3477c7e34 4f4a8f7bfba6797d39f322ff31e3bc9252585fdc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842329 +0000 checkout: moving from a4df1a32d9696e74b708005f7c8245f3477c7e34 to 4f4a8f7bfba6797d39f322ff31e3bc9252585fdc
4f4a8f7bfba6797d39f322ff31e3bc9252585fdc 3a6ff67af3a658171e645bd1e53b4f441ad31c7f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842333 +0000 checkout: moving from 4f4a8f7bfba6797d39f322ff31e3bc9252585fdc to 3a6ff67af3a658171e645bd1e53b4f441ad31c7f
3a6ff67af3a658171e645bd1e53b4f441ad31c7f b30cbe552a2eb03c2d0659f6ab6286130ca425ff jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842333 +0000 checkout: moving from 3a6ff67af3a658171e645bd1e53b4f441ad31c7f to b30cbe552a2eb03c2d0659f6ab6286130ca425ff
b30cbe552a2eb03c2d0659f6ab6286130ca425ff 4acee4217af72c69594843d51eaf853a1b6c1ac8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842339 +0000 checkout: moving from b30cbe552a2eb03c2d0659f6ab6286130ca425ff to 4acee4217af72c69594843d51eaf853a1b6c1ac8
4acee4217af72c69594843d51eaf853a1b6c1ac8 a86ed25fb032d35f62a4c0a8364459acb92c4d07 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842339 +0000 checkout: moving from 4acee4217af72c69594843d51eaf853a1b6c1ac8 to a86ed25fb032d35f62a4c0a8364459acb92c4d07
a86ed25fb032d35f62a4c0a8364459acb92c4d07 84af88fce42397a12d3552b3f829234e08d41e03 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842344 +0000 checkout: moving from a86ed25fb032d35f62a4c0a8364459acb92c4d07 to 84af88fce42397a12d3552b3f829234e08d41e03
84af88fce42397a12d3552b3f829234e08d41e03 11303c70a009e5ea5d6d2207f64e3b1926c64387 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842344 +0000 checkout: moving from 84af88fce42397a12d3552b3f829234e08d41e03 to 11303c70a009e5ea5d6d2207f64e3b1926c64387
11303c70a009e5ea5d6d2207f64e3b1926c64387 2800a00e928333d579fe1e78791c82c7cf352562 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842346 +0000 checkout: moving from 11303c70a009e5ea5d6d2207f64e3b1926c64387 to 2800a00e928333d579fe1e78791c82c7cf352562
2800a00e928333d579fe1e78791c82c7cf352562 0b8d655bea556c746494b1338e4e165ab2855a65 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842346 +0000 checkout: moving from 2800a00e928333d579fe1e78791c82c7cf352562 to 0b8d655bea556c746494b1338e4e165ab2855a65
0b8d655bea556c746494b1338e4e165ab2855a65 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842350 +0000 checkout: moving from 0b8d655bea556c746494b1338e4e165ab2855a65 to 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5
83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 3ef13f8b53335b90002d88518c6cb76f294e554e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842350 +0000 checkout: moving from 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 to 3ef13f8b53335b90002d88518c6cb76f294e554e
3ef13f8b53335b90002d88518c6cb76f294e554e 5b85b42450c27578c7a1bcb374fe8ed3d987b238 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842352 +0000 checkout: moving from 3ef13f8b53335b90002d88518c6cb76f294e554e to 5b85b42450c27578c7a1bcb374fe8ed3d987b238
5b85b42450c27578c7a1bcb374fe8ed3d987b238 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842352 +0000 checkout: moving from 5b85b42450c27578c7a1bcb374fe8ed3d987b238 to 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5
83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 e11854f9a465a6b3081f0ccd640c4c97421bad64 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842357 +0000 checkout: moving from 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 to e11854f9a465a6b3081f0ccd640c4c97421bad64
e11854f9a465a6b3081f0ccd640c4c97421bad64 5903691ce3bdaea6ba4ace4c76373ce85919d9d8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842357 +0000 checkout: moving from e11854f9a465a6b3081f0ccd640c4c97421bad64 to 5903691ce3bdaea6ba4ace4c76373ce85919d9d8
5903691ce3bdaea6ba4ace4c76373ce85919d9d8 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842365 +0000 checkout: moving from 5903691ce3bdaea6ba4ace4c76373ce85919d9d8 to 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8
670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 c6dfe76d6c76b96c0f2ac9aac836cbdd325908dd jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842365 +0000 checkout: moving from 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 to c6dfe76d6c76b96c0f2ac9aac836cbdd325908dd
c6dfe76d6c76b96c0f2ac9aac836cbdd325908dd bb15beca157d3623f0fa9f40a1d77c37d7776649 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842367 +0000 checkout: moving from c6dfe76d6c76b96c0f2ac9aac836cbdd325908dd to bb15beca157d3623f0fa9f40a1d77c37d7776649
bb15beca157d3623f0fa9f40a1d77c37d7776649 b7af5ccc691bb909dacf04069cba2215e61ebd34 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842369 +0000 checkout: moving from bb15beca157d3623f0fa9f40a1d77c37d7776649 to b7af5ccc691bb909dacf04069cba2215e61ebd34
b7af5ccc691bb909dacf04069cba2215e61ebd34 196c8f9ab7ba3144d28bdc28eb1db5ff3ae3056f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842369 +0000 checkout: moving from b7af5ccc691bb909dacf04069cba2215e61ebd34 to 196c8f9ab7ba3144d28bdc28eb1db5ff3ae3056f
196c8f9ab7ba3144d28bdc28eb1db5ff3ae3056f a6c7aa62c631c7ff3ce482d05b3d4c213090f261 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842375 +0000 checkout: moving from 196c8f9ab7ba3144d28bdc28eb1db5ff3ae3056f to a6c7aa62c631c7ff3ce482d05b3d4c213090f261
a6c7aa62c631c7ff3ce482d05b3d4c213090f261 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842375 +0000 checkout: moving from a6c7aa62c631c7ff3ce482d05b3d4c213090f261 to 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8
670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 b2e7eed597da6a5577fa2e83409d5939521190f8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842392 +0000 checkout: moving from 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 to b2e7eed597da6a5577fa2e83409d5939521190f8
b2e7eed597da6a5577fa2e83409d5939521190f8 9bed63419c8f010087584493a2035ad1952e463c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842392 +0000 checkout: moving from b2e7eed597da6a5577fa2e83409d5939521190f8 to 9bed63419c8f010087584493a2035ad1952e463c
9bed63419c8f010087584493a2035ad1952e463c 2f311ae79f36f45d39429814c66d248cd7a69959 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842398 +0000 checkout: moving from 9bed63419c8f010087584493a2035ad1952e463c to 2f311ae79f36f45d39429814c66d248cd7a69959
2f311ae79f36f45d39429814c66d248cd7a69959 8418434c8ffc55611fc4f5ad467e33b29e5f7308 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842402 +0000 checkout: moving from 2f311ae79f36f45d39429814c66d248cd7a69959 to 8418434c8ffc55611fc4f5ad467e33b29e5f7308
8418434c8ffc55611fc4f5ad467e33b29e5f7308 bd0600f0d405c08864a44e23b1282f15d86e651c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842402 +0000 checkout: moving from 8418434c8ffc55611fc4f5ad467e33b29e5f7308 to bd0600f0d405c08864a44e23b1282f15d86e651c
bd0600f0d405c08864a44e23b1282f15d86e651c 819014fc156cecc8992ecab2cb1d6446b3b40ca3 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842404 +0000 checkout: moving from bd0600f0d405c08864a44e23b1282f15d86e651c to 819014fc156cecc8992ecab2cb1d6446b3b40ca3
819014fc156cecc8992ecab2cb1d6446b3b40ca3 8418434c8ffc55611fc4f5ad467e33b29e5f7308 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842404 +0000 checkout: moving from 819014fc156cecc8992ecab2cb1d6446b3b40ca3 to 8418434c8ffc55611fc4f5ad467e33b29e5f7308
8418434c8ffc55611fc4f5ad467e33b29e5f7308 78099b4a5161f6e0caa3ea94e444536baeab49fb jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842434 +0000 checkout: moving from 8418434c8ffc55611fc4f5ad467e33b29e5f7308 to 78099b4a5161f6e0caa3ea94e444536baeab49fb
78099b4a5161f6e0caa3ea94e444536baeab49fb d2084f01a1054d7b6a019941d9c127391215a4d4 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842434 +0000 checkout: moving from 78099b4a5161f6e0caa3ea94e444536baeab49fb to d2084f01a1054d7b6a019941d9c127391215a4d4
d2084f01a1054d7b6a019941d9c127391215a4d4 a0c09b5cbab358a50b3763ad532435a4d08c6a44 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842444 +0000 checkout: moving from d2084f01a1054d7b6a019941d9c127391215a4d4 to a0c09b5cbab358a50b3763ad532435a4d08c6a44
a0c09b5cbab358a50b3763ad532435a4d08c6a44 d9726af858a282b8678eb2eac60ba73f5927c2dc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842444 +0000 checkout: moving from a0c09b5cbab358a50b3763ad532435a4d08c6a44 to d9726af858a282b8678eb2eac60ba73f5927c2dc
d9726af858a282b8678eb2eac60ba73f5927c2dc e773940605df070748b01a49aea047a143578d7a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842446 +0000 checkout: moving from d9726af858a282b8678eb2eac60ba73f5927c2dc to e773940605df070748b01a49aea047a143578d7a
e773940605df070748b01a49aea047a143578d7a a0c09b5cbab358a50b3763ad532435a4d08c6a44 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842446 +0000 checkout: moving from e773940605df070748b01a49aea047a143578d7a to a0c09b5cbab358a50b3763ad532435a4d08c6a44
a0c09b5cbab358a50b3763ad532435a4d08c6a44 8a459447f2867c248d0e6dbc2cace49a28672954 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842452 +0000 checkout: moving from a0c09b5cbab358a50b3763ad532435a4d08c6a44 to 8a459447f2867c248d0e6dbc2cace49a28672954
8a459447f2867c248d0e6dbc2cace49a28672954 f28a01a7e02b2b07031f52ab97f86e33794a96a1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842452 +0000 checkout: moving from 8a459447f2867c248d0e6dbc2cace49a28672954 to f28a01a7e02b2b07031f52ab97f86e33794a96a1
f28a01a7e02b2b07031f52ab97f86e33794a96a1 8dd30712b1b411f6f53c52d56dd89f6afbf0b193 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842460 +0000 checkout: moving from f28a01a7e02b2b07031f52ab97f86e33794a96a1 to 8dd30712b1b411f6f53c52d56dd89f6afbf0b193
8dd30712b1b411f6f53c52d56dd89f6afbf0b193 fed54f790d067d771ea7b51eb6538a3b23777f7b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842460 +0000 checkout: moving from 8dd30712b1b411f6f53c52d56dd89f6afbf0b193 to fed54f790d067d771ea7b51eb6538a3b23777f7b
fed54f790d067d771ea7b51eb6538a3b23777f7b 0b9ade603392b23b3aefde4200e789ce86b61efa jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842463 +0000 checkout: moving from fed54f790d067d771ea7b51eb6538a3b23777f7b to 0b9ade603392b23b3aefde4200e789ce86b61efa
0b9ade603392b23b3aefde4200e789ce86b61efa 8dd30712b1b411f6f53c52d56dd89f6afbf0b193 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842463 +0000 checkout: moving from 0b9ade603392b23b3aefde4200e789ce86b61efa to 8dd30712b1b411f6f53c52d56dd89f6afbf0b193
8dd30712b1b411f6f53c52d56dd89f6afbf0b193 d26247180eea29e6ab808c6cb9eacf77bbcc4705 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842465 +0000 checkout: moving from 8dd30712b1b411f6f53c52d56dd89f6afbf0b193 to d26247180eea29e6ab808c6cb9eacf77bbcc4705
d26247180eea29e6ab808c6cb9eacf77bbcc4705 0b9ade603392b23b3aefde4200e789ce86b61efa jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842465 +0000 checkout: moving from d26247180eea29e6ab808c6cb9eacf77bbcc4705 to 0b9ade603392b23b3aefde4200e789ce86b61efa
0b9ade603392b23b3aefde4200e789ce86b61efa 7df79bf8df6960433ed4ff782a54e3dfc74632bd jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842467 +0000 checkout: moving from 0b9ade603392b23b3aefde4200e789ce86b61efa to 7df79bf8df6960433ed4ff782a54e3dfc74632bd
7df79bf8df6960433ed4ff782a54e3dfc74632bd d26247180eea29e6ab808c6cb9eacf77bbcc4705 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842467 +0000 checkout: moving from 7df79bf8df6960433ed4ff782a54e3dfc74632bd to d26247180eea29e6ab808c6cb9eacf77bbcc4705
d26247180eea29e6ab808c6cb9eacf77bbcc4705 c523af6ff0e94a60ca26e1aff23a6526e8cab754 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842477 +0000 checkout: moving from d26247180eea29e6ab808c6cb9eacf77bbcc4705 to c523af6ff0e94a60ca26e1aff23a6526e8cab754
c523af6ff0e94a60ca26e1aff23a6526e8cab754 7df79bf8df6960433ed4ff782a54e3dfc74632bd jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842477 +0000 checkout: moving from c523af6ff0e94a60ca26e1aff23a6526e8cab754 to 7df79bf8df6960433ed4ff782a54e3dfc74632bd
7df79bf8df6960433ed4ff782a54e3dfc74632bd b30cbe552a2eb03c2d0659f6ab6286130ca425ff jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842481 +0000 checkout: moving from 7df79bf8df6960433ed4ff782a54e3dfc74632bd to b30cbe552a2eb03c2d0659f6ab6286130ca425ff
b30cbe552a2eb03c2d0659f6ab6286130ca425ff 8a7a149b199fd83518ae31fc7709afe2d6eceee1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842481 +0000 checkout: moving from b30cbe552a2eb03c2d0659f6ab6286130ca425ff to 8a7a149b199fd83518ae31fc7709afe2d6eceee1
8a7a149b199fd83518ae31fc7709afe2d6eceee1 b4350507823436f7c75aec9c4cc72a4d7aeb496f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842487 +0000 checkout: moving from 8a7a149b199fd83518ae31fc7709afe2d6eceee1 to b4350507823436f7c75aec9c4cc72a4d7aeb496f
b4350507823436f7c75aec9c4cc72a4d7aeb496f dc3067b6e26c94fbf31aca187e032ba96ce31210 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842487 +0000 checkout: moving from b4350507823436f7c75aec9c4cc72a4d7aeb496f to dc3067b6e26c94fbf31aca187e032ba96ce31210
dc3067b6e26c94fbf31aca187e032ba96ce31210 821c8559e6106985aca0313f30992690c4f1f8f6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842491 +0000 checkout: moving from dc3067b6e26c94fbf31aca187e032ba96ce31210 to 821c8559e6106985aca0313f30992690c4f1f8f6
821c8559e6106985aca0313f30992690c4f1f8f6 b4350507823436f7c75aec9c4cc72a4d7aeb496f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842491 +0000 checkout: moving from 821c8559e6106985aca0313f30992690c4f1f8f6 to b4350507823436f7c75aec9c4cc72a4d7aeb496f
b4350507823436f7c75aec9c4cc72a4d7aeb496f 5bec3e4bfd7e268fe7f991f1e181bd756bf55f8d jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842493 +0000 checkout: moving from b4350507823436f7c75aec9c4cc72a4d7aeb496f to 5bec3e4bfd7e268fe7f991f1e181bd756bf55f8d
5bec3e4bfd7e268fe7f991f1e181bd756bf55f8d 4604e305d6567c25a4a551c628e904d6f165a285 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842493 +0000 checkout: moving from 5bec3e4bfd7e268fe7f991f1e181bd756bf55f8d to 4604e305d6567c25a4a551c628e904d6f165a285
4604e305d6567c25a4a551c628e904d6f165a285 821c8559e6106985aca0313f30992690c4f1f8f6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842499 +0000 checkout: moving from 4604e305d6567c25a4a551c628e904d6f165a285 to 821c8559e6106985aca0313f30992690c4f1f8f6
821c8559e6106985aca0313f30992690c4f1f8f6 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842506 +0000 checkout: moving from 821c8559e6106985aca0313f30992690c4f1f8f6 to 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf
301d66dcc28b2d698eefed3ecc9aa3273afb9ddf 25fa47fc524f284276b17ac48054e5fc79ab841a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842506 +0000 checkout: moving from 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf to 25fa47fc524f284276b17ac48054e5fc79ab841a
25fa47fc524f284276b17ac48054e5fc79ab841a f8d35bdd5043ae86192610b7f24f0da72a554c29 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842508 +0000 checkout: moving from 25fa47fc524f284276b17ac48054e5fc79ab841a to f8d35bdd5043ae86192610b7f24f0da72a554c29
f8d35bdd5043ae86192610b7f24f0da72a554c29 22e6422b91793a8ce1525b1722943abbd33ce28c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842508 +0000 checkout: moving from f8d35bdd5043ae86192610b7f24f0da72a554c29 to 22e6422b91793a8ce1525b1722943abbd33ce28c
22e6422b91793a8ce1525b1722943abbd33ce28c f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842520 +0000 checkout: moving from 22e6422b91793a8ce1525b1722943abbd33ce28c to f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0
f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842520 +0000 checkout: moving from f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 to 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf
301d66dcc28b2d698eefed3ecc9aa3273afb9ddf 67030ba4867d34b25d5fdc5b6c02a65b6c7d759c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842522 +0000 checkout: moving from 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf to 67030ba4867d34b25d5fdc5b6c02a65b6c7d759c
67030ba4867d34b25d5fdc5b6c02a65b6c7d759c f8d35bdd5043ae86192610b7f24f0da72a554c29 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842522 +0000 checkout: moving from 67030ba4867d34b25d5fdc5b6c02a65b6c7d759c to f8d35bdd5043ae86192610b7f24f0da72a554c29
f8d35bdd5043ae86192610b7f24f0da72a554c29 98511a8c7f245c7852130526e838cb51f0ca4a8f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842524 +0000 checkout: moving from f8d35bdd5043ae86192610b7f24f0da72a554c29 to 98511a8c7f245c7852130526e838cb51f0ca4a8f
98511a8c7f245c7852130526e838cb51f0ca4a8f f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842524 +0000 checkout: moving from 98511a8c7f245c7852130526e838cb51f0ca4a8f to f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0
f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 22e6422b91793a8ce1525b1722943abbd33ce28c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842532 +0000 checkout: moving from f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 to 22e6422b91793a8ce1525b1722943abbd33ce28c
22e6422b91793a8ce1525b1722943abbd33ce28c 75ae5cc8ca41c5f177cd9c8e044a9425ba40ad39 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842532 +0000 checkout: moving from 22e6422b91793a8ce1525b1722943abbd33ce28c to 75ae5cc8ca41c5f177cd9c8e044a9425ba40ad39
75ae5cc8ca41c5f177cd9c8e044a9425ba40ad39 78aaca19f7c800525861167702bc568eebee10e6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842536 +0000 checkout: moving from 75ae5cc8ca41c5f177cd9c8e044a9425ba40ad39 to 78aaca19f7c800525861167702bc568eebee10e6
78aaca19f7c800525861167702bc568eebee10e6 ba82fec3996d9c001439d47906bbc60482f64f7a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842536 +0000 checkout: moving from 78aaca19f7c800525861167702bc568eebee10e6 to ba82fec3996d9c001439d47906bbc60482f64f7a
ba82fec3996d9c001439d47906bbc60482f64f7a 526a93506ee380a009dc20a9ab870a37367f983f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842540 +0000 checkout: moving from ba82fec3996d9c001439d47906bbc60482f64f7a to 526a93506ee380a009dc20a9ab870a37367f983f
526a93506ee380a009dc20a9ab870a37367f983f d6fd359eff9c64120cef014b3c3895036d3dda21 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842540 +0000 checkout: moving from 526a93506ee380a009dc20a9ab870a37367f983f to d6fd359eff9c64120cef014b3c3895036d3dda21
d6fd359eff9c64120cef014b3c3895036d3dda21 e690e6502259de6364bface5d63564c9bcb0d6da jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842550 +0000 checkout: moving from d6fd359eff9c64120cef014b3c3895036d3dda21 to e690e6502259de6364bface5d63564c9bcb0d6da
e690e6502259de6364bface5d63564c9bcb0d6da b344d54499951282a05c32a1d532a57d3b17d983 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842550 +0000 checkout: moving from e690e6502259de6364bface5d63564c9bcb0d6da to b344d54499951282a05c32a1d532a57d3b17d983
b344d54499951282a05c32a1d532a57d3b17d983 70791c86404e49e6feff87d7e6373b8d63ef0369 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842554 +0000 checkout: moving from b344d54499951282a05c32a1d532a57d3b17d983 to 70791c86404e49e6feff87d7e6373b8d63ef0369
70791c86404e49e6feff87d7e6373b8d63ef0369 e690e6502259de6364bface5d63564c9bcb0d6da jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842554 +0000 checkout: moving from 70791c86404e49e6feff87d7e6373b8d63ef0369 to e690e6502259de6364bface5d63564c9bcb0d6da
e690e6502259de6364bface5d63564c9bcb0d6da 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842556 +0000 checkout: moving from e690e6502259de6364bface5d63564c9bcb0d6da to 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4
9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 2662f037b3843d952041ae90ad8ecd88e1f52709 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842556 +0000 checkout: moving from 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 to 2662f037b3843d952041ae90ad8ecd88e1f52709
2662f037b3843d952041ae90ad8ecd88e1f52709 70b70c33870fb35f22595562723907dd95f733b8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842559 +0000 checkout: moving from 2662f037b3843d952041ae90ad8ecd88e1f52709 to 70b70c33870fb35f22595562723907dd95f733b8
70b70c33870fb35f22595562723907dd95f733b8 e1636d425c010b75d85174fec0f1369e7c3a912b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842559 +0000 checkout: moving from 70b70c33870fb35f22595562723907dd95f733b8 to e1636d425c010b75d85174fec0f1369e7c3a912b
e1636d425c010b75d85174fec0f1369e7c3a912b 150fe19c4a3035e79cae552cb72c701367f2a2db jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842563 +0000 checkout: moving from e1636d425c010b75d85174fec0f1369e7c3a912b to 150fe19c4a3035e79cae552cb72c701367f2a2db
150fe19c4a3035e79cae552cb72c701367f2a2db 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842563 +0000 checkout: moving from 150fe19c4a3035e79cae552cb72c701367f2a2db to 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4
9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 dfbffe587176a93119b5bc23d0651af8ac073652 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842565 +0000 checkout: moving from 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 to dfbffe587176a93119b5bc23d0651af8ac073652
dfbffe587176a93119b5bc23d0651af8ac073652 e05baf69d37153a1fcaa91f94240fe61eab3cddc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842565 +0000 checkout: moving from dfbffe587176a93119b5bc23d0651af8ac073652 to e05baf69d37153a1fcaa91f94240fe61eab3cddc
e05baf69d37153a1fcaa91f94240fe61eab3cddc 0b6c4e921d9f3da3d94e8cba644f617ca7395035 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842569 +0000 checkout: moving from e05baf69d37153a1fcaa91f94240fe61eab3cddc to 0b6c4e921d9f3da3d94e8cba644f617ca7395035
0b6c4e921d9f3da3d94e8cba644f617ca7395035 150fe19c4a3035e79cae552cb72c701367f2a2db jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842569 +0000 checkout: moving from 0b6c4e921d9f3da3d94e8cba644f617ca7395035 to 150fe19c4a3035e79cae552cb72c701367f2a2db
150fe19c4a3035e79cae552cb72c701367f2a2db 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842571 +0000 checkout: moving from 150fe19c4a3035e79cae552cb72c701367f2a2db to 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1
93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 2ab923f868602c418ca6e793e8660d3a324009e8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842571 +0000 checkout: moving from 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 to 2ab923f868602c418ca6e793e8660d3a324009e8
2ab923f868602c418ca6e793e8660d3a324009e8 85bc77de28460cb10f079df4f015b6100417ea51 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842577 +0000 checkout: moving from 2ab923f868602c418ca6e793e8660d3a324009e8 to 85bc77de28460cb10f079df4f015b6100417ea51
85bc77de28460cb10f079df4f015b6100417ea51 cb62807e661b01492e8d1b33e51c705010ebf61a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842577 +0000 checkout: moving from 85bc77de28460cb10f079df4f015b6100417ea51 to cb62807e661b01492e8d1b33e51c705010ebf61a
cb62807e661b01492e8d1b33e51c705010ebf61a b967dc305ebf2b0c0b558c577e198328712c5145 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842583 +0000 checkout: moving from cb62807e661b01492e8d1b33e51c705010ebf61a to b967dc305ebf2b0c0b558c577e198328712c5145
b967dc305ebf2b0c0b558c577e198328712c5145 f5ce7aa463240425761211af242abb2e398ee957 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842583 +0000 checkout: moving from b967dc305ebf2b0c0b558c577e198328712c5145 to f5ce7aa463240425761211af242abb2e398ee957
f5ce7aa463240425761211af242abb2e398ee957 4ca97397a72e0d26d9d70c8c5b52ff82d575f472 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842585 +0000 checkout: moving from f5ce7aa463240425761211af242abb2e398ee957 to 4ca97397a72e0d26d9d70c8c5b52ff82d575f472
4ca97397a72e0d26d9d70c8c5b52ff82d575f472 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842585 +0000 checkout: moving from 4ca97397a72e0d26d9d70c8c5b52ff82d575f472 to 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1
93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 afad056ec7f81dc00eb33fa8094c45ca1915fe8a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842597 +0000 checkout: moving from 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 to afad056ec7f81dc00eb33fa8094c45ca1915fe8a
afad056ec7f81dc00eb33fa8094c45ca1915fe8a 2d74140dfe282a04c701cc48eaf43dc0b37b738c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842597 +0000 checkout: moving from afad056ec7f81dc00eb33fa8094c45ca1915fe8a to 2d74140dfe282a04c701cc48eaf43dc0b37b738c
2d74140dfe282a04c701cc48eaf43dc0b37b738c aaa356199515fd53265e1d61db1156f6b876e282 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842599 +0000 checkout: moving from 2d74140dfe282a04c701cc48eaf43dc0b37b738c to aaa356199515fd53265e1d61db1156f6b876e282
aaa356199515fd53265e1d61db1156f6b876e282 0f7dc800a89716efe68b9eb836544ee25964a72f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842599 +0000 checkout: moving from aaa356199515fd53265e1d61db1156f6b876e282 to 0f7dc800a89716efe68b9eb836544ee25964a72f
0f7dc800a89716efe68b9eb836544ee25964a72f 0ca7eb0a4f66d1990604f6d2ccc429b1e95b29a5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842603 +0000 checkout: moving from 0f7dc800a89716efe68b9eb836544ee25964a72f to 0ca7eb0a4f66d1990604f6d2ccc429b1e95b29a5
0ca7eb0a4f66d1990604f6d2ccc429b1e95b29a5 aaa356199515fd53265e1d61db1156f6b876e282 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842603 +0000 checkout: moving from 0ca7eb0a4f66d1990604f6d2ccc429b1e95b29a5 to aaa356199515fd53265e1d61db1156f6b876e282
aaa356199515fd53265e1d61db1156f6b876e282 63c16c117a869426f2cbbfdaa099de449789fd18 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842606 +0000 checkout: moving from aaa356199515fd53265e1d61db1156f6b876e282 to 63c16c117a869426f2cbbfdaa099de449789fd18
63c16c117a869426f2cbbfdaa099de449789fd18 1458a9366aa9a001e25153f669a9a5bb8235a30b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842606 +0000 checkout: moving from 63c16c117a869426f2cbbfdaa099de449789fd18 to 1458a9366aa9a001e25153f669a9a5bb8235a30b
1458a9366aa9a001e25153f669a9a5bb8235a30b 3440475ca0ad59fadc23f583c9fc36594dda1318 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842608 +0000 checkout: moving from 1458a9366aa9a001e25153f669a9a5bb8235a30b to 3440475ca0ad59fadc23f583c9fc36594dda1318
3440475ca0ad59fadc23f583c9fc36594dda1318 afad056ec7f81dc00eb33fa8094c45ca1915fe8a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842608 +0000 checkout: moving from 3440475ca0ad59fadc23f583c9fc36594dda1318 to afad056ec7f81dc00eb33fa8094c45ca1915fe8a
afad056ec7f81dc00eb33fa8094c45ca1915fe8a 3e8fdc56e4e27bebe5ec25fd071cb33f2409b757 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842617 +0000 checkout: moving from afad056ec7f81dc00eb33fa8094c45ca1915fe8a to 3e8fdc56e4e27bebe5ec25fd071cb33f2409b757
3e8fdc56e4e27bebe5ec25fd071cb33f2409b757 3440475ca0ad59fadc23f583c9fc36594dda1318 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842617 +0000 checkout: moving from 3e8fdc56e4e27bebe5ec25fd071cb33f2409b757 to 3440475ca0ad59fadc23f583c9fc36594dda1318
3440475ca0ad59fadc23f583c9fc36594dda1318 b229e005c3d70f3c3d0ed7175f832c3d7eb9cd95 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842619 +0000 checkout: moving from 3440475ca0ad59fadc23f583c9fc36594dda1318 to b229e005c3d70f3c3d0ed7175f832c3d7eb9cd95
b229e005c3d70f3c3d0ed7175f832c3d7eb9cd95 804ffaeeda74514cd693fee3dd1d1250fd5cf353 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842619 +0000 checkout: moving from b229e005c3d70f3c3d0ed7175f832c3d7eb9cd95 to 804ffaeeda74514cd693fee3dd1d1250fd5cf353
804ffaeeda74514cd693fee3dd1d1250fd5cf353 5ab705de4407fa11b9235e1792095e4dfb4ae919 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842621 +0000 checkout: moving from 804ffaeeda74514cd693fee3dd1d1250fd5cf353 to 5ab705de4407fa11b9235e1792095e4dfb4ae919
5ab705de4407fa11b9235e1792095e4dfb4ae919 471f59dee1b24664c9d622f6c8e457cb12631dda jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842623 +0000 checkout: moving from 5ab705de4407fa11b9235e1792095e4dfb4ae919 to 471f59dee1b24664c9d622f6c8e457cb12631dda
471f59dee1b24664c9d622f6c8e457cb12631dda 6a89ffbbc3fd7d7f43e23fe38b17d7af44d73fed jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842623 +0000 checkout: moving from 471f59dee1b24664c9d622f6c8e457cb12631dda to 6a89ffbbc3fd7d7f43e23fe38b17d7af44d73fed
6a89ffbbc3fd7d7f43e23fe38b17d7af44d73fed ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842625 +0000 checkout: moving from 6a89ffbbc3fd7d7f43e23fe38b17d7af44d73fed to ec2dabe9a160377a0b42da5cdef34674a2bd0fe9
ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 471f59dee1b24664c9d622f6c8e457cb12631dda jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842625 +0000 checkout: moving from ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 to 471f59dee1b24664c9d622f6c8e457cb12631dda
471f59dee1b24664c9d622f6c8e457cb12631dda e0938a3a38c249c51a593183c574a71e60c6c790 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842627 +0000 checkout: moving from 471f59dee1b24664c9d622f6c8e457cb12631dda to e0938a3a38c249c51a593183c574a71e60c6c790
e0938a3a38c249c51a593183c574a71e60c6c790 ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842627 +0000 checkout: moving from e0938a3a38c249c51a593183c574a71e60c6c790 to ec2dabe9a160377a0b42da5cdef34674a2bd0fe9
ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842637 +0000 checkout: moving from ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 to 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce
1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce 9b1cd8f1c2b0ff811489f2f4c82456ee021bf1ae jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842637 +0000 checkout: moving from 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce to 9b1cd8f1c2b0ff811489f2f4c82456ee021bf1ae
9b1cd8f1c2b0ff811489f2f4c82456ee021bf1ae 232aa8737bae08a238ec78da1920db3add0d8439 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842639 +0000 checkout: moving from 9b1cd8f1c2b0ff811489f2f4c82456ee021bf1ae to 232aa8737bae08a238ec78da1920db3add0d8439
232aa8737bae08a238ec78da1920db3add0d8439 2cc9fc84bdac3097adc4e1e55a90cc82765718fd jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842639 +0000 checkout: moving from 232aa8737bae08a238ec78da1920db3add0d8439 to 2cc9fc84bdac3097adc4e1e55a90cc82765718fd
2cc9fc84bdac3097adc4e1e55a90cc82765718fd 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842643 +0000 checkout: moving from 2cc9fc84bdac3097adc4e1e55a90cc82765718fd to 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce
1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce 1cdbd149d7b8bd48693ed2748e12703bef9892b5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842647 +0000 checkout: moving from 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce to 1cdbd149d7b8bd48693ed2748e12703bef9892b5
1cdbd149d7b8bd48693ed2748e12703bef9892b5 c2687457a5d3ae185ea7b2b6b4eebf774ee98dd3 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842647 +0000 checkout: moving from 1cdbd149d7b8bd48693ed2748e12703bef9892b5 to c2687457a5d3ae185ea7b2b6b4eebf774ee98dd3
c2687457a5d3ae185ea7b2b6b4eebf774ee98dd3 cd77fd5abf3bb4401b31faa063ba368ce1681cc5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842649 +0000 checkout: moving from c2687457a5d3ae185ea7b2b6b4eebf774ee98dd3 to cd77fd5abf3bb4401b31faa063ba368ce1681cc5
cd77fd5abf3bb4401b31faa063ba368ce1681cc5 1cdbd149d7b8bd48693ed2748e12703bef9892b5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842649 +0000 checkout: moving from cd77fd5abf3bb4401b31faa063ba368ce1681cc5 to 1cdbd149d7b8bd48693ed2748e12703bef9892b5
1cdbd149d7b8bd48693ed2748e12703bef9892b5 f929541b704348cd72e7d49c9894d6b561700f14 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842651 +0000 checkout: moving from 1cdbd149d7b8bd48693ed2748e12703bef9892b5 to f929541b704348cd72e7d49c9894d6b561700f14
f929541b704348cd72e7d49c9894d6b561700f14 cd77fd5abf3bb4401b31faa063ba368ce1681cc5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842651 +0000 checkout: moving from f929541b704348cd72e7d49c9894d6b561700f14 to cd77fd5abf3bb4401b31faa063ba368ce1681cc5
cd77fd5abf3bb4401b31faa063ba368ce1681cc5 698cfbad6731990cec17cb69b0a617a8d8ef4689 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842653 +0000 checkout: moving from cd77fd5abf3bb4401b31faa063ba368ce1681cc5 to 698cfbad6731990cec17cb69b0a617a8d8ef4689
698cfbad6731990cec17cb69b0a617a8d8ef4689 f929541b704348cd72e7d49c9894d6b561700f14 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842653 +0000 checkout: moving from 698cfbad6731990cec17cb69b0a617a8d8ef4689 to f929541b704348cd72e7d49c9894d6b561700f14
f929541b704348cd72e7d49c9894d6b561700f14 cb308cb7a9b08178046f747c1f02c8385eeca28c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842657 +0000 checkout: moving from f929541b704348cd72e7d49c9894d6b561700f14 to cb308cb7a9b08178046f747c1f02c8385eeca28c
cb308cb7a9b08178046f747c1f02c8385eeca28c 9a111689f0565c3760fcaa82909725cc872b9816 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842657 +0000 checkout: moving from cb308cb7a9b08178046f747c1f02c8385eeca28c to 9a111689f0565c3760fcaa82909725cc872b9816
9a111689f0565c3760fcaa82909725cc872b9816 f183e1041c4cc840a85dc1f400e4889ae916b76c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842664 +0000 checkout: moving from 9a111689f0565c3760fcaa82909725cc872b9816 to f183e1041c4cc840a85dc1f400e4889ae916b76c
f183e1041c4cc840a85dc1f400e4889ae916b76c cb308cb7a9b08178046f747c1f02c8385eeca28c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842664 +0000 checkout: moving from f183e1041c4cc840a85dc1f400e4889ae916b76c to cb308cb7a9b08178046f747c1f02c8385eeca28c
cb308cb7a9b08178046f747c1f02c8385eeca28c 74225fd42fbf7ddcf2e2b37a340ee32ce157c92d jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842666 +0000 checkout: moving from cb308cb7a9b08178046f747c1f02c8385eeca28c to 74225fd42fbf7ddcf2e2b37a340ee32ce157c92d
74225fd42fbf7ddcf2e2b37a340ee32ce157c92d f183e1041c4cc840a85dc1f400e4889ae916b76c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842666 +0000 checkout: moving from 74225fd42fbf7ddcf2e2b37a340ee32ce157c92d to f183e1041c4cc840a85dc1f400e4889ae916b76c
f183e1041c4cc840a85dc1f400e4889ae916b76c 66c826d007a43c779d954a92bc50b40c176817c0 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842670 +0000 checkout: moving from f183e1041c4cc840a85dc1f400e4889ae916b76c to 66c826d007a43c779d954a92bc50b40c176817c0
66c826d007a43c779d954a92bc50b40c176817c0 4e000c54fecd054e60198211cc23ecc10330ae47 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842670 +0000 checkout: moving from 66c826d007a43c779d954a92bc50b40c176817c0 to 4e000c54fecd054e60198211cc23ecc10330ae47
4e000c54fecd054e60198211cc23ecc10330ae47 512d7cf5a68f9551461fecbf7a0dd2606e112624 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842684 +0000 checkout: moving from 4e000c54fecd054e60198211cc23ecc10330ae47 to 512d7cf5a68f9551461fecbf7a0dd2606e112624
512d7cf5a68f9551461fecbf7a0dd2606e112624 49028e83882edd8525435369632f70f2ab882a98 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842684 +0000 checkout: moving from 512d7cf5a68f9551461fecbf7a0dd2606e112624 to 49028e83882edd8525435369632f70f2ab882a98
49028e83882edd8525435369632f70f2ab882a98 cd6d9bdb0b757a2db2b366da0d887519a42c6383 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842686 +0000 checkout: moving from 49028e83882edd8525435369632f70f2ab882a98 to cd6d9bdb0b757a2db2b366da0d887519a42c6383
cd6d9bdb0b757a2db2b366da0d887519a42c6383 ba9475937ddc189a2c6f9b89074e03c0cf7a507f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842686 +0000 checkout: moving from cd6d9bdb0b757a2db2b366da0d887519a42c6383 to ba9475937ddc189a2c6f9b89074e03c0cf7a507f
ba9475937ddc189a2c6f9b89074e03c0cf7a507f db6a439d0b443d904a682b71000e7f7f485291fb jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842689 +0000 checkout: moving from ba9475937ddc189a2c6f9b89074e03c0cf7a507f to db6a439d0b443d904a682b71000e7f7f485291fb
db6a439d0b443d904a682b71000e7f7f485291fb d59638c876fcf350180001ab36b19b7dcdd5c947 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842689 +0000 checkout: moving from db6a439d0b443d904a682b71000e7f7f485291fb to d59638c876fcf350180001ab36b19b7dcdd5c947
d59638c876fcf350180001ab36b19b7dcdd5c947 02231213a7c18ca99de51ecc51a7bdd28d4f4d1a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842708 +0000 checkout: moving from d59638c876fcf350180001ab36b19b7dcdd5c947 to 02231213a7c18ca99de51ecc51a7bdd28d4f4d1a
02231213a7c18ca99de51ecc51a7bdd28d4f4d1a 25c3230050d25dc248557f0e2df55c3fa605758c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842709 +0000 checkout: moving from 02231213a7c18ca99de51ecc51a7bdd28d4f4d1a to 25c3230050d25dc248557f0e2df55c3fa605758c
25c3230050d25dc248557f0e2df55c3fa605758c 19926c488fde408a7c0de6be01c6258b70772671 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842713 +0000 checkout: moving from 25c3230050d25dc248557f0e2df55c3fa605758c to 19926c488fde408a7c0de6be01c6258b70772671
19926c488fde408a7c0de6be01c6258b70772671 eb78ceb29ff7249fec4a04f07aeaff7133a8619c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842713 +0000 checkout: moving from 19926c488fde408a7c0de6be01c6258b70772671 to eb78ceb29ff7249fec4a04f07aeaff7133a8619c
eb78ceb29ff7249fec4a04f07aeaff7133a8619c 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842717 +0000 checkout: moving from eb78ceb29ff7249fec4a04f07aeaff7133a8619c to 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9
0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 4c7ab9379eb05c3f63d2f856d4568598e59afca4 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842717 +0000 checkout: moving from 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 to 4c7ab9379eb05c3f63d2f856d4568598e59afca4
4c7ab9379eb05c3f63d2f856d4568598e59afca4 eb78ceb29ff7249fec4a04f07aeaff7133a8619c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842719 +0000 checkout: moving from 4c7ab9379eb05c3f63d2f856d4568598e59afca4 to eb78ceb29ff7249fec4a04f07aeaff7133a8619c
eb78ceb29ff7249fec4a04f07aeaff7133a8619c b1aba93472aad9a799a8315e09e146199348ccea jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842719 +0000 checkout: moving from eb78ceb29ff7249fec4a04f07aeaff7133a8619c to b1aba93472aad9a799a8315e09e146199348ccea
b1aba93472aad9a799a8315e09e146199348ccea 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842721 +0000 checkout: moving from b1aba93472aad9a799a8315e09e146199348ccea to 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc
0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842721 +0000 checkout: moving from 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc to 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9
0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 a9579f1777abd16a6e901a964bc0914354e9c30a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842723 +0000 checkout: moving from 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 to a9579f1777abd16a6e901a964bc0914354e9c30a
a9579f1777abd16a6e901a964bc0914354e9c30a 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842723 +0000 checkout: moving from a9579f1777abd16a6e901a964bc0914354e9c30a to 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc
0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc 9d27eb810e4689858d5812225663f67753bb610b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842725 +0000 checkout: moving from 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc to 9d27eb810e4689858d5812225663f67753bb610b
9d27eb810e4689858d5812225663f67753bb610b a9579f1777abd16a6e901a964bc0914354e9c30a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842725 +0000 checkout: moving from 9d27eb810e4689858d5812225663f67753bb610b to a9579f1777abd16a6e901a964bc0914354e9c30a
a9579f1777abd16a6e901a964bc0914354e9c30a ced8ad9384e84e6b9641cd44d947a9de296a92d1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842731 +0000 checkout: moving from a9579f1777abd16a6e901a964bc0914354e9c30a to ced8ad9384e84e6b9641cd44d947a9de296a92d1
ced8ad9384e84e6b9641cd44d947a9de296a92d1 e3448dddbf53282392906fd77a457ac6fef7b653 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842731 +0000 checkout: moving from ced8ad9384e84e6b9641cd44d947a9de296a92d1 to e3448dddbf53282392906fd77a457ac6fef7b653
e3448dddbf53282392906fd77a457ac6fef7b653 79d90057e15f1214e76139c502198c3fb0a70249 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842736 +0000 checkout: moving from e3448dddbf53282392906fd77a457ac6fef7b653 to 79d90057e15f1214e76139c502198c3fb0a70249
79d90057e15f1214e76139c502198c3fb0a70249 b6237bb05f101ff26d266f7835a02eb07b1ddc0a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842736 +0000 checkout: moving from 79d90057e15f1214e76139c502198c3fb0a70249 to b6237bb05f101ff26d266f7835a02eb07b1ddc0a
b6237bb05f101ff26d266f7835a02eb07b1ddc0a f4ae484012d916cb39a906484746abf44a4e09f6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842738 +0000 checkout: moving from b6237bb05f101ff26d266f7835a02eb07b1ddc0a to f4ae484012d916cb39a906484746abf44a4e09f6
f4ae484012d916cb39a906484746abf44a4e09f6 c5206d5c8fa08e8b6250aacc39cacd12d5caf30e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842738 +0000 checkout: moving from f4ae484012d916cb39a906484746abf44a4e09f6 to c5206d5c8fa08e8b6250aacc39cacd12d5caf30e
c5206d5c8fa08e8b6250aacc39cacd12d5caf30e 96ee53a2c98da763ef0e7557af33c03a8d2ae297 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842740 +0000 checkout: moving from c5206d5c8fa08e8b6250aacc39cacd12d5caf30e to 96ee53a2c98da763ef0e7557af33c03a8d2ae297
96ee53a2c98da763ef0e7557af33c03a8d2ae297 f4ae484012d916cb39a906484746abf44a4e09f6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842740 +0000 checkout: moving from 96ee53a2c98da763ef0e7557af33c03a8d2ae297 to f4ae484012d916cb39a906484746abf44a4e09f6
f4ae484012d916cb39a906484746abf44a4e09f6 7fb6b8b818ed4c9d82c95086d78b6049d1292604 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842771 +0000 checkout: moving from f4ae484012d916cb39a906484746abf44a4e09f6 to 7fb6b8b818ed4c9d82c95086d78b6049d1292604
7fb6b8b818ed4c9d82c95086d78b6049d1292604 96ee53a2c98da763ef0e7557af33c03a8d2ae297 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842771 +0000 checkout: moving from 7fb6b8b818ed4c9d82c95086d78b6049d1292604 to 96ee53a2c98da763ef0e7557af33c03a8d2ae297
96ee53a2c98da763ef0e7557af33c03a8d2ae297 586cc3b632875e5cc097d7bbfdb5ef0ba9aa53a1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842777 +0000 checkout: moving from 96ee53a2c98da763ef0e7557af33c03a8d2ae297 to 586cc3b632875e5cc097d7bbfdb5ef0ba9aa53a1
586cc3b632875e5cc097d7bbfdb5ef0ba9aa53a1 02f0dca24f16d57c16e1aa18c98b8f1dc04785b6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842777 +0000 checkout: moving from 586cc3b632875e5cc097d7bbfdb5ef0ba9aa53a1 to 02f0dca24f16d57c16e1aa18c98b8f1dc04785b6
02f0dca24f16d57c16e1aa18c98b8f1dc04785b6 aea31ece541a8b8a52b35c6cc80f1a78ffbe42c5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842788 +0000 checkout: moving from 02f0dca24f16d57c16e1aa18c98b8f1dc04785b6 to aea31ece541a8b8a52b35c6cc80f1a78ffbe42c5
aea31ece541a8b8a52b35c6cc80f1a78ffbe42c5 259aa4109176ba735521ea11fe2d97ad075f5762 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842788 +0000 checkout: moving from aea31ece541a8b8a52b35c6cc80f1a78ffbe42c5 to 259aa4109176ba735521ea11fe2d97ad075f5762
259aa4109176ba735521ea11fe2d97ad075f5762 b2c101aaecd34339afcc4844311f37280d03d48e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842804 +0000 checkout: moving from 259aa4109176ba735521ea11fe2d97ad075f5762 to b2c101aaecd34339afcc4844311f37280d03d48e
b2c101aaecd34339afcc4844311f37280d03d48e a62881d3405c2fef72e42a643803aa870bcb0dd8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842804 +0000 checkout: moving from b2c101aaecd34339afcc4844311f37280d03d48e to a62881d3405c2fef72e42a643803aa870bcb0dd8
a62881d3405c2fef72e42a643803aa870bcb0dd8 334f2587736a0d025fcf8a3c3b0608dbcae5bc79 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842811 +0000 checkout: moving from a62881d3405c2fef72e42a643803aa870bcb0dd8 to 334f2587736a0d025fcf8a3c3b0608dbcae5bc79
334f2587736a0d025fcf8a3c3b0608dbcae5bc79 9e19898c6dc3e14fa1424a827ecc60519e21bd16 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842811 +0000 checkout: moving from 334f2587736a0d025fcf8a3c3b0608dbcae5bc79 to 9e19898c6dc3e14fa1424a827ecc60519e21bd16
9e19898c6dc3e14fa1424a827ecc60519e21bd16 d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842830 +0000 checkout: moving from 9e19898c6dc3e14fa1424a827ecc60519e21bd16 to d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed
d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed 729e1fd4598a470f985dedf9e53eb57907f88762 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842830 +0000 checkout: moving from d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed to 729e1fd4598a470f985dedf9e53eb57907f88762
729e1fd4598a470f985dedf9e53eb57907f88762 02a4df52a8682f57b2d917dfd2eda763ada20ace jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842832 +0000 checkout: moving from 729e1fd4598a470f985dedf9e53eb57907f88762 to 02a4df52a8682f57b2d917dfd2eda763ada20ace
02a4df52a8682f57b2d917dfd2eda763ada20ace d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842832 +0000 checkout: moving from 02a4df52a8682f57b2d917dfd2eda763ada20ace to d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed
d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842839 +0000 checkout: moving from d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed to 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b
2b2552941e9f01b99bf33fdb9aec6b5220afdd4b fb135bbbb8a31b4112a3c2b1b3dcd6d2619c4da6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842839 +0000 checkout: moving from 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b to fb135bbbb8a31b4112a3c2b1b3dcd6d2619c4da6
fb135bbbb8a31b4112a3c2b1b3dcd6d2619c4da6 cd34fdb19114127cee32da5dd61ab0fbe9e88879 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842841 +0000 checkout: moving from fb135bbbb8a31b4112a3c2b1b3dcd6d2619c4da6 to cd34fdb19114127cee32da5dd61ab0fbe9e88879
cd34fdb19114127cee32da5dd61ab0fbe9e88879 3901bb43c7713aad08c3a18684e6e23837ee126e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842841 +0000 checkout: moving from cd34fdb19114127cee32da5dd61ab0fbe9e88879 to 3901bb43c7713aad08c3a18684e6e23837ee126e
3901bb43c7713aad08c3a18684e6e23837ee126e 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842845 +0000 checkout: moving from 3901bb43c7713aad08c3a18684e6e23837ee126e to 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b
2b2552941e9f01b99bf33fdb9aec6b5220afdd4b 98f7c8b688852fe3c91c556ac72a83e63612837d jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842849 +0000 checkout: moving from 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b to 98f7c8b688852fe3c91c556ac72a83e63612837d
98f7c8b688852fe3c91c556ac72a83e63612837d 09d2fa3906ba3c71e87f947065325a2f8afdab9e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842849 +0000 checkout: moving from 98f7c8b688852fe3c91c556ac72a83e63612837d to 09d2fa3906ba3c71e87f947065325a2f8afdab9e
09d2fa3906ba3c71e87f947065325a2f8afdab9e 85d6b870c1fb8ff07f4bedf0043ece0e112d0968 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842858 +0000 checkout: moving from 09d2fa3906ba3c71e87f947065325a2f8afdab9e to 85d6b870c1fb8ff07f4bedf0043ece0e112d0968
85d6b870c1fb8ff07f4bedf0043ece0e112d0968 a89d081bac735af3392a65cb6a6b762f182b608c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842858 +0000 checkout: moving from 85d6b870c1fb8ff07f4bedf0043ece0e112d0968 to a89d081bac735af3392a65cb6a6b762f182b608c
a89d081bac735af3392a65cb6a6b762f182b608c 5670807f00e11cba15b211954638e7a980a299cc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842860 +0000 checkout: moving from a89d081bac735af3392a65cb6a6b762f182b608c to 5670807f00e11cba15b211954638e7a980a299cc
5670807f00e11cba15b211954638e7a980a299cc 98f7c8b688852fe3c91c556ac72a83e63612837d jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842860 +0000 checkout: moving from 5670807f00e11cba15b211954638e7a980a299cc to 98f7c8b688852fe3c91c556ac72a83e63612837d
98f7c8b688852fe3c91c556ac72a83e63612837d 2fb347993586c41b925edca37c4c91e3dd054ff0 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842879 +0000 checkout: moving from 98f7c8b688852fe3c91c556ac72a83e63612837d to 2fb347993586c41b925edca37c4c91e3dd054ff0
2fb347993586c41b925edca37c4c91e3dd054ff0 c488995e159e54b9fdc842edcaef4fdb00aff497 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842879 +0000 checkout: moving from 2fb347993586c41b925edca37c4c91e3dd054ff0 to c488995e159e54b9fdc842edcaef4fdb00aff497
c488995e159e54b9fdc842edcaef4fdb00aff497 d8b685ea6c3b01270dc37012b62192fd09b97d68 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842884 +0000 checkout: moving from c488995e159e54b9fdc842edcaef4fdb00aff497 to d8b685ea6c3b01270dc37012b62192fd09b97d68
d8b685ea6c3b01270dc37012b62192fd09b97d68 d5931784dcdf1c414183bc816010a209463ec287 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842884 +0000 checkout: moving from d8b685ea6c3b01270dc37012b62192fd09b97d68 to d5931784dcdf1c414183bc816010a209463ec287
d5931784dcdf1c414183bc816010a209463ec287 2455c0f25b07fb42d628df194a1a35dbc0a95ea6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842886 +0000 checkout: moving from d5931784dcdf1c414183bc816010a209463ec287 to 2455c0f25b07fb42d628df194a1a35dbc0a95ea6
2455c0f25b07fb42d628df194a1a35dbc0a95ea6 debf749a604e226b4e9414d47db3da5269eae60a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842886 +0000 checkout: moving from 2455c0f25b07fb42d628df194a1a35dbc0a95ea6 to debf749a604e226b4e9414d47db3da5269eae60a
debf749a604e226b4e9414d47db3da5269eae60a bbc2c73896bf07a5ee4cc03141e78438bd082af8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842892 +0000 checkout: moving from debf749a604e226b4e9414d47db3da5269eae60a to bbc2c73896bf07a5ee4cc03141e78438bd082af8
bbc2c73896bf07a5ee4cc03141e78438bd082af8 0b5d2277b5f3edf1e38f2c18ce284e88238ff732 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842892 +0000 checkout: moving from bbc2c73896bf07a5ee4cc03141e78438bd082af8 to 0b5d2277b5f3edf1e38f2c18ce284e88238ff732
0b5d2277b5f3edf1e38f2c18ce284e88238ff732 ec9534f072e87fea987b0760342ed6308d2c9634 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842896 +0000 checkout: moving from 0b5d2277b5f3edf1e38f2c18ce284e88238ff732 to ec9534f072e87fea987b0760342ed6308d2c9634
ec9534f072e87fea987b0760342ed6308d2c9634 cd4450317bb7790aa6901fbf7ddea36128f46dd1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842896 +0000 checkout: moving from ec9534f072e87fea987b0760342ed6308d2c9634 to cd4450317bb7790aa6901fbf7ddea36128f46dd1
cd4450317bb7790aa6901fbf7ddea36128f46dd1 421e5f6f718bf8088e007ea9874f143be35e06d8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842898 +0000 checkout: moving from cd4450317bb7790aa6901fbf7ddea36128f46dd1 to 421e5f6f718bf8088e007ea9874f143be35e06d8
421e5f6f718bf8088e007ea9874f143be35e06d8 bbc2c73896bf07a5ee4cc03141e78438bd082af8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842898 +0000 checkout: moving from 421e5f6f718bf8088e007ea9874f143be35e06d8 to bbc2c73896bf07a5ee4cc03141e78438bd082af8
bbc2c73896bf07a5ee4cc03141e78438bd082af8 8008a551cc1d599deed55dd57833b97f33a89fe3 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842907 +0000 checkout: moving from bbc2c73896bf07a5ee4cc03141e78438bd082af8 to 8008a551cc1d599deed55dd57833b97f33a89fe3
8008a551cc1d599deed55dd57833b97f33a89fe3 2455c0f25b07fb42d628df194a1a35dbc0a95ea6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842907 +0000 checkout: moving from 8008a551cc1d599deed55dd57833b97f33a89fe3 to 2455c0f25b07fb42d628df194a1a35dbc0a95ea6
2455c0f25b07fb42d628df194a1a35dbc0a95ea6 560284d25e3ed9a08ed483af1afc0cd5e2e87ed4 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842911 +0000 checkout: moving from 2455c0f25b07fb42d628df194a1a35dbc0a95ea6 to 560284d25e3ed9a08ed483af1afc0cd5e2e87ed4
560284d25e3ed9a08ed483af1afc0cd5e2e87ed4 ec9534f072e87fea987b0760342ed6308d2c9634 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842911 +0000 checkout: moving from 560284d25e3ed9a08ed483af1afc0cd5e2e87ed4 to ec9534f072e87fea987b0760342ed6308d2c9634
ec9534f072e87fea987b0760342ed6308d2c9634 fea6325e2e69d68931089ac29e7809f2e01e98cf jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842922 +0000 checkout: moving from ec9534f072e87fea987b0760342ed6308d2c9634 to fea6325e2e69d68931089ac29e7809f2e01e98cf
fea6325e2e69d68931089ac29e7809f2e01e98cf 9f072d823a1eb18fb9105f182622dfa490a9991b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842922 +0000 checkout: moving from fea6325e2e69d68931089ac29e7809f2e01e98cf to 9f072d823a1eb18fb9105f182622dfa490a9991b
9f072d823a1eb18fb9105f182622dfa490a9991b 64a6eafccb7f407621d3b8fb967bfb789e5b28bd jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842924 +0000 checkout: moving from 9f072d823a1eb18fb9105f182622dfa490a9991b to 64a6eafccb7f407621d3b8fb967bfb789e5b28bd
64a6eafccb7f407621d3b8fb967bfb789e5b28bd aa9b7ebd01f860c20df9c14129dbbc35cb9d989c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842924 +0000 checkout: moving from 64a6eafccb7f407621d3b8fb967bfb789e5b28bd to aa9b7ebd01f860c20df9c14129dbbc35cb9d989c
aa9b7ebd01f860c20df9c14129dbbc35cb9d989c 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842928 +0000 checkout: moving from aa9b7ebd01f860c20df9c14129dbbc35cb9d989c to 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c
7b6f4c9342d49fcfd2919281b82bbd249bc29e4c 55b3be6bccede9757826f3b9524df89a9ba81baa jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842928 +0000 checkout: moving from 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c to 55b3be6bccede9757826f3b9524df89a9ba81baa
55b3be6bccede9757826f3b9524df89a9ba81baa 9f072d823a1eb18fb9105f182622dfa490a9991b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842932 +0000 checkout: moving from 55b3be6bccede9757826f3b9524df89a9ba81baa to 9f072d823a1eb18fb9105f182622dfa490a9991b
9f072d823a1eb18fb9105f182622dfa490a9991b 2d9d3a70a200eba3b6584c0ddb4f0d778e8338fc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842933 +0000 checkout: moving from 9f072d823a1eb18fb9105f182622dfa490a9991b to 2d9d3a70a200eba3b6584c0ddb4f0d778e8338fc
2d9d3a70a200eba3b6584c0ddb4f0d778e8338fc 772d2fa862b6622bbeb31b50437680887a35e749 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842935 +0000 checkout: moving from 2d9d3a70a200eba3b6584c0ddb4f0d778e8338fc to 772d2fa862b6622bbeb31b50437680887a35e749
772d2fa862b6622bbeb31b50437680887a35e749 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842935 +0000 checkout: moving from 772d2fa862b6622bbeb31b50437680887a35e749 to 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c
7b6f4c9342d49fcfd2919281b82bbd249bc29e4c aa9b7ebd01f860c20df9c14129dbbc35cb9d989c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842943 +0000 checkout: moving from 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c to aa9b7ebd01f860c20df9c14129dbbc35cb9d989c
aa9b7ebd01f860c20df9c14129dbbc35cb9d989c 1615dfe94491320668efa40dc752b2f873001fc7 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842943 +0000 checkout: moving from aa9b7ebd01f860c20df9c14129dbbc35cb9d989c to 1615dfe94491320668efa40dc752b2f873001fc7
1615dfe94491320668efa40dc752b2f873001fc7 2c9b4dccbcf31012913b270cc356a30ab0cab89f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842949 +0000 checkout: moving from 1615dfe94491320668efa40dc752b2f873001fc7 to 2c9b4dccbcf31012913b270cc356a30ab0cab89f
2c9b4dccbcf31012913b270cc356a30ab0cab89f 2e2919d21c4590212b6b471075f81749e4606c26 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842950 +0000 checkout: moving from 2c9b4dccbcf31012913b270cc356a30ab0cab89f to 2e2919d21c4590212b6b471075f81749e4606c26
| 0000000000000000000000000000000000000000 6657a58831a544606f78177b61d92bb959ccce94 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704839356 +0000 clone: from https://github.com/apolloconfig/apollo.git
6657a58831a544606f78177b61d92bb959ccce94 01b02325d1def997c1b80831c0e0ac4c262e1390 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842283 +0000 checkout: moving from master to 01b02325d1def997c1b80831c0e0ac4c262e1390
01b02325d1def997c1b80831c0e0ac4c262e1390 06fcb2afa2e362a37820333176f96e867661ec96 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842283 +0000 checkout: moving from 01b02325d1def997c1b80831c0e0ac4c262e1390 to 06fcb2afa2e362a37820333176f96e867661ec96
06fcb2afa2e362a37820333176f96e867661ec96 d56a92f7ccba7b4bfaad63fbd915d7680b25090e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842289 +0000 checkout: moving from 06fcb2afa2e362a37820333176f96e867661ec96 to d56a92f7ccba7b4bfaad63fbd915d7680b25090e
d56a92f7ccba7b4bfaad63fbd915d7680b25090e b67db2b20029a8e95377b599129d749dee19fb9b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842289 +0000 checkout: moving from d56a92f7ccba7b4bfaad63fbd915d7680b25090e to b67db2b20029a8e95377b599129d749dee19fb9b
b67db2b20029a8e95377b599129d749dee19fb9b bc55ba65451ab5aabf8a050a0c0e4287b84954f2 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842293 +0000 checkout: moving from b67db2b20029a8e95377b599129d749dee19fb9b to bc55ba65451ab5aabf8a050a0c0e4287b84954f2
bc55ba65451ab5aabf8a050a0c0e4287b84954f2 6812a1a670fb0a3afa15f535d5dcade8ff4f818a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842293 +0000 checkout: moving from bc55ba65451ab5aabf8a050a0c0e4287b84954f2 to 6812a1a670fb0a3afa15f535d5dcade8ff4f818a
6812a1a670fb0a3afa15f535d5dcade8ff4f818a 57cca962e3408a73516621e7c40490ec4b4c70e1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842303 +0000 checkout: moving from 6812a1a670fb0a3afa15f535d5dcade8ff4f818a to 57cca962e3408a73516621e7c40490ec4b4c70e1
57cca962e3408a73516621e7c40490ec4b4c70e1 1deb136c2c40eeb581c43863ee786b8bd0c754f1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842303 +0000 checkout: moving from 57cca962e3408a73516621e7c40490ec4b4c70e1 to 1deb136c2c40eeb581c43863ee786b8bd0c754f1
1deb136c2c40eeb581c43863ee786b8bd0c754f1 84c1d0bfe64086ab2f794f5c4a1b658b6f1e5949 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842307 +0000 checkout: moving from 1deb136c2c40eeb581c43863ee786b8bd0c754f1 to 84c1d0bfe64086ab2f794f5c4a1b658b6f1e5949
84c1d0bfe64086ab2f794f5c4a1b658b6f1e5949 a23b3a841563cea3aa8ff09d398d367955ebbb63 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842307 +0000 checkout: moving from 84c1d0bfe64086ab2f794f5c4a1b658b6f1e5949 to a23b3a841563cea3aa8ff09d398d367955ebbb63
a23b3a841563cea3aa8ff09d398d367955ebbb63 57cca962e3408a73516621e7c40490ec4b4c70e1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842309 +0000 checkout: moving from a23b3a841563cea3aa8ff09d398d367955ebbb63 to 57cca962e3408a73516621e7c40490ec4b4c70e1
57cca962e3408a73516621e7c40490ec4b4c70e1 a4df1a32d9696e74b708005f7c8245f3477c7e34 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842329 +0000 checkout: moving from 57cca962e3408a73516621e7c40490ec4b4c70e1 to a4df1a32d9696e74b708005f7c8245f3477c7e34
a4df1a32d9696e74b708005f7c8245f3477c7e34 4f4a8f7bfba6797d39f322ff31e3bc9252585fdc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842329 +0000 checkout: moving from a4df1a32d9696e74b708005f7c8245f3477c7e34 to 4f4a8f7bfba6797d39f322ff31e3bc9252585fdc
4f4a8f7bfba6797d39f322ff31e3bc9252585fdc 3a6ff67af3a658171e645bd1e53b4f441ad31c7f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842333 +0000 checkout: moving from 4f4a8f7bfba6797d39f322ff31e3bc9252585fdc to 3a6ff67af3a658171e645bd1e53b4f441ad31c7f
3a6ff67af3a658171e645bd1e53b4f441ad31c7f b30cbe552a2eb03c2d0659f6ab6286130ca425ff jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842333 +0000 checkout: moving from 3a6ff67af3a658171e645bd1e53b4f441ad31c7f to b30cbe552a2eb03c2d0659f6ab6286130ca425ff
b30cbe552a2eb03c2d0659f6ab6286130ca425ff 4acee4217af72c69594843d51eaf853a1b6c1ac8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842339 +0000 checkout: moving from b30cbe552a2eb03c2d0659f6ab6286130ca425ff to 4acee4217af72c69594843d51eaf853a1b6c1ac8
4acee4217af72c69594843d51eaf853a1b6c1ac8 a86ed25fb032d35f62a4c0a8364459acb92c4d07 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842339 +0000 checkout: moving from 4acee4217af72c69594843d51eaf853a1b6c1ac8 to a86ed25fb032d35f62a4c0a8364459acb92c4d07
a86ed25fb032d35f62a4c0a8364459acb92c4d07 84af88fce42397a12d3552b3f829234e08d41e03 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842344 +0000 checkout: moving from a86ed25fb032d35f62a4c0a8364459acb92c4d07 to 84af88fce42397a12d3552b3f829234e08d41e03
84af88fce42397a12d3552b3f829234e08d41e03 11303c70a009e5ea5d6d2207f64e3b1926c64387 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842344 +0000 checkout: moving from 84af88fce42397a12d3552b3f829234e08d41e03 to 11303c70a009e5ea5d6d2207f64e3b1926c64387
11303c70a009e5ea5d6d2207f64e3b1926c64387 2800a00e928333d579fe1e78791c82c7cf352562 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842346 +0000 checkout: moving from 11303c70a009e5ea5d6d2207f64e3b1926c64387 to 2800a00e928333d579fe1e78791c82c7cf352562
2800a00e928333d579fe1e78791c82c7cf352562 0b8d655bea556c746494b1338e4e165ab2855a65 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842346 +0000 checkout: moving from 2800a00e928333d579fe1e78791c82c7cf352562 to 0b8d655bea556c746494b1338e4e165ab2855a65
0b8d655bea556c746494b1338e4e165ab2855a65 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842350 +0000 checkout: moving from 0b8d655bea556c746494b1338e4e165ab2855a65 to 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5
83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 3ef13f8b53335b90002d88518c6cb76f294e554e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842350 +0000 checkout: moving from 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 to 3ef13f8b53335b90002d88518c6cb76f294e554e
3ef13f8b53335b90002d88518c6cb76f294e554e 5b85b42450c27578c7a1bcb374fe8ed3d987b238 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842352 +0000 checkout: moving from 3ef13f8b53335b90002d88518c6cb76f294e554e to 5b85b42450c27578c7a1bcb374fe8ed3d987b238
5b85b42450c27578c7a1bcb374fe8ed3d987b238 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842352 +0000 checkout: moving from 5b85b42450c27578c7a1bcb374fe8ed3d987b238 to 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5
83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 e11854f9a465a6b3081f0ccd640c4c97421bad64 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842357 +0000 checkout: moving from 83447884e6ec48f7fdf7d811ff2d21c1c1e9e9b5 to e11854f9a465a6b3081f0ccd640c4c97421bad64
e11854f9a465a6b3081f0ccd640c4c97421bad64 5903691ce3bdaea6ba4ace4c76373ce85919d9d8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842357 +0000 checkout: moving from e11854f9a465a6b3081f0ccd640c4c97421bad64 to 5903691ce3bdaea6ba4ace4c76373ce85919d9d8
5903691ce3bdaea6ba4ace4c76373ce85919d9d8 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842365 +0000 checkout: moving from 5903691ce3bdaea6ba4ace4c76373ce85919d9d8 to 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8
670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 c6dfe76d6c76b96c0f2ac9aac836cbdd325908dd jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842365 +0000 checkout: moving from 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 to c6dfe76d6c76b96c0f2ac9aac836cbdd325908dd
c6dfe76d6c76b96c0f2ac9aac836cbdd325908dd bb15beca157d3623f0fa9f40a1d77c37d7776649 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842367 +0000 checkout: moving from c6dfe76d6c76b96c0f2ac9aac836cbdd325908dd to bb15beca157d3623f0fa9f40a1d77c37d7776649
bb15beca157d3623f0fa9f40a1d77c37d7776649 b7af5ccc691bb909dacf04069cba2215e61ebd34 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842369 +0000 checkout: moving from bb15beca157d3623f0fa9f40a1d77c37d7776649 to b7af5ccc691bb909dacf04069cba2215e61ebd34
b7af5ccc691bb909dacf04069cba2215e61ebd34 196c8f9ab7ba3144d28bdc28eb1db5ff3ae3056f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842369 +0000 checkout: moving from b7af5ccc691bb909dacf04069cba2215e61ebd34 to 196c8f9ab7ba3144d28bdc28eb1db5ff3ae3056f
196c8f9ab7ba3144d28bdc28eb1db5ff3ae3056f a6c7aa62c631c7ff3ce482d05b3d4c213090f261 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842375 +0000 checkout: moving from 196c8f9ab7ba3144d28bdc28eb1db5ff3ae3056f to a6c7aa62c631c7ff3ce482d05b3d4c213090f261
a6c7aa62c631c7ff3ce482d05b3d4c213090f261 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842375 +0000 checkout: moving from a6c7aa62c631c7ff3ce482d05b3d4c213090f261 to 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8
670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 b2e7eed597da6a5577fa2e83409d5939521190f8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842392 +0000 checkout: moving from 670cc0ea8faa40ea99db8ee3ec7e5f64320509f8 to b2e7eed597da6a5577fa2e83409d5939521190f8
b2e7eed597da6a5577fa2e83409d5939521190f8 9bed63419c8f010087584493a2035ad1952e463c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842392 +0000 checkout: moving from b2e7eed597da6a5577fa2e83409d5939521190f8 to 9bed63419c8f010087584493a2035ad1952e463c
9bed63419c8f010087584493a2035ad1952e463c 2f311ae79f36f45d39429814c66d248cd7a69959 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842398 +0000 checkout: moving from 9bed63419c8f010087584493a2035ad1952e463c to 2f311ae79f36f45d39429814c66d248cd7a69959
2f311ae79f36f45d39429814c66d248cd7a69959 8418434c8ffc55611fc4f5ad467e33b29e5f7308 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842402 +0000 checkout: moving from 2f311ae79f36f45d39429814c66d248cd7a69959 to 8418434c8ffc55611fc4f5ad467e33b29e5f7308
8418434c8ffc55611fc4f5ad467e33b29e5f7308 bd0600f0d405c08864a44e23b1282f15d86e651c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842402 +0000 checkout: moving from 8418434c8ffc55611fc4f5ad467e33b29e5f7308 to bd0600f0d405c08864a44e23b1282f15d86e651c
bd0600f0d405c08864a44e23b1282f15d86e651c 819014fc156cecc8992ecab2cb1d6446b3b40ca3 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842404 +0000 checkout: moving from bd0600f0d405c08864a44e23b1282f15d86e651c to 819014fc156cecc8992ecab2cb1d6446b3b40ca3
819014fc156cecc8992ecab2cb1d6446b3b40ca3 8418434c8ffc55611fc4f5ad467e33b29e5f7308 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842404 +0000 checkout: moving from 819014fc156cecc8992ecab2cb1d6446b3b40ca3 to 8418434c8ffc55611fc4f5ad467e33b29e5f7308
8418434c8ffc55611fc4f5ad467e33b29e5f7308 78099b4a5161f6e0caa3ea94e444536baeab49fb jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842434 +0000 checkout: moving from 8418434c8ffc55611fc4f5ad467e33b29e5f7308 to 78099b4a5161f6e0caa3ea94e444536baeab49fb
78099b4a5161f6e0caa3ea94e444536baeab49fb d2084f01a1054d7b6a019941d9c127391215a4d4 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842434 +0000 checkout: moving from 78099b4a5161f6e0caa3ea94e444536baeab49fb to d2084f01a1054d7b6a019941d9c127391215a4d4
d2084f01a1054d7b6a019941d9c127391215a4d4 a0c09b5cbab358a50b3763ad532435a4d08c6a44 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842444 +0000 checkout: moving from d2084f01a1054d7b6a019941d9c127391215a4d4 to a0c09b5cbab358a50b3763ad532435a4d08c6a44
a0c09b5cbab358a50b3763ad532435a4d08c6a44 d9726af858a282b8678eb2eac60ba73f5927c2dc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842444 +0000 checkout: moving from a0c09b5cbab358a50b3763ad532435a4d08c6a44 to d9726af858a282b8678eb2eac60ba73f5927c2dc
d9726af858a282b8678eb2eac60ba73f5927c2dc e773940605df070748b01a49aea047a143578d7a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842446 +0000 checkout: moving from d9726af858a282b8678eb2eac60ba73f5927c2dc to e773940605df070748b01a49aea047a143578d7a
e773940605df070748b01a49aea047a143578d7a a0c09b5cbab358a50b3763ad532435a4d08c6a44 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842446 +0000 checkout: moving from e773940605df070748b01a49aea047a143578d7a to a0c09b5cbab358a50b3763ad532435a4d08c6a44
a0c09b5cbab358a50b3763ad532435a4d08c6a44 8a459447f2867c248d0e6dbc2cace49a28672954 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842452 +0000 checkout: moving from a0c09b5cbab358a50b3763ad532435a4d08c6a44 to 8a459447f2867c248d0e6dbc2cace49a28672954
8a459447f2867c248d0e6dbc2cace49a28672954 f28a01a7e02b2b07031f52ab97f86e33794a96a1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842452 +0000 checkout: moving from 8a459447f2867c248d0e6dbc2cace49a28672954 to f28a01a7e02b2b07031f52ab97f86e33794a96a1
f28a01a7e02b2b07031f52ab97f86e33794a96a1 8dd30712b1b411f6f53c52d56dd89f6afbf0b193 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842460 +0000 checkout: moving from f28a01a7e02b2b07031f52ab97f86e33794a96a1 to 8dd30712b1b411f6f53c52d56dd89f6afbf0b193
8dd30712b1b411f6f53c52d56dd89f6afbf0b193 fed54f790d067d771ea7b51eb6538a3b23777f7b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842460 +0000 checkout: moving from 8dd30712b1b411f6f53c52d56dd89f6afbf0b193 to fed54f790d067d771ea7b51eb6538a3b23777f7b
fed54f790d067d771ea7b51eb6538a3b23777f7b 0b9ade603392b23b3aefde4200e789ce86b61efa jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842463 +0000 checkout: moving from fed54f790d067d771ea7b51eb6538a3b23777f7b to 0b9ade603392b23b3aefde4200e789ce86b61efa
0b9ade603392b23b3aefde4200e789ce86b61efa 8dd30712b1b411f6f53c52d56dd89f6afbf0b193 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842463 +0000 checkout: moving from 0b9ade603392b23b3aefde4200e789ce86b61efa to 8dd30712b1b411f6f53c52d56dd89f6afbf0b193
8dd30712b1b411f6f53c52d56dd89f6afbf0b193 d26247180eea29e6ab808c6cb9eacf77bbcc4705 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842465 +0000 checkout: moving from 8dd30712b1b411f6f53c52d56dd89f6afbf0b193 to d26247180eea29e6ab808c6cb9eacf77bbcc4705
d26247180eea29e6ab808c6cb9eacf77bbcc4705 0b9ade603392b23b3aefde4200e789ce86b61efa jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842465 +0000 checkout: moving from d26247180eea29e6ab808c6cb9eacf77bbcc4705 to 0b9ade603392b23b3aefde4200e789ce86b61efa
0b9ade603392b23b3aefde4200e789ce86b61efa 7df79bf8df6960433ed4ff782a54e3dfc74632bd jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842467 +0000 checkout: moving from 0b9ade603392b23b3aefde4200e789ce86b61efa to 7df79bf8df6960433ed4ff782a54e3dfc74632bd
7df79bf8df6960433ed4ff782a54e3dfc74632bd d26247180eea29e6ab808c6cb9eacf77bbcc4705 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842467 +0000 checkout: moving from 7df79bf8df6960433ed4ff782a54e3dfc74632bd to d26247180eea29e6ab808c6cb9eacf77bbcc4705
d26247180eea29e6ab808c6cb9eacf77bbcc4705 c523af6ff0e94a60ca26e1aff23a6526e8cab754 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842477 +0000 checkout: moving from d26247180eea29e6ab808c6cb9eacf77bbcc4705 to c523af6ff0e94a60ca26e1aff23a6526e8cab754
c523af6ff0e94a60ca26e1aff23a6526e8cab754 7df79bf8df6960433ed4ff782a54e3dfc74632bd jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842477 +0000 checkout: moving from c523af6ff0e94a60ca26e1aff23a6526e8cab754 to 7df79bf8df6960433ed4ff782a54e3dfc74632bd
7df79bf8df6960433ed4ff782a54e3dfc74632bd b30cbe552a2eb03c2d0659f6ab6286130ca425ff jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842481 +0000 checkout: moving from 7df79bf8df6960433ed4ff782a54e3dfc74632bd to b30cbe552a2eb03c2d0659f6ab6286130ca425ff
b30cbe552a2eb03c2d0659f6ab6286130ca425ff 8a7a149b199fd83518ae31fc7709afe2d6eceee1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842481 +0000 checkout: moving from b30cbe552a2eb03c2d0659f6ab6286130ca425ff to 8a7a149b199fd83518ae31fc7709afe2d6eceee1
8a7a149b199fd83518ae31fc7709afe2d6eceee1 b4350507823436f7c75aec9c4cc72a4d7aeb496f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842487 +0000 checkout: moving from 8a7a149b199fd83518ae31fc7709afe2d6eceee1 to b4350507823436f7c75aec9c4cc72a4d7aeb496f
b4350507823436f7c75aec9c4cc72a4d7aeb496f dc3067b6e26c94fbf31aca187e032ba96ce31210 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842487 +0000 checkout: moving from b4350507823436f7c75aec9c4cc72a4d7aeb496f to dc3067b6e26c94fbf31aca187e032ba96ce31210
dc3067b6e26c94fbf31aca187e032ba96ce31210 821c8559e6106985aca0313f30992690c4f1f8f6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842491 +0000 checkout: moving from dc3067b6e26c94fbf31aca187e032ba96ce31210 to 821c8559e6106985aca0313f30992690c4f1f8f6
821c8559e6106985aca0313f30992690c4f1f8f6 b4350507823436f7c75aec9c4cc72a4d7aeb496f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842491 +0000 checkout: moving from 821c8559e6106985aca0313f30992690c4f1f8f6 to b4350507823436f7c75aec9c4cc72a4d7aeb496f
b4350507823436f7c75aec9c4cc72a4d7aeb496f 5bec3e4bfd7e268fe7f991f1e181bd756bf55f8d jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842493 +0000 checkout: moving from b4350507823436f7c75aec9c4cc72a4d7aeb496f to 5bec3e4bfd7e268fe7f991f1e181bd756bf55f8d
5bec3e4bfd7e268fe7f991f1e181bd756bf55f8d 4604e305d6567c25a4a551c628e904d6f165a285 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842493 +0000 checkout: moving from 5bec3e4bfd7e268fe7f991f1e181bd756bf55f8d to 4604e305d6567c25a4a551c628e904d6f165a285
4604e305d6567c25a4a551c628e904d6f165a285 821c8559e6106985aca0313f30992690c4f1f8f6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842499 +0000 checkout: moving from 4604e305d6567c25a4a551c628e904d6f165a285 to 821c8559e6106985aca0313f30992690c4f1f8f6
821c8559e6106985aca0313f30992690c4f1f8f6 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842506 +0000 checkout: moving from 821c8559e6106985aca0313f30992690c4f1f8f6 to 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf
301d66dcc28b2d698eefed3ecc9aa3273afb9ddf 25fa47fc524f284276b17ac48054e5fc79ab841a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842506 +0000 checkout: moving from 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf to 25fa47fc524f284276b17ac48054e5fc79ab841a
25fa47fc524f284276b17ac48054e5fc79ab841a f8d35bdd5043ae86192610b7f24f0da72a554c29 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842508 +0000 checkout: moving from 25fa47fc524f284276b17ac48054e5fc79ab841a to f8d35bdd5043ae86192610b7f24f0da72a554c29
f8d35bdd5043ae86192610b7f24f0da72a554c29 22e6422b91793a8ce1525b1722943abbd33ce28c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842508 +0000 checkout: moving from f8d35bdd5043ae86192610b7f24f0da72a554c29 to 22e6422b91793a8ce1525b1722943abbd33ce28c
22e6422b91793a8ce1525b1722943abbd33ce28c f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842520 +0000 checkout: moving from 22e6422b91793a8ce1525b1722943abbd33ce28c to f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0
f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842520 +0000 checkout: moving from f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 to 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf
301d66dcc28b2d698eefed3ecc9aa3273afb9ddf 67030ba4867d34b25d5fdc5b6c02a65b6c7d759c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842522 +0000 checkout: moving from 301d66dcc28b2d698eefed3ecc9aa3273afb9ddf to 67030ba4867d34b25d5fdc5b6c02a65b6c7d759c
67030ba4867d34b25d5fdc5b6c02a65b6c7d759c f8d35bdd5043ae86192610b7f24f0da72a554c29 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842522 +0000 checkout: moving from 67030ba4867d34b25d5fdc5b6c02a65b6c7d759c to f8d35bdd5043ae86192610b7f24f0da72a554c29
f8d35bdd5043ae86192610b7f24f0da72a554c29 98511a8c7f245c7852130526e838cb51f0ca4a8f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842524 +0000 checkout: moving from f8d35bdd5043ae86192610b7f24f0da72a554c29 to 98511a8c7f245c7852130526e838cb51f0ca4a8f
98511a8c7f245c7852130526e838cb51f0ca4a8f f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842524 +0000 checkout: moving from 98511a8c7f245c7852130526e838cb51f0ca4a8f to f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0
f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 22e6422b91793a8ce1525b1722943abbd33ce28c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842532 +0000 checkout: moving from f7e7100f5f6b82090ebf6c1c28d9b4dc29a08da0 to 22e6422b91793a8ce1525b1722943abbd33ce28c
22e6422b91793a8ce1525b1722943abbd33ce28c 75ae5cc8ca41c5f177cd9c8e044a9425ba40ad39 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842532 +0000 checkout: moving from 22e6422b91793a8ce1525b1722943abbd33ce28c to 75ae5cc8ca41c5f177cd9c8e044a9425ba40ad39
75ae5cc8ca41c5f177cd9c8e044a9425ba40ad39 78aaca19f7c800525861167702bc568eebee10e6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842536 +0000 checkout: moving from 75ae5cc8ca41c5f177cd9c8e044a9425ba40ad39 to 78aaca19f7c800525861167702bc568eebee10e6
78aaca19f7c800525861167702bc568eebee10e6 ba82fec3996d9c001439d47906bbc60482f64f7a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842536 +0000 checkout: moving from 78aaca19f7c800525861167702bc568eebee10e6 to ba82fec3996d9c001439d47906bbc60482f64f7a
ba82fec3996d9c001439d47906bbc60482f64f7a 526a93506ee380a009dc20a9ab870a37367f983f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842540 +0000 checkout: moving from ba82fec3996d9c001439d47906bbc60482f64f7a to 526a93506ee380a009dc20a9ab870a37367f983f
526a93506ee380a009dc20a9ab870a37367f983f d6fd359eff9c64120cef014b3c3895036d3dda21 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842540 +0000 checkout: moving from 526a93506ee380a009dc20a9ab870a37367f983f to d6fd359eff9c64120cef014b3c3895036d3dda21
d6fd359eff9c64120cef014b3c3895036d3dda21 e690e6502259de6364bface5d63564c9bcb0d6da jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842550 +0000 checkout: moving from d6fd359eff9c64120cef014b3c3895036d3dda21 to e690e6502259de6364bface5d63564c9bcb0d6da
e690e6502259de6364bface5d63564c9bcb0d6da b344d54499951282a05c32a1d532a57d3b17d983 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842550 +0000 checkout: moving from e690e6502259de6364bface5d63564c9bcb0d6da to b344d54499951282a05c32a1d532a57d3b17d983
b344d54499951282a05c32a1d532a57d3b17d983 70791c86404e49e6feff87d7e6373b8d63ef0369 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842554 +0000 checkout: moving from b344d54499951282a05c32a1d532a57d3b17d983 to 70791c86404e49e6feff87d7e6373b8d63ef0369
70791c86404e49e6feff87d7e6373b8d63ef0369 e690e6502259de6364bface5d63564c9bcb0d6da jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842554 +0000 checkout: moving from 70791c86404e49e6feff87d7e6373b8d63ef0369 to e690e6502259de6364bface5d63564c9bcb0d6da
e690e6502259de6364bface5d63564c9bcb0d6da 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842556 +0000 checkout: moving from e690e6502259de6364bface5d63564c9bcb0d6da to 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4
9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 2662f037b3843d952041ae90ad8ecd88e1f52709 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842556 +0000 checkout: moving from 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 to 2662f037b3843d952041ae90ad8ecd88e1f52709
2662f037b3843d952041ae90ad8ecd88e1f52709 70b70c33870fb35f22595562723907dd95f733b8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842559 +0000 checkout: moving from 2662f037b3843d952041ae90ad8ecd88e1f52709 to 70b70c33870fb35f22595562723907dd95f733b8
70b70c33870fb35f22595562723907dd95f733b8 e1636d425c010b75d85174fec0f1369e7c3a912b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842559 +0000 checkout: moving from 70b70c33870fb35f22595562723907dd95f733b8 to e1636d425c010b75d85174fec0f1369e7c3a912b
e1636d425c010b75d85174fec0f1369e7c3a912b 150fe19c4a3035e79cae552cb72c701367f2a2db jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842563 +0000 checkout: moving from e1636d425c010b75d85174fec0f1369e7c3a912b to 150fe19c4a3035e79cae552cb72c701367f2a2db
150fe19c4a3035e79cae552cb72c701367f2a2db 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842563 +0000 checkout: moving from 150fe19c4a3035e79cae552cb72c701367f2a2db to 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4
9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 dfbffe587176a93119b5bc23d0651af8ac073652 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842565 +0000 checkout: moving from 9b14c3e0c12d99106d5200ddd6559f5a4ad05ca4 to dfbffe587176a93119b5bc23d0651af8ac073652
dfbffe587176a93119b5bc23d0651af8ac073652 e05baf69d37153a1fcaa91f94240fe61eab3cddc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842565 +0000 checkout: moving from dfbffe587176a93119b5bc23d0651af8ac073652 to e05baf69d37153a1fcaa91f94240fe61eab3cddc
e05baf69d37153a1fcaa91f94240fe61eab3cddc 0b6c4e921d9f3da3d94e8cba644f617ca7395035 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842569 +0000 checkout: moving from e05baf69d37153a1fcaa91f94240fe61eab3cddc to 0b6c4e921d9f3da3d94e8cba644f617ca7395035
0b6c4e921d9f3da3d94e8cba644f617ca7395035 150fe19c4a3035e79cae552cb72c701367f2a2db jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842569 +0000 checkout: moving from 0b6c4e921d9f3da3d94e8cba644f617ca7395035 to 150fe19c4a3035e79cae552cb72c701367f2a2db
150fe19c4a3035e79cae552cb72c701367f2a2db 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842571 +0000 checkout: moving from 150fe19c4a3035e79cae552cb72c701367f2a2db to 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1
93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 2ab923f868602c418ca6e793e8660d3a324009e8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842571 +0000 checkout: moving from 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 to 2ab923f868602c418ca6e793e8660d3a324009e8
2ab923f868602c418ca6e793e8660d3a324009e8 85bc77de28460cb10f079df4f015b6100417ea51 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842577 +0000 checkout: moving from 2ab923f868602c418ca6e793e8660d3a324009e8 to 85bc77de28460cb10f079df4f015b6100417ea51
85bc77de28460cb10f079df4f015b6100417ea51 cb62807e661b01492e8d1b33e51c705010ebf61a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842577 +0000 checkout: moving from 85bc77de28460cb10f079df4f015b6100417ea51 to cb62807e661b01492e8d1b33e51c705010ebf61a
cb62807e661b01492e8d1b33e51c705010ebf61a b967dc305ebf2b0c0b558c577e198328712c5145 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842583 +0000 checkout: moving from cb62807e661b01492e8d1b33e51c705010ebf61a to b967dc305ebf2b0c0b558c577e198328712c5145
b967dc305ebf2b0c0b558c577e198328712c5145 f5ce7aa463240425761211af242abb2e398ee957 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842583 +0000 checkout: moving from b967dc305ebf2b0c0b558c577e198328712c5145 to f5ce7aa463240425761211af242abb2e398ee957
f5ce7aa463240425761211af242abb2e398ee957 4ca97397a72e0d26d9d70c8c5b52ff82d575f472 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842585 +0000 checkout: moving from f5ce7aa463240425761211af242abb2e398ee957 to 4ca97397a72e0d26d9d70c8c5b52ff82d575f472
4ca97397a72e0d26d9d70c8c5b52ff82d575f472 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842585 +0000 checkout: moving from 4ca97397a72e0d26d9d70c8c5b52ff82d575f472 to 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1
93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 afad056ec7f81dc00eb33fa8094c45ca1915fe8a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842597 +0000 checkout: moving from 93e557e9618cbb4a781c20a6cece9f4ea4ce27b1 to afad056ec7f81dc00eb33fa8094c45ca1915fe8a
afad056ec7f81dc00eb33fa8094c45ca1915fe8a 2d74140dfe282a04c701cc48eaf43dc0b37b738c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842597 +0000 checkout: moving from afad056ec7f81dc00eb33fa8094c45ca1915fe8a to 2d74140dfe282a04c701cc48eaf43dc0b37b738c
2d74140dfe282a04c701cc48eaf43dc0b37b738c aaa356199515fd53265e1d61db1156f6b876e282 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842599 +0000 checkout: moving from 2d74140dfe282a04c701cc48eaf43dc0b37b738c to aaa356199515fd53265e1d61db1156f6b876e282
aaa356199515fd53265e1d61db1156f6b876e282 0f7dc800a89716efe68b9eb836544ee25964a72f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842599 +0000 checkout: moving from aaa356199515fd53265e1d61db1156f6b876e282 to 0f7dc800a89716efe68b9eb836544ee25964a72f
0f7dc800a89716efe68b9eb836544ee25964a72f 0ca7eb0a4f66d1990604f6d2ccc429b1e95b29a5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842603 +0000 checkout: moving from 0f7dc800a89716efe68b9eb836544ee25964a72f to 0ca7eb0a4f66d1990604f6d2ccc429b1e95b29a5
0ca7eb0a4f66d1990604f6d2ccc429b1e95b29a5 aaa356199515fd53265e1d61db1156f6b876e282 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842603 +0000 checkout: moving from 0ca7eb0a4f66d1990604f6d2ccc429b1e95b29a5 to aaa356199515fd53265e1d61db1156f6b876e282
aaa356199515fd53265e1d61db1156f6b876e282 63c16c117a869426f2cbbfdaa099de449789fd18 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842606 +0000 checkout: moving from aaa356199515fd53265e1d61db1156f6b876e282 to 63c16c117a869426f2cbbfdaa099de449789fd18
63c16c117a869426f2cbbfdaa099de449789fd18 1458a9366aa9a001e25153f669a9a5bb8235a30b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842606 +0000 checkout: moving from 63c16c117a869426f2cbbfdaa099de449789fd18 to 1458a9366aa9a001e25153f669a9a5bb8235a30b
1458a9366aa9a001e25153f669a9a5bb8235a30b 3440475ca0ad59fadc23f583c9fc36594dda1318 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842608 +0000 checkout: moving from 1458a9366aa9a001e25153f669a9a5bb8235a30b to 3440475ca0ad59fadc23f583c9fc36594dda1318
3440475ca0ad59fadc23f583c9fc36594dda1318 afad056ec7f81dc00eb33fa8094c45ca1915fe8a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842608 +0000 checkout: moving from 3440475ca0ad59fadc23f583c9fc36594dda1318 to afad056ec7f81dc00eb33fa8094c45ca1915fe8a
afad056ec7f81dc00eb33fa8094c45ca1915fe8a 3e8fdc56e4e27bebe5ec25fd071cb33f2409b757 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842617 +0000 checkout: moving from afad056ec7f81dc00eb33fa8094c45ca1915fe8a to 3e8fdc56e4e27bebe5ec25fd071cb33f2409b757
3e8fdc56e4e27bebe5ec25fd071cb33f2409b757 3440475ca0ad59fadc23f583c9fc36594dda1318 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842617 +0000 checkout: moving from 3e8fdc56e4e27bebe5ec25fd071cb33f2409b757 to 3440475ca0ad59fadc23f583c9fc36594dda1318
3440475ca0ad59fadc23f583c9fc36594dda1318 b229e005c3d70f3c3d0ed7175f832c3d7eb9cd95 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842619 +0000 checkout: moving from 3440475ca0ad59fadc23f583c9fc36594dda1318 to b229e005c3d70f3c3d0ed7175f832c3d7eb9cd95
b229e005c3d70f3c3d0ed7175f832c3d7eb9cd95 804ffaeeda74514cd693fee3dd1d1250fd5cf353 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842619 +0000 checkout: moving from b229e005c3d70f3c3d0ed7175f832c3d7eb9cd95 to 804ffaeeda74514cd693fee3dd1d1250fd5cf353
804ffaeeda74514cd693fee3dd1d1250fd5cf353 5ab705de4407fa11b9235e1792095e4dfb4ae919 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842621 +0000 checkout: moving from 804ffaeeda74514cd693fee3dd1d1250fd5cf353 to 5ab705de4407fa11b9235e1792095e4dfb4ae919
5ab705de4407fa11b9235e1792095e4dfb4ae919 471f59dee1b24664c9d622f6c8e457cb12631dda jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842623 +0000 checkout: moving from 5ab705de4407fa11b9235e1792095e4dfb4ae919 to 471f59dee1b24664c9d622f6c8e457cb12631dda
471f59dee1b24664c9d622f6c8e457cb12631dda 6a89ffbbc3fd7d7f43e23fe38b17d7af44d73fed jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842623 +0000 checkout: moving from 471f59dee1b24664c9d622f6c8e457cb12631dda to 6a89ffbbc3fd7d7f43e23fe38b17d7af44d73fed
6a89ffbbc3fd7d7f43e23fe38b17d7af44d73fed ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842625 +0000 checkout: moving from 6a89ffbbc3fd7d7f43e23fe38b17d7af44d73fed to ec2dabe9a160377a0b42da5cdef34674a2bd0fe9
ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 471f59dee1b24664c9d622f6c8e457cb12631dda jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842625 +0000 checkout: moving from ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 to 471f59dee1b24664c9d622f6c8e457cb12631dda
471f59dee1b24664c9d622f6c8e457cb12631dda e0938a3a38c249c51a593183c574a71e60c6c790 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842627 +0000 checkout: moving from 471f59dee1b24664c9d622f6c8e457cb12631dda to e0938a3a38c249c51a593183c574a71e60c6c790
e0938a3a38c249c51a593183c574a71e60c6c790 ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842627 +0000 checkout: moving from e0938a3a38c249c51a593183c574a71e60c6c790 to ec2dabe9a160377a0b42da5cdef34674a2bd0fe9
ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842637 +0000 checkout: moving from ec2dabe9a160377a0b42da5cdef34674a2bd0fe9 to 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce
1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce 9b1cd8f1c2b0ff811489f2f4c82456ee021bf1ae jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842637 +0000 checkout: moving from 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce to 9b1cd8f1c2b0ff811489f2f4c82456ee021bf1ae
9b1cd8f1c2b0ff811489f2f4c82456ee021bf1ae 232aa8737bae08a238ec78da1920db3add0d8439 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842639 +0000 checkout: moving from 9b1cd8f1c2b0ff811489f2f4c82456ee021bf1ae to 232aa8737bae08a238ec78da1920db3add0d8439
232aa8737bae08a238ec78da1920db3add0d8439 2cc9fc84bdac3097adc4e1e55a90cc82765718fd jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842639 +0000 checkout: moving from 232aa8737bae08a238ec78da1920db3add0d8439 to 2cc9fc84bdac3097adc4e1e55a90cc82765718fd
2cc9fc84bdac3097adc4e1e55a90cc82765718fd 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842643 +0000 checkout: moving from 2cc9fc84bdac3097adc4e1e55a90cc82765718fd to 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce
1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce 1cdbd149d7b8bd48693ed2748e12703bef9892b5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842647 +0000 checkout: moving from 1c4b38e856f1cfe95083e4a4f1c6a02e56fdc6ce to 1cdbd149d7b8bd48693ed2748e12703bef9892b5
1cdbd149d7b8bd48693ed2748e12703bef9892b5 c2687457a5d3ae185ea7b2b6b4eebf774ee98dd3 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842647 +0000 checkout: moving from 1cdbd149d7b8bd48693ed2748e12703bef9892b5 to c2687457a5d3ae185ea7b2b6b4eebf774ee98dd3
c2687457a5d3ae185ea7b2b6b4eebf774ee98dd3 cd77fd5abf3bb4401b31faa063ba368ce1681cc5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842649 +0000 checkout: moving from c2687457a5d3ae185ea7b2b6b4eebf774ee98dd3 to cd77fd5abf3bb4401b31faa063ba368ce1681cc5
cd77fd5abf3bb4401b31faa063ba368ce1681cc5 1cdbd149d7b8bd48693ed2748e12703bef9892b5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842649 +0000 checkout: moving from cd77fd5abf3bb4401b31faa063ba368ce1681cc5 to 1cdbd149d7b8bd48693ed2748e12703bef9892b5
1cdbd149d7b8bd48693ed2748e12703bef9892b5 f929541b704348cd72e7d49c9894d6b561700f14 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842651 +0000 checkout: moving from 1cdbd149d7b8bd48693ed2748e12703bef9892b5 to f929541b704348cd72e7d49c9894d6b561700f14
f929541b704348cd72e7d49c9894d6b561700f14 cd77fd5abf3bb4401b31faa063ba368ce1681cc5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842651 +0000 checkout: moving from f929541b704348cd72e7d49c9894d6b561700f14 to cd77fd5abf3bb4401b31faa063ba368ce1681cc5
cd77fd5abf3bb4401b31faa063ba368ce1681cc5 698cfbad6731990cec17cb69b0a617a8d8ef4689 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842653 +0000 checkout: moving from cd77fd5abf3bb4401b31faa063ba368ce1681cc5 to 698cfbad6731990cec17cb69b0a617a8d8ef4689
698cfbad6731990cec17cb69b0a617a8d8ef4689 f929541b704348cd72e7d49c9894d6b561700f14 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842653 +0000 checkout: moving from 698cfbad6731990cec17cb69b0a617a8d8ef4689 to f929541b704348cd72e7d49c9894d6b561700f14
f929541b704348cd72e7d49c9894d6b561700f14 cb308cb7a9b08178046f747c1f02c8385eeca28c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842657 +0000 checkout: moving from f929541b704348cd72e7d49c9894d6b561700f14 to cb308cb7a9b08178046f747c1f02c8385eeca28c
cb308cb7a9b08178046f747c1f02c8385eeca28c 9a111689f0565c3760fcaa82909725cc872b9816 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842657 +0000 checkout: moving from cb308cb7a9b08178046f747c1f02c8385eeca28c to 9a111689f0565c3760fcaa82909725cc872b9816
9a111689f0565c3760fcaa82909725cc872b9816 f183e1041c4cc840a85dc1f400e4889ae916b76c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842664 +0000 checkout: moving from 9a111689f0565c3760fcaa82909725cc872b9816 to f183e1041c4cc840a85dc1f400e4889ae916b76c
f183e1041c4cc840a85dc1f400e4889ae916b76c cb308cb7a9b08178046f747c1f02c8385eeca28c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842664 +0000 checkout: moving from f183e1041c4cc840a85dc1f400e4889ae916b76c to cb308cb7a9b08178046f747c1f02c8385eeca28c
cb308cb7a9b08178046f747c1f02c8385eeca28c 74225fd42fbf7ddcf2e2b37a340ee32ce157c92d jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842666 +0000 checkout: moving from cb308cb7a9b08178046f747c1f02c8385eeca28c to 74225fd42fbf7ddcf2e2b37a340ee32ce157c92d
74225fd42fbf7ddcf2e2b37a340ee32ce157c92d f183e1041c4cc840a85dc1f400e4889ae916b76c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842666 +0000 checkout: moving from 74225fd42fbf7ddcf2e2b37a340ee32ce157c92d to f183e1041c4cc840a85dc1f400e4889ae916b76c
f183e1041c4cc840a85dc1f400e4889ae916b76c 66c826d007a43c779d954a92bc50b40c176817c0 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842670 +0000 checkout: moving from f183e1041c4cc840a85dc1f400e4889ae916b76c to 66c826d007a43c779d954a92bc50b40c176817c0
66c826d007a43c779d954a92bc50b40c176817c0 4e000c54fecd054e60198211cc23ecc10330ae47 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842670 +0000 checkout: moving from 66c826d007a43c779d954a92bc50b40c176817c0 to 4e000c54fecd054e60198211cc23ecc10330ae47
4e000c54fecd054e60198211cc23ecc10330ae47 512d7cf5a68f9551461fecbf7a0dd2606e112624 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842684 +0000 checkout: moving from 4e000c54fecd054e60198211cc23ecc10330ae47 to 512d7cf5a68f9551461fecbf7a0dd2606e112624
512d7cf5a68f9551461fecbf7a0dd2606e112624 49028e83882edd8525435369632f70f2ab882a98 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842684 +0000 checkout: moving from 512d7cf5a68f9551461fecbf7a0dd2606e112624 to 49028e83882edd8525435369632f70f2ab882a98
49028e83882edd8525435369632f70f2ab882a98 cd6d9bdb0b757a2db2b366da0d887519a42c6383 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842686 +0000 checkout: moving from 49028e83882edd8525435369632f70f2ab882a98 to cd6d9bdb0b757a2db2b366da0d887519a42c6383
cd6d9bdb0b757a2db2b366da0d887519a42c6383 ba9475937ddc189a2c6f9b89074e03c0cf7a507f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842686 +0000 checkout: moving from cd6d9bdb0b757a2db2b366da0d887519a42c6383 to ba9475937ddc189a2c6f9b89074e03c0cf7a507f
ba9475937ddc189a2c6f9b89074e03c0cf7a507f db6a439d0b443d904a682b71000e7f7f485291fb jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842689 +0000 checkout: moving from ba9475937ddc189a2c6f9b89074e03c0cf7a507f to db6a439d0b443d904a682b71000e7f7f485291fb
db6a439d0b443d904a682b71000e7f7f485291fb d59638c876fcf350180001ab36b19b7dcdd5c947 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842689 +0000 checkout: moving from db6a439d0b443d904a682b71000e7f7f485291fb to d59638c876fcf350180001ab36b19b7dcdd5c947
d59638c876fcf350180001ab36b19b7dcdd5c947 02231213a7c18ca99de51ecc51a7bdd28d4f4d1a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842708 +0000 checkout: moving from d59638c876fcf350180001ab36b19b7dcdd5c947 to 02231213a7c18ca99de51ecc51a7bdd28d4f4d1a
02231213a7c18ca99de51ecc51a7bdd28d4f4d1a 25c3230050d25dc248557f0e2df55c3fa605758c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842709 +0000 checkout: moving from 02231213a7c18ca99de51ecc51a7bdd28d4f4d1a to 25c3230050d25dc248557f0e2df55c3fa605758c
25c3230050d25dc248557f0e2df55c3fa605758c 19926c488fde408a7c0de6be01c6258b70772671 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842713 +0000 checkout: moving from 25c3230050d25dc248557f0e2df55c3fa605758c to 19926c488fde408a7c0de6be01c6258b70772671
19926c488fde408a7c0de6be01c6258b70772671 eb78ceb29ff7249fec4a04f07aeaff7133a8619c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842713 +0000 checkout: moving from 19926c488fde408a7c0de6be01c6258b70772671 to eb78ceb29ff7249fec4a04f07aeaff7133a8619c
eb78ceb29ff7249fec4a04f07aeaff7133a8619c 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842717 +0000 checkout: moving from eb78ceb29ff7249fec4a04f07aeaff7133a8619c to 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9
0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 4c7ab9379eb05c3f63d2f856d4568598e59afca4 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842717 +0000 checkout: moving from 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 to 4c7ab9379eb05c3f63d2f856d4568598e59afca4
4c7ab9379eb05c3f63d2f856d4568598e59afca4 eb78ceb29ff7249fec4a04f07aeaff7133a8619c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842719 +0000 checkout: moving from 4c7ab9379eb05c3f63d2f856d4568598e59afca4 to eb78ceb29ff7249fec4a04f07aeaff7133a8619c
eb78ceb29ff7249fec4a04f07aeaff7133a8619c b1aba93472aad9a799a8315e09e146199348ccea jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842719 +0000 checkout: moving from eb78ceb29ff7249fec4a04f07aeaff7133a8619c to b1aba93472aad9a799a8315e09e146199348ccea
b1aba93472aad9a799a8315e09e146199348ccea 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842721 +0000 checkout: moving from b1aba93472aad9a799a8315e09e146199348ccea to 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc
0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842721 +0000 checkout: moving from 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc to 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9
0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 a9579f1777abd16a6e901a964bc0914354e9c30a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842723 +0000 checkout: moving from 0ae4fc7629d64cb9a8a5c4b2e86bad763f21aca9 to a9579f1777abd16a6e901a964bc0914354e9c30a
a9579f1777abd16a6e901a964bc0914354e9c30a 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842723 +0000 checkout: moving from a9579f1777abd16a6e901a964bc0914354e9c30a to 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc
0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc 9d27eb810e4689858d5812225663f67753bb610b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842725 +0000 checkout: moving from 0f066621a3e3f1a28a5be48a497fbac2dd5ba9fc to 9d27eb810e4689858d5812225663f67753bb610b
9d27eb810e4689858d5812225663f67753bb610b a9579f1777abd16a6e901a964bc0914354e9c30a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842725 +0000 checkout: moving from 9d27eb810e4689858d5812225663f67753bb610b to a9579f1777abd16a6e901a964bc0914354e9c30a
a9579f1777abd16a6e901a964bc0914354e9c30a ced8ad9384e84e6b9641cd44d947a9de296a92d1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842731 +0000 checkout: moving from a9579f1777abd16a6e901a964bc0914354e9c30a to ced8ad9384e84e6b9641cd44d947a9de296a92d1
ced8ad9384e84e6b9641cd44d947a9de296a92d1 e3448dddbf53282392906fd77a457ac6fef7b653 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842731 +0000 checkout: moving from ced8ad9384e84e6b9641cd44d947a9de296a92d1 to e3448dddbf53282392906fd77a457ac6fef7b653
e3448dddbf53282392906fd77a457ac6fef7b653 79d90057e15f1214e76139c502198c3fb0a70249 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842736 +0000 checkout: moving from e3448dddbf53282392906fd77a457ac6fef7b653 to 79d90057e15f1214e76139c502198c3fb0a70249
79d90057e15f1214e76139c502198c3fb0a70249 b6237bb05f101ff26d266f7835a02eb07b1ddc0a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842736 +0000 checkout: moving from 79d90057e15f1214e76139c502198c3fb0a70249 to b6237bb05f101ff26d266f7835a02eb07b1ddc0a
b6237bb05f101ff26d266f7835a02eb07b1ddc0a f4ae484012d916cb39a906484746abf44a4e09f6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842738 +0000 checkout: moving from b6237bb05f101ff26d266f7835a02eb07b1ddc0a to f4ae484012d916cb39a906484746abf44a4e09f6
f4ae484012d916cb39a906484746abf44a4e09f6 c5206d5c8fa08e8b6250aacc39cacd12d5caf30e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842738 +0000 checkout: moving from f4ae484012d916cb39a906484746abf44a4e09f6 to c5206d5c8fa08e8b6250aacc39cacd12d5caf30e
c5206d5c8fa08e8b6250aacc39cacd12d5caf30e 96ee53a2c98da763ef0e7557af33c03a8d2ae297 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842740 +0000 checkout: moving from c5206d5c8fa08e8b6250aacc39cacd12d5caf30e to 96ee53a2c98da763ef0e7557af33c03a8d2ae297
96ee53a2c98da763ef0e7557af33c03a8d2ae297 f4ae484012d916cb39a906484746abf44a4e09f6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842740 +0000 checkout: moving from 96ee53a2c98da763ef0e7557af33c03a8d2ae297 to f4ae484012d916cb39a906484746abf44a4e09f6
f4ae484012d916cb39a906484746abf44a4e09f6 7fb6b8b818ed4c9d82c95086d78b6049d1292604 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842771 +0000 checkout: moving from f4ae484012d916cb39a906484746abf44a4e09f6 to 7fb6b8b818ed4c9d82c95086d78b6049d1292604
7fb6b8b818ed4c9d82c95086d78b6049d1292604 96ee53a2c98da763ef0e7557af33c03a8d2ae297 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842771 +0000 checkout: moving from 7fb6b8b818ed4c9d82c95086d78b6049d1292604 to 96ee53a2c98da763ef0e7557af33c03a8d2ae297
96ee53a2c98da763ef0e7557af33c03a8d2ae297 586cc3b632875e5cc097d7bbfdb5ef0ba9aa53a1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842777 +0000 checkout: moving from 96ee53a2c98da763ef0e7557af33c03a8d2ae297 to 586cc3b632875e5cc097d7bbfdb5ef0ba9aa53a1
586cc3b632875e5cc097d7bbfdb5ef0ba9aa53a1 02f0dca24f16d57c16e1aa18c98b8f1dc04785b6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842777 +0000 checkout: moving from 586cc3b632875e5cc097d7bbfdb5ef0ba9aa53a1 to 02f0dca24f16d57c16e1aa18c98b8f1dc04785b6
02f0dca24f16d57c16e1aa18c98b8f1dc04785b6 aea31ece541a8b8a52b35c6cc80f1a78ffbe42c5 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842788 +0000 checkout: moving from 02f0dca24f16d57c16e1aa18c98b8f1dc04785b6 to aea31ece541a8b8a52b35c6cc80f1a78ffbe42c5
aea31ece541a8b8a52b35c6cc80f1a78ffbe42c5 259aa4109176ba735521ea11fe2d97ad075f5762 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842788 +0000 checkout: moving from aea31ece541a8b8a52b35c6cc80f1a78ffbe42c5 to 259aa4109176ba735521ea11fe2d97ad075f5762
259aa4109176ba735521ea11fe2d97ad075f5762 b2c101aaecd34339afcc4844311f37280d03d48e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842804 +0000 checkout: moving from 259aa4109176ba735521ea11fe2d97ad075f5762 to b2c101aaecd34339afcc4844311f37280d03d48e
b2c101aaecd34339afcc4844311f37280d03d48e a62881d3405c2fef72e42a643803aa870bcb0dd8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842804 +0000 checkout: moving from b2c101aaecd34339afcc4844311f37280d03d48e to a62881d3405c2fef72e42a643803aa870bcb0dd8
a62881d3405c2fef72e42a643803aa870bcb0dd8 334f2587736a0d025fcf8a3c3b0608dbcae5bc79 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842811 +0000 checkout: moving from a62881d3405c2fef72e42a643803aa870bcb0dd8 to 334f2587736a0d025fcf8a3c3b0608dbcae5bc79
334f2587736a0d025fcf8a3c3b0608dbcae5bc79 9e19898c6dc3e14fa1424a827ecc60519e21bd16 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842811 +0000 checkout: moving from 334f2587736a0d025fcf8a3c3b0608dbcae5bc79 to 9e19898c6dc3e14fa1424a827ecc60519e21bd16
9e19898c6dc3e14fa1424a827ecc60519e21bd16 d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842830 +0000 checkout: moving from 9e19898c6dc3e14fa1424a827ecc60519e21bd16 to d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed
d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed 729e1fd4598a470f985dedf9e53eb57907f88762 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842830 +0000 checkout: moving from d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed to 729e1fd4598a470f985dedf9e53eb57907f88762
729e1fd4598a470f985dedf9e53eb57907f88762 02a4df52a8682f57b2d917dfd2eda763ada20ace jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842832 +0000 checkout: moving from 729e1fd4598a470f985dedf9e53eb57907f88762 to 02a4df52a8682f57b2d917dfd2eda763ada20ace
02a4df52a8682f57b2d917dfd2eda763ada20ace d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842832 +0000 checkout: moving from 02a4df52a8682f57b2d917dfd2eda763ada20ace to d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed
d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842839 +0000 checkout: moving from d0c7dc9e7bdf00e2fa88ab30ae525f7961a703ed to 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b
2b2552941e9f01b99bf33fdb9aec6b5220afdd4b fb135bbbb8a31b4112a3c2b1b3dcd6d2619c4da6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842839 +0000 checkout: moving from 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b to fb135bbbb8a31b4112a3c2b1b3dcd6d2619c4da6
fb135bbbb8a31b4112a3c2b1b3dcd6d2619c4da6 cd34fdb19114127cee32da5dd61ab0fbe9e88879 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842841 +0000 checkout: moving from fb135bbbb8a31b4112a3c2b1b3dcd6d2619c4da6 to cd34fdb19114127cee32da5dd61ab0fbe9e88879
cd34fdb19114127cee32da5dd61ab0fbe9e88879 3901bb43c7713aad08c3a18684e6e23837ee126e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842841 +0000 checkout: moving from cd34fdb19114127cee32da5dd61ab0fbe9e88879 to 3901bb43c7713aad08c3a18684e6e23837ee126e
3901bb43c7713aad08c3a18684e6e23837ee126e 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842845 +0000 checkout: moving from 3901bb43c7713aad08c3a18684e6e23837ee126e to 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b
2b2552941e9f01b99bf33fdb9aec6b5220afdd4b 98f7c8b688852fe3c91c556ac72a83e63612837d jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842849 +0000 checkout: moving from 2b2552941e9f01b99bf33fdb9aec6b5220afdd4b to 98f7c8b688852fe3c91c556ac72a83e63612837d
98f7c8b688852fe3c91c556ac72a83e63612837d 09d2fa3906ba3c71e87f947065325a2f8afdab9e jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842849 +0000 checkout: moving from 98f7c8b688852fe3c91c556ac72a83e63612837d to 09d2fa3906ba3c71e87f947065325a2f8afdab9e
09d2fa3906ba3c71e87f947065325a2f8afdab9e 85d6b870c1fb8ff07f4bedf0043ece0e112d0968 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842858 +0000 checkout: moving from 09d2fa3906ba3c71e87f947065325a2f8afdab9e to 85d6b870c1fb8ff07f4bedf0043ece0e112d0968
85d6b870c1fb8ff07f4bedf0043ece0e112d0968 a89d081bac735af3392a65cb6a6b762f182b608c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842858 +0000 checkout: moving from 85d6b870c1fb8ff07f4bedf0043ece0e112d0968 to a89d081bac735af3392a65cb6a6b762f182b608c
a89d081bac735af3392a65cb6a6b762f182b608c 5670807f00e11cba15b211954638e7a980a299cc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842860 +0000 checkout: moving from a89d081bac735af3392a65cb6a6b762f182b608c to 5670807f00e11cba15b211954638e7a980a299cc
5670807f00e11cba15b211954638e7a980a299cc 98f7c8b688852fe3c91c556ac72a83e63612837d jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842860 +0000 checkout: moving from 5670807f00e11cba15b211954638e7a980a299cc to 98f7c8b688852fe3c91c556ac72a83e63612837d
98f7c8b688852fe3c91c556ac72a83e63612837d 2fb347993586c41b925edca37c4c91e3dd054ff0 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842879 +0000 checkout: moving from 98f7c8b688852fe3c91c556ac72a83e63612837d to 2fb347993586c41b925edca37c4c91e3dd054ff0
2fb347993586c41b925edca37c4c91e3dd054ff0 c488995e159e54b9fdc842edcaef4fdb00aff497 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842879 +0000 checkout: moving from 2fb347993586c41b925edca37c4c91e3dd054ff0 to c488995e159e54b9fdc842edcaef4fdb00aff497
c488995e159e54b9fdc842edcaef4fdb00aff497 d8b685ea6c3b01270dc37012b62192fd09b97d68 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842884 +0000 checkout: moving from c488995e159e54b9fdc842edcaef4fdb00aff497 to d8b685ea6c3b01270dc37012b62192fd09b97d68
d8b685ea6c3b01270dc37012b62192fd09b97d68 d5931784dcdf1c414183bc816010a209463ec287 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842884 +0000 checkout: moving from d8b685ea6c3b01270dc37012b62192fd09b97d68 to d5931784dcdf1c414183bc816010a209463ec287
d5931784dcdf1c414183bc816010a209463ec287 2455c0f25b07fb42d628df194a1a35dbc0a95ea6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842886 +0000 checkout: moving from d5931784dcdf1c414183bc816010a209463ec287 to 2455c0f25b07fb42d628df194a1a35dbc0a95ea6
2455c0f25b07fb42d628df194a1a35dbc0a95ea6 debf749a604e226b4e9414d47db3da5269eae60a jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842886 +0000 checkout: moving from 2455c0f25b07fb42d628df194a1a35dbc0a95ea6 to debf749a604e226b4e9414d47db3da5269eae60a
debf749a604e226b4e9414d47db3da5269eae60a bbc2c73896bf07a5ee4cc03141e78438bd082af8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842892 +0000 checkout: moving from debf749a604e226b4e9414d47db3da5269eae60a to bbc2c73896bf07a5ee4cc03141e78438bd082af8
bbc2c73896bf07a5ee4cc03141e78438bd082af8 0b5d2277b5f3edf1e38f2c18ce284e88238ff732 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842892 +0000 checkout: moving from bbc2c73896bf07a5ee4cc03141e78438bd082af8 to 0b5d2277b5f3edf1e38f2c18ce284e88238ff732
0b5d2277b5f3edf1e38f2c18ce284e88238ff732 ec9534f072e87fea987b0760342ed6308d2c9634 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842896 +0000 checkout: moving from 0b5d2277b5f3edf1e38f2c18ce284e88238ff732 to ec9534f072e87fea987b0760342ed6308d2c9634
ec9534f072e87fea987b0760342ed6308d2c9634 cd4450317bb7790aa6901fbf7ddea36128f46dd1 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842896 +0000 checkout: moving from ec9534f072e87fea987b0760342ed6308d2c9634 to cd4450317bb7790aa6901fbf7ddea36128f46dd1
cd4450317bb7790aa6901fbf7ddea36128f46dd1 421e5f6f718bf8088e007ea9874f143be35e06d8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842898 +0000 checkout: moving from cd4450317bb7790aa6901fbf7ddea36128f46dd1 to 421e5f6f718bf8088e007ea9874f143be35e06d8
421e5f6f718bf8088e007ea9874f143be35e06d8 bbc2c73896bf07a5ee4cc03141e78438bd082af8 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842898 +0000 checkout: moving from 421e5f6f718bf8088e007ea9874f143be35e06d8 to bbc2c73896bf07a5ee4cc03141e78438bd082af8
bbc2c73896bf07a5ee4cc03141e78438bd082af8 8008a551cc1d599deed55dd57833b97f33a89fe3 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842907 +0000 checkout: moving from bbc2c73896bf07a5ee4cc03141e78438bd082af8 to 8008a551cc1d599deed55dd57833b97f33a89fe3
8008a551cc1d599deed55dd57833b97f33a89fe3 2455c0f25b07fb42d628df194a1a35dbc0a95ea6 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842907 +0000 checkout: moving from 8008a551cc1d599deed55dd57833b97f33a89fe3 to 2455c0f25b07fb42d628df194a1a35dbc0a95ea6
2455c0f25b07fb42d628df194a1a35dbc0a95ea6 560284d25e3ed9a08ed483af1afc0cd5e2e87ed4 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842911 +0000 checkout: moving from 2455c0f25b07fb42d628df194a1a35dbc0a95ea6 to 560284d25e3ed9a08ed483af1afc0cd5e2e87ed4
560284d25e3ed9a08ed483af1afc0cd5e2e87ed4 ec9534f072e87fea987b0760342ed6308d2c9634 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842911 +0000 checkout: moving from 560284d25e3ed9a08ed483af1afc0cd5e2e87ed4 to ec9534f072e87fea987b0760342ed6308d2c9634
ec9534f072e87fea987b0760342ed6308d2c9634 fea6325e2e69d68931089ac29e7809f2e01e98cf jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842922 +0000 checkout: moving from ec9534f072e87fea987b0760342ed6308d2c9634 to fea6325e2e69d68931089ac29e7809f2e01e98cf
fea6325e2e69d68931089ac29e7809f2e01e98cf 9f072d823a1eb18fb9105f182622dfa490a9991b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842922 +0000 checkout: moving from fea6325e2e69d68931089ac29e7809f2e01e98cf to 9f072d823a1eb18fb9105f182622dfa490a9991b
9f072d823a1eb18fb9105f182622dfa490a9991b 64a6eafccb7f407621d3b8fb967bfb789e5b28bd jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842924 +0000 checkout: moving from 9f072d823a1eb18fb9105f182622dfa490a9991b to 64a6eafccb7f407621d3b8fb967bfb789e5b28bd
64a6eafccb7f407621d3b8fb967bfb789e5b28bd aa9b7ebd01f860c20df9c14129dbbc35cb9d989c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842924 +0000 checkout: moving from 64a6eafccb7f407621d3b8fb967bfb789e5b28bd to aa9b7ebd01f860c20df9c14129dbbc35cb9d989c
aa9b7ebd01f860c20df9c14129dbbc35cb9d989c 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842928 +0000 checkout: moving from aa9b7ebd01f860c20df9c14129dbbc35cb9d989c to 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c
7b6f4c9342d49fcfd2919281b82bbd249bc29e4c 55b3be6bccede9757826f3b9524df89a9ba81baa jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842928 +0000 checkout: moving from 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c to 55b3be6bccede9757826f3b9524df89a9ba81baa
55b3be6bccede9757826f3b9524df89a9ba81baa 9f072d823a1eb18fb9105f182622dfa490a9991b jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842932 +0000 checkout: moving from 55b3be6bccede9757826f3b9524df89a9ba81baa to 9f072d823a1eb18fb9105f182622dfa490a9991b
9f072d823a1eb18fb9105f182622dfa490a9991b 2d9d3a70a200eba3b6584c0ddb4f0d778e8338fc jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842933 +0000 checkout: moving from 9f072d823a1eb18fb9105f182622dfa490a9991b to 2d9d3a70a200eba3b6584c0ddb4f0d778e8338fc
2d9d3a70a200eba3b6584c0ddb4f0d778e8338fc 772d2fa862b6622bbeb31b50437680887a35e749 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842935 +0000 checkout: moving from 2d9d3a70a200eba3b6584c0ddb4f0d778e8338fc to 772d2fa862b6622bbeb31b50437680887a35e749
772d2fa862b6622bbeb31b50437680887a35e749 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842935 +0000 checkout: moving from 772d2fa862b6622bbeb31b50437680887a35e749 to 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c
7b6f4c9342d49fcfd2919281b82bbd249bc29e4c aa9b7ebd01f860c20df9c14129dbbc35cb9d989c jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842943 +0000 checkout: moving from 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c to aa9b7ebd01f860c20df9c14129dbbc35cb9d989c
aa9b7ebd01f860c20df9c14129dbbc35cb9d989c 1615dfe94491320668efa40dc752b2f873001fc7 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842943 +0000 checkout: moving from aa9b7ebd01f860c20df9c14129dbbc35cb9d989c to 1615dfe94491320668efa40dc752b2f873001fc7
1615dfe94491320668efa40dc752b2f873001fc7 2c9b4dccbcf31012913b270cc356a30ab0cab89f jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842949 +0000 checkout: moving from 1615dfe94491320668efa40dc752b2f873001fc7 to 2c9b4dccbcf31012913b270cc356a30ab0cab89f
2c9b4dccbcf31012913b270cc356a30ab0cab89f 2e2919d21c4590212b6b471075f81749e4606c26 jupyter <jupyter@data-collection2-susnato.c.rishabh-experiments.internal> 1704842950 +0000 checkout: moving from 2c9b4dccbcf31012913b270cc356a30ab0cab89f to 2e2919d21c4590212b6b471075f81749e4606c26
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/charts/apollo-portal-0.2.0.tgz | ) +aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=Helm <o۸[b[Բi! wחfrua(hils#Zrs} %Y6Moǖ3pfd<Ix7Bw>#B & AoͿi?x $xO^ xH&\*"_M9H#F!)g!̏=eϾe$ḥ😤i5 ֨ x3b32zSf؏xڋYEֳH+ -t.QD)dc/%RVz%E'Q4tKw%MM=
e(duSB xAI S@S #*y HZ}j zjgYB#e 1 xo$G`?>=WY c6eIrER|?G!h!t:@<g*WYDz&x x4%S = Tq(pGM贾n= E;@'ɐ'4Zp9j(P"S0OF =bN#C[l͖&#GfE''C@+dBU "SC@)55dd` $= WfI+`ƥ2 ]q[F̎ @%[B zM &d1X4
CO Ξ'- _yٜ
Rd
DP=& cP ԇz{Ǒln*
410Hqa (( )\y= 3A2'Ts8H9QZ:$u\OdaG67[:c738nF]RTbp Hsk^]]
&xLAk#KϩN!Q7BrHԬ
)A+=k!n_z=:98,`
O<6$Qwr @<2hl`Cwlâ CS[k{EI
Hm2
P(c),1eӳ\Mޘ_MvjB_$(# bfTq26VԐͦ=z$_
,!
eNjO_
O1]:5Z Bh 0A"1.I $txSk-k
6cx 4|7#t2g$BX.`W
iwY.-gUXRc,JcڷZK>V?6 61I?ȥOX
h a M 96£R`FHN.^!\*HkR+ˡ6wc2'4Ѧwqi9D-Q>DΘ\yۃg ]|<oDۉ:B[H,aS (iO*2]Z- d1VU2GjslZmя{ 8}zECnD ,;;t:[WbVDҹB2~~?V\",x.x;█
]!dEm+a!\7s+hX G&L65o }UadLa\ZR6#xݍBO{mߧ&
쫏'A#;=9<і 4l8KXg
_S$f[ 6(1N(
bF[f+gP"g4 NwM
MXHjNaM2A@wi`?5w~sӔ3Ho:,T}2lm 0/Iڝ
J; +ϭw̹-fm.05d-TD;{5j+=gmE<#xW M2R9v6+eKJo bL(Esf_2g[
3
2헞m_Y)2}ERpw889}=Fvs2HIPpn ~%W{=t#'
2ˠw
W-\=6U6>6)"3# Ga&fWӭU VʩM dS vKf',`6;{ۤ!Qy-Ϝ
Sb/.@eoM.JVR% R%#V}dsY@Եͼ1LRYӨdq,хU4H5n"hw` % S0nZ&3jzwg% 6h|bV+=@R 4
N+Q ,eFmbg`Ud+qІHIXrH)Q
ƠmgV3xKloq)wHQ_$M6nW W"@!2Au %-yX s)Vpt} E 9=ڴn4Usqpjt5"Si[[l \ژsb<QC ^9eߚr2k05 : _4炛ժӤ2<m[C39к)5ۨҪ{W<I χwGW?~x/Oo?^^_4&ZyjR}*% <U 1S7 o憺Y36[p{[1FIkY/wxxOo*~;۪C֪eEAP1LEوG7&n-t.8[ mXj e
c`=eLwսD;JNNk4;UWnx"V*9J?Z&Y+<82k?hUk:e ѨTTO>fm+3ÿFQڞ"-p4y^O#cY+~5]A' 18iFB~
:iBudw>FT?SUVO[.n(7ol?FEH )dZ`!\yϖɃ 5mTn 5=UFBLidqAV\Jm]7HCr @ TqcC0
L9W
F.ek=u $A7Qt;rU kiHO16_^W?x 6f+gؕ+ܡxnƴC+b-amY[f9TqPn;/Ǹn\Al< g_5?i)>o:4E&ۜ dcԅ]q?v.
Fjv,֏-oaI|be dٹzŘS;,8eJ><|,]:
". BLKq kwq7*ߟa) ƾɫzҞÐ(mE{;p;C&O2E{Jyf& L>
M_(:G<',é9 2z=ۏ>g83=5K2=Hqsp#?g>-? 3Ńٴ?rzkDzg R :^ <pBz~& )ϧ1ϟˈ{J?? D/ N | ) +aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=Helm <o۸[b[Բi! wחfrua(hils#Zrs} %Y6Moǖ3pfd<Ix7Bw>#B & AoͿi?x $xO^ xH&\*"_M9H#F!)g!̏=eϾe$ḥ😤i5 ֨ x3b32zSf؏xڋYEֳH+ -t.QD)dc/%RVz%E'Q4tKw%MM=
e(duSB xAI S@S #*y HZ}j zjgYB#e 1 xo$G`?>=WY c6eIrER|?G!h!t:@<g*WYDz&x x4%S = Tq(pGM贾n= E;@'ɐ'4Zp9j(P"S0OF =bN#C[l͖&#GfE''C@+dBU "SC@)55dd` $= WfI+`ƥ2 ]q[F̎ @%[B zM &d1X4
CO Ξ'- _yٜ
Rd
DP=& cP ԇz{Ǒln*
410Hqa (( )\y= 3A2'Ts8H9QZ:$u\OdaG67[:c738nF]RTbp Hsk^]]
&xLAk#KϩN!Q7BrHԬ
)A+=k!n_z=:98,`
O<6$Qwr @<2hl`Cwlâ CS[k{EI
Hm2
P(c),1eӳ\Mޘ_MvjB_$(# bfTq26VԐͦ=z$_
,!
eNjO_
O1]:5Z Bh 0A"1.I $txSk-k
6cx 4|7#t2g$BX.`W
iwY.-gUXRc,JcڷZK>V?6 61I?ȥOX
h a M 96£R`FHN.^!\*HkR+ˡ6wc2'4Ѧwqi9D-Q>DΘ\yۃg ]|<oDۉ:B[H,aS (iO*2]Z- d1VU2GjslZmя{ 8}zECnD ,;;t:[WbVDҹB2~~?V\",x.x;█
]!dEm+a!\7s+hX G&L65o }UadLa\ZR6#xݍBO{mߧ&
쫏'A#;=9<і 4l8KXg
_S$f[ 6(1N(
bF[f+gP"g4 NwM
MXHjNaM2A@wi`?5w~sӔ3Ho:,T}2lm 0/Iڝ
J; +ϭw̹-fm.05d-TD;{5j+=gmE<#xW M2R9v6+eKJo bL(Esf_2g[
3
2헞m_Y)2}ERpw889}=Fvs2HIPpn ~%W{=t#'
2ˠw
W-\=6U6>6)"3# Ga&fWӭU VʩM dS vKf',`6;{ۤ!Qy-Ϝ
Sb/.@eoM.JVR% R%#V}dsY@Եͼ1LRYӨdq,хU4H5n"hw` % S0nZ&3jzwg% 6h|bV+=@R 4
N+Q ,eFmbg`Ud+qІHIXrH)Q
ƠmgV3xKloq)wHQ_$M6nW W"@!2Au %-yX s)Vpt} E 9=ڴn4Usqpjt5"Si[[l \ژsb<QC ^9eߚr2k05 : _4炛ժӤ2<m[C39к)5ۨҪ{W<I χwGW?~x/Oo?^^_4&ZyjR}*% <U 1S7 o憺Y36[p{[1FIkY/wxxOo*~;۪C֪eEAP1LEوG7&n-t.8[ mXj e
c`=eLwսD;JNNk4;UWnx"V*9J?Z&Y+<82k?hUk:e ѨTTO>fm+3ÿFQڞ"-p4y^O#cY+~5]A' 18iFB~
:iBudw>FT?SUVO[.n(7ol?FEH )dZ`!\yϖɃ 5mTn 5=UFBLidqAV\Jm]7HCr @ TqcC0
L9W
F.ek=u $A7Qt;rU kiHO16_^W?x 6f+gؕ+ܡxnƴC+b-amY[f9TqPn;/Ǹn\Al< g_5?i)>o:4E&ۜ dcԅ]q?v.
Fjv,֏-oaI|be dٹzŘS;,8eJ><|,]:
". BLKq kwq7*ߟa) ƾɫzҞÐ(mE{;p;C&O2E{Jyf& L>
M_(:G<',é9 2z=ۏ>g83=5K2=Hqsp#?g>-? 3Ńٴ?rzkDzg R :^ <pBz~& )ϧ1ϟˈ{J?? D/ N | -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/InstanceConfigControllerTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Instance;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.service.InstanceService;
import com.ctrip.framework.apollo.biz.service.ReleaseService;
import com.ctrip.framework.apollo.common.dto.InstanceDTO;
import com.ctrip.framework.apollo.common.dto.PageDTO;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class InstanceConfigControllerTest {
private InstanceConfigController instanceConfigController;
@Mock
private ReleaseService releaseService;
@Mock
private InstanceService instanceService;
private Pageable pageable;
@Before
public void setUp() throws Exception {
instanceConfigController = new InstanceConfigController(releaseService, instanceService);
pageable = PageRequest.of(0, 2);
}
@Test
public void getByRelease() throws Exception {
long someReleaseId = 1;
long someInstanceId = 1;
long anotherInstanceId = 2;
String someReleaseKey = "someKey";
Release someRelease = new Release();
someRelease.setReleaseKey(someReleaseKey);
String someAppId = "someAppId";
String anotherAppId = "anotherAppId";
String someCluster = "someCluster";
String someDataCenter = "someDC";
String someConfigAppId = "someConfigAppId";
String someConfigNamespace = "someNamespace";
String someIp = "someIp";
Date someReleaseDeliveryTime = new Date();
Date anotherReleaseDeliveryTime = new Date();
when(releaseService.findOne(someReleaseId)).thenReturn(someRelease);
InstanceConfig someInstanceConfig = assembleInstanceConfig(someInstanceId, someConfigAppId,
someConfigNamespace, someReleaseKey, someReleaseDeliveryTime);
InstanceConfig anotherInstanceConfig = assembleInstanceConfig(anotherInstanceId,
someConfigAppId, someConfigNamespace, someReleaseKey, anotherReleaseDeliveryTime);
List<InstanceConfig> instanceConfigs = Lists.newArrayList(someInstanceConfig,
anotherInstanceConfig);
Page<InstanceConfig> instanceConfigPage = new PageImpl<>(instanceConfigs, pageable,
instanceConfigs.size());
when(instanceService.findActiveInstanceConfigsByReleaseKey(someReleaseKey, pageable))
.thenReturn(instanceConfigPage);
Instance someInstance = assembleInstance(someInstanceId, someAppId,
someCluster, someDataCenter, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, anotherAppId,
someCluster, someDataCenter, someIp);
List<Instance> instances = Lists.newArrayList(someInstance, anotherInstance);
Set<Long> instanceIds = Sets.newHashSet(someInstanceId, anotherInstanceId);
when(instanceService.findInstancesByIds(instanceIds))
.thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getByRelease(someReleaseId, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
assertEquals(1, someInstanceDto.getConfigs().size());
assertEquals(someReleaseDeliveryTime, someInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
assertEquals(1, anotherInstanceDto.getConfigs().size());
assertEquals(anotherReleaseDeliveryTime, anotherInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
}
@Test(expected = NotFoundException.class)
public void testGetByReleaseWhenReleaseIsNotFound() throws Exception {
long someReleaseIdNotExists = 1;
when(releaseService.findOne(someReleaseIdNotExists)).thenReturn(null);
instanceConfigController.getByRelease(someReleaseIdNotExists, pageable);
}
@Test
public void testGetByReleasesNotIn() throws Exception {
String someConfigAppId = "someConfigAppId";
String someConfigClusterName = "someConfigClusterName";
String someConfigNamespaceName = "someConfigNamespaceName";
long someReleaseId = 1;
long anotherReleaseId = 2;
String releaseIds = Joiner.on(",").join(someReleaseId, anotherReleaseId);
Date someReleaseDeliveryTime = new Date();
Date anotherReleaseDeliveryTime = new Date();
Release someRelease = mock(Release.class);
Release anotherRelease = mock(Release.class);
String someReleaseKey = "someReleaseKey";
String anotherReleaseKey = "anotherReleaseKey";
when(someRelease.getReleaseKey()).thenReturn(someReleaseKey);
when(anotherRelease.getReleaseKey()).thenReturn(anotherReleaseKey);
when(releaseService.findByReleaseIds(Sets.newHashSet(someReleaseId, anotherReleaseId)))
.thenReturn(Lists.newArrayList(someRelease, anotherRelease));
long someInstanceId = 1;
long anotherInstanceId = 2;
String someInstanceConfigReleaseKey = "someInstanceConfigReleaseKey";
String anotherInstanceConfigReleaseKey = "anotherInstanceConfigReleaseKey";
InstanceConfig someInstanceConfig = mock(InstanceConfig.class);
InstanceConfig anotherInstanceConfig = mock(InstanceConfig.class);
when(someInstanceConfig.getInstanceId()).thenReturn(someInstanceId);
when(anotherInstanceConfig.getInstanceId()).thenReturn(anotherInstanceId);
when(someInstanceConfig.getReleaseKey()).thenReturn(someInstanceConfigReleaseKey);
when(anotherInstanceConfig.getReleaseKey()).thenReturn(anotherInstanceConfigReleaseKey);
when(someInstanceConfig.getReleaseDeliveryTime()).thenReturn(someReleaseDeliveryTime);
when(anotherInstanceConfig.getReleaseDeliveryTime()).thenReturn(anotherReleaseDeliveryTime);
when(instanceService.findInstanceConfigsByNamespaceWithReleaseKeysNotIn(someConfigAppId,
someConfigClusterName, someConfigNamespaceName, Sets.newHashSet(someReleaseKey,
anotherReleaseKey))).thenReturn(Lists.newArrayList(someInstanceConfig,
anotherInstanceConfig));
String someInstanceAppId = "someInstanceAppId";
String someInstanceClusterName = "someInstanceClusterName";
String someInstanceNamespaceName = "someInstanceNamespaceName";
String someIp = "someIp";
String anotherIp = "anotherIp";
Instance someInstance = assembleInstance(someInstanceId, someInstanceAppId,
someInstanceClusterName,
someInstanceNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someInstanceAppId,
someInstanceClusterName,
someInstanceNamespaceName, anotherIp);
when(instanceService.findInstancesByIds(Sets.newHashSet(someInstanceId, anotherInstanceId)))
.thenReturn(Lists.newArrayList(someInstance, anotherInstance));
Release someInstanceConfigRelease = new Release();
someInstanceConfigRelease.setReleaseKey(someInstanceConfigReleaseKey);
Release anotherInstanceConfigRelease = new Release();
anotherInstanceConfigRelease.setReleaseKey(anotherInstanceConfigReleaseKey);
when(releaseService.findByReleaseKeys(Sets.newHashSet(someInstanceConfigReleaseKey,
anotherInstanceConfigReleaseKey))).thenReturn(Lists.newArrayList(someInstanceConfigRelease,
anotherInstanceConfigRelease));
List<InstanceDTO> result = instanceConfigController.getByReleasesNotIn(someConfigAppId,
someConfigClusterName, someConfigNamespaceName, releaseIds);
assertEquals(2, result.size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
assertEquals(someInstanceConfigReleaseKey, someInstanceDto.getConfigs().get(0).getRelease()
.getReleaseKey());
assertEquals(anotherInstanceConfigReleaseKey, anotherInstanceDto.getConfigs().get(0)
.getRelease()
.getReleaseKey());
assertEquals(someReleaseDeliveryTime, someInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
assertEquals(anotherReleaseDeliveryTime, anotherInstanceDto.getConfigs().get(0)
.getReleaseDeliveryTime());
}
@Test
public void testGetInstancesByNamespace() throws Exception {
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
String someIp = "someIp";
long someInstanceId = 1;
long anotherInstanceId = 2;
Instance someInstance = assembleInstance(someInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Page<Instance> instances = new PageImpl<>(Lists.newArrayList(someInstance, anotherInstance),
pageable, 2);
when(instanceService.findInstancesByNamespace(someAppId, someClusterName, someNamespaceName,
pageable)).thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getInstancesByNamespace(someAppId,
someClusterName, someNamespaceName, null, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
}
@Test
public void testGetInstancesByNamespaceAndInstanceAppId() throws Exception {
String someInstanceAppId = "someInstanceAppId";
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
String someIp = "someIp";
long someInstanceId = 1;
long anotherInstanceId = 2;
Instance someInstance = assembleInstance(someInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Page<Instance> instances = new PageImpl<>(Lists.newArrayList(someInstance, anotherInstance),
pageable, 2);
when(instanceService.findInstancesByNamespaceAndInstanceAppId(someInstanceAppId, someAppId,
someClusterName, someNamespaceName, pageable)).thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getInstancesByNamespace(someAppId,
someClusterName, someNamespaceName, someInstanceAppId, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
}
@Test
public void testGetInstancesCountByNamespace() throws Exception {
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
Page<Instance> instances = new PageImpl<>(Collections.emptyList(), pageable, 2);
when(instanceService.findInstancesByNamespace(eq(someAppId), eq(someClusterName),
eq(someNamespaceName), any(Pageable.class))).thenReturn(instances);
long result = instanceConfigController.getInstancesCountByNamespace(someAppId,
someClusterName, someNamespaceName);
assertEquals(2, result);
}
private void verifyInstance(Instance instance, InstanceDTO instanceDTO) {
assertEquals(instance.getId(), instanceDTO.getId());
assertEquals(instance.getAppId(), instanceDTO.getAppId());
assertEquals(instance.getClusterName(), instanceDTO.getClusterName());
assertEquals(instance.getDataCenter(), instanceDTO.getDataCenter());
assertEquals(instance.getIp(), instanceDTO.getIp());
assertEquals(instance.getDataChangeCreatedTime(), instanceDTO.getDataChangeCreatedTime());
}
private Instance assembleInstance(long instanceId, String appId, String clusterName, String
dataCenter, String ip) {
Instance instance = new Instance();
instance.setId(instanceId);
instance.setAppId(appId);
instance.setIp(ip);
instance.setClusterName(clusterName);
instance.setDataCenter(dataCenter);
instance.setDataChangeCreatedTime(new Date());
return instance;
}
private InstanceConfig assembleInstanceConfig(long instanceId, String configAppId, String
configNamespaceName, String releaseKey, Date releaseDeliveryTime) {
InstanceConfig instanceConfig = new InstanceConfig();
instanceConfig.setInstanceId(instanceId);
instanceConfig.setConfigAppId(configAppId);
instanceConfig.setConfigNamespaceName(configNamespaceName);
instanceConfig.setReleaseKey(releaseKey);
instanceConfig.setDataChangeLastModifiedTime(new Date());
instanceConfig.setReleaseDeliveryTime(releaseDeliveryTime);
return instanceConfig;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Instance;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.service.InstanceService;
import com.ctrip.framework.apollo.biz.service.ReleaseService;
import com.ctrip.framework.apollo.common.dto.InstanceDTO;
import com.ctrip.framework.apollo.common.dto.PageDTO;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class InstanceConfigControllerTest {
private InstanceConfigController instanceConfigController;
@Mock
private ReleaseService releaseService;
@Mock
private InstanceService instanceService;
private Pageable pageable;
@Before
public void setUp() throws Exception {
instanceConfigController = new InstanceConfigController(releaseService, instanceService);
pageable = PageRequest.of(0, 2);
}
@Test
public void getByRelease() throws Exception {
long someReleaseId = 1;
long someInstanceId = 1;
long anotherInstanceId = 2;
String someReleaseKey = "someKey";
Release someRelease = new Release();
someRelease.setReleaseKey(someReleaseKey);
String someAppId = "someAppId";
String anotherAppId = "anotherAppId";
String someCluster = "someCluster";
String someDataCenter = "someDC";
String someConfigAppId = "someConfigAppId";
String someConfigNamespace = "someNamespace";
String someIp = "someIp";
Date someReleaseDeliveryTime = new Date();
Date anotherReleaseDeliveryTime = new Date();
when(releaseService.findOne(someReleaseId)).thenReturn(someRelease);
InstanceConfig someInstanceConfig = assembleInstanceConfig(someInstanceId, someConfigAppId,
someConfigNamespace, someReleaseKey, someReleaseDeliveryTime);
InstanceConfig anotherInstanceConfig = assembleInstanceConfig(anotherInstanceId,
someConfigAppId, someConfigNamespace, someReleaseKey, anotherReleaseDeliveryTime);
List<InstanceConfig> instanceConfigs = Lists.newArrayList(someInstanceConfig,
anotherInstanceConfig);
Page<InstanceConfig> instanceConfigPage = new PageImpl<>(instanceConfigs, pageable,
instanceConfigs.size());
when(instanceService.findActiveInstanceConfigsByReleaseKey(someReleaseKey, pageable))
.thenReturn(instanceConfigPage);
Instance someInstance = assembleInstance(someInstanceId, someAppId,
someCluster, someDataCenter, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, anotherAppId,
someCluster, someDataCenter, someIp);
List<Instance> instances = Lists.newArrayList(someInstance, anotherInstance);
Set<Long> instanceIds = Sets.newHashSet(someInstanceId, anotherInstanceId);
when(instanceService.findInstancesByIds(instanceIds))
.thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getByRelease(someReleaseId, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
assertEquals(1, someInstanceDto.getConfigs().size());
assertEquals(someReleaseDeliveryTime, someInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
assertEquals(1, anotherInstanceDto.getConfigs().size());
assertEquals(anotherReleaseDeliveryTime, anotherInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
}
@Test(expected = NotFoundException.class)
public void testGetByReleaseWhenReleaseIsNotFound() throws Exception {
long someReleaseIdNotExists = 1;
when(releaseService.findOne(someReleaseIdNotExists)).thenReturn(null);
instanceConfigController.getByRelease(someReleaseIdNotExists, pageable);
}
@Test
public void testGetByReleasesNotIn() throws Exception {
String someConfigAppId = "someConfigAppId";
String someConfigClusterName = "someConfigClusterName";
String someConfigNamespaceName = "someConfigNamespaceName";
long someReleaseId = 1;
long anotherReleaseId = 2;
String releaseIds = Joiner.on(",").join(someReleaseId, anotherReleaseId);
Date someReleaseDeliveryTime = new Date();
Date anotherReleaseDeliveryTime = new Date();
Release someRelease = mock(Release.class);
Release anotherRelease = mock(Release.class);
String someReleaseKey = "someReleaseKey";
String anotherReleaseKey = "anotherReleaseKey";
when(someRelease.getReleaseKey()).thenReturn(someReleaseKey);
when(anotherRelease.getReleaseKey()).thenReturn(anotherReleaseKey);
when(releaseService.findByReleaseIds(Sets.newHashSet(someReleaseId, anotherReleaseId)))
.thenReturn(Lists.newArrayList(someRelease, anotherRelease));
long someInstanceId = 1;
long anotherInstanceId = 2;
String someInstanceConfigReleaseKey = "someInstanceConfigReleaseKey";
String anotherInstanceConfigReleaseKey = "anotherInstanceConfigReleaseKey";
InstanceConfig someInstanceConfig = mock(InstanceConfig.class);
InstanceConfig anotherInstanceConfig = mock(InstanceConfig.class);
when(someInstanceConfig.getInstanceId()).thenReturn(someInstanceId);
when(anotherInstanceConfig.getInstanceId()).thenReturn(anotherInstanceId);
when(someInstanceConfig.getReleaseKey()).thenReturn(someInstanceConfigReleaseKey);
when(anotherInstanceConfig.getReleaseKey()).thenReturn(anotherInstanceConfigReleaseKey);
when(someInstanceConfig.getReleaseDeliveryTime()).thenReturn(someReleaseDeliveryTime);
when(anotherInstanceConfig.getReleaseDeliveryTime()).thenReturn(anotherReleaseDeliveryTime);
when(instanceService.findInstanceConfigsByNamespaceWithReleaseKeysNotIn(someConfigAppId,
someConfigClusterName, someConfigNamespaceName, Sets.newHashSet(someReleaseKey,
anotherReleaseKey))).thenReturn(Lists.newArrayList(someInstanceConfig,
anotherInstanceConfig));
String someInstanceAppId = "someInstanceAppId";
String someInstanceClusterName = "someInstanceClusterName";
String someInstanceNamespaceName = "someInstanceNamespaceName";
String someIp = "someIp";
String anotherIp = "anotherIp";
Instance someInstance = assembleInstance(someInstanceId, someInstanceAppId,
someInstanceClusterName,
someInstanceNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someInstanceAppId,
someInstanceClusterName,
someInstanceNamespaceName, anotherIp);
when(instanceService.findInstancesByIds(Sets.newHashSet(someInstanceId, anotherInstanceId)))
.thenReturn(Lists.newArrayList(someInstance, anotherInstance));
Release someInstanceConfigRelease = new Release();
someInstanceConfigRelease.setReleaseKey(someInstanceConfigReleaseKey);
Release anotherInstanceConfigRelease = new Release();
anotherInstanceConfigRelease.setReleaseKey(anotherInstanceConfigReleaseKey);
when(releaseService.findByReleaseKeys(Sets.newHashSet(someInstanceConfigReleaseKey,
anotherInstanceConfigReleaseKey))).thenReturn(Lists.newArrayList(someInstanceConfigRelease,
anotherInstanceConfigRelease));
List<InstanceDTO> result = instanceConfigController.getByReleasesNotIn(someConfigAppId,
someConfigClusterName, someConfigNamespaceName, releaseIds);
assertEquals(2, result.size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
assertEquals(someInstanceConfigReleaseKey, someInstanceDto.getConfigs().get(0).getRelease()
.getReleaseKey());
assertEquals(anotherInstanceConfigReleaseKey, anotherInstanceDto.getConfigs().get(0)
.getRelease()
.getReleaseKey());
assertEquals(someReleaseDeliveryTime, someInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
assertEquals(anotherReleaseDeliveryTime, anotherInstanceDto.getConfigs().get(0)
.getReleaseDeliveryTime());
}
@Test
public void testGetInstancesByNamespace() throws Exception {
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
String someIp = "someIp";
long someInstanceId = 1;
long anotherInstanceId = 2;
Instance someInstance = assembleInstance(someInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Page<Instance> instances = new PageImpl<>(Lists.newArrayList(someInstance, anotherInstance),
pageable, 2);
when(instanceService.findInstancesByNamespace(someAppId, someClusterName, someNamespaceName,
pageable)).thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getInstancesByNamespace(someAppId,
someClusterName, someNamespaceName, null, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
}
@Test
public void testGetInstancesByNamespaceAndInstanceAppId() throws Exception {
String someInstanceAppId = "someInstanceAppId";
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
String someIp = "someIp";
long someInstanceId = 1;
long anotherInstanceId = 2;
Instance someInstance = assembleInstance(someInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Page<Instance> instances = new PageImpl<>(Lists.newArrayList(someInstance, anotherInstance),
pageable, 2);
when(instanceService.findInstancesByNamespaceAndInstanceAppId(someInstanceAppId, someAppId,
someClusterName, someNamespaceName, pageable)).thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getInstancesByNamespace(someAppId,
someClusterName, someNamespaceName, someInstanceAppId, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
}
@Test
public void testGetInstancesCountByNamespace() throws Exception {
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
Page<Instance> instances = new PageImpl<>(Collections.emptyList(), pageable, 2);
when(instanceService.findInstancesByNamespace(eq(someAppId), eq(someClusterName),
eq(someNamespaceName), any(Pageable.class))).thenReturn(instances);
long result = instanceConfigController.getInstancesCountByNamespace(someAppId,
someClusterName, someNamespaceName);
assertEquals(2, result);
}
private void verifyInstance(Instance instance, InstanceDTO instanceDTO) {
assertEquals(instance.getId(), instanceDTO.getId());
assertEquals(instance.getAppId(), instanceDTO.getAppId());
assertEquals(instance.getClusterName(), instanceDTO.getClusterName());
assertEquals(instance.getDataCenter(), instanceDTO.getDataCenter());
assertEquals(instance.getIp(), instanceDTO.getIp());
assertEquals(instance.getDataChangeCreatedTime(), instanceDTO.getDataChangeCreatedTime());
}
private Instance assembleInstance(long instanceId, String appId, String clusterName, String
dataCenter, String ip) {
Instance instance = new Instance();
instance.setId(instanceId);
instance.setAppId(appId);
instance.setIp(ip);
instance.setClusterName(clusterName);
instance.setDataCenter(dataCenter);
instance.setDataChangeCreatedTime(new Date());
return instance;
}
private InstanceConfig assembleInstanceConfig(long instanceId, String configAppId, String
configNamespaceName, String releaseKey, Date releaseDeliveryTime) {
InstanceConfig instanceConfig = new InstanceConfig();
instanceConfig.setInstanceId(instanceId);
instanceConfig.setConfigAppId(configAppId);
instanceConfig.setConfigNamespaceName(configNamespaceName);
instanceConfig.setReleaseKey(releaseKey);
instanceConfig.setDataChangeLastModifiedTime(new Date());
instanceConfig.setReleaseDeliveryTime(releaseDeliveryTime);
return instanceConfig;
}
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/AdminServiceTransactionTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
import com.ctrip.framework.apollo.biz.repository.AppRepository;
import com.ctrip.framework.apollo.biz.repository.ClusterRepository;
import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
import com.ctrip.framework.apollo.common.entity.App;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.transaction.AfterTransaction;
import org.springframework.test.context.transaction.BeforeTransaction;
import java.util.Date;
public class AdminServiceTransactionTest extends AbstractIntegrationTest {
@Autowired
AdminService adminService;
@Autowired
private AppRepository appRepository;
@Autowired
private AppNamespaceRepository appNamespaceRepository;
@Autowired
private NamespaceRepository namespaceRepository;
@Autowired
private ClusterRepository clusterRepository;
@BeforeTransaction
public void verifyInitialDatabaseState() {
for (App app : appRepository.findAll()) {
System.out.println(app.getAppId());
}
Assert.assertEquals(0, appRepository.count());
Assert.assertEquals(7, appNamespaceRepository.count());
Assert.assertEquals(0, namespaceRepository.count());
Assert.assertEquals(0, clusterRepository.count());
}
@Before
public void setUpTestDataWithinTransaction() {
Assert.assertEquals(0, appRepository.count());
Assert.assertEquals(7, appNamespaceRepository.count());
Assert.assertEquals(0, namespaceRepository.count());
Assert.assertEquals(0, clusterRepository.count());
}
@Test
@Rollback
public void modifyDatabaseWithinTransaction() {
String appId = "someAppId";
App app = new App();
app.setAppId(appId);
app.setName("someAppName");
String owner = "someOwnerName";
app.setOwnerName(owner);
app.setOwnerEmail("someOwnerName@ctrip.com");
app.setDataChangeCreatedBy(owner);
app.setDataChangeLastModifiedBy(owner);
app.setDataChangeCreatedTime(new Date());
adminService.createNewApp(app);
}
@After
public void tearDownWithinTransaction() {
Assert.assertEquals(1, appRepository.count());
Assert.assertEquals(8, appNamespaceRepository.count());
Assert.assertEquals(1, namespaceRepository.count());
Assert.assertEquals(1, clusterRepository.count());
}
@AfterTransaction
public void verifyFinalDatabaseState() {
Assert.assertEquals(0, appRepository.count());
Assert.assertEquals(7, appNamespaceRepository.count());
Assert.assertEquals(0, namespaceRepository.count());
Assert.assertEquals(0, clusterRepository.count());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
import com.ctrip.framework.apollo.biz.repository.AppRepository;
import com.ctrip.framework.apollo.biz.repository.ClusterRepository;
import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
import com.ctrip.framework.apollo.common.entity.App;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.transaction.AfterTransaction;
import org.springframework.test.context.transaction.BeforeTransaction;
import java.util.Date;
public class AdminServiceTransactionTest extends AbstractIntegrationTest {
@Autowired
AdminService adminService;
@Autowired
private AppRepository appRepository;
@Autowired
private AppNamespaceRepository appNamespaceRepository;
@Autowired
private NamespaceRepository namespaceRepository;
@Autowired
private ClusterRepository clusterRepository;
@BeforeTransaction
public void verifyInitialDatabaseState() {
for (App app : appRepository.findAll()) {
System.out.println(app.getAppId());
}
Assert.assertEquals(0, appRepository.count());
Assert.assertEquals(7, appNamespaceRepository.count());
Assert.assertEquals(0, namespaceRepository.count());
Assert.assertEquals(0, clusterRepository.count());
}
@Before
public void setUpTestDataWithinTransaction() {
Assert.assertEquals(0, appRepository.count());
Assert.assertEquals(7, appNamespaceRepository.count());
Assert.assertEquals(0, namespaceRepository.count());
Assert.assertEquals(0, clusterRepository.count());
}
@Test
@Rollback
public void modifyDatabaseWithinTransaction() {
String appId = "someAppId";
App app = new App();
app.setAppId(appId);
app.setName("someAppName");
String owner = "someOwnerName";
app.setOwnerName(owner);
app.setOwnerEmail("someOwnerName@ctrip.com");
app.setDataChangeCreatedBy(owner);
app.setDataChangeLastModifiedBy(owner);
app.setDataChangeCreatedTime(new Date());
adminService.createNewApp(app);
}
@After
public void tearDownWithinTransaction() {
Assert.assertEquals(1, appRepository.count());
Assert.assertEquals(8, appNamespaceRepository.count());
Assert.assertEquals(1, namespaceRepository.count());
Assert.assertEquals(1, clusterRepository.count());
}
@AfterTransaction
public void verifyFinalDatabaseState() {
Assert.assertEquals(0, appRepository.count());
Assert.assertEquals(7, appNamespaceRepository.count());
Assert.assertEquals(0, namespaceRepository.count());
Assert.assertEquals(0, clusterRepository.count());
}
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/signature/HmacSha1Utils.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.signature;
import com.google.common.io.BaseEncoding;
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
/**
* @author nisiyong
*/
public class HmacSha1Utils {
private static final String ALGORITHM_NAME = "HmacSHA1";
private static final String ENCODING = "UTF-8";
public static String signString(String stringToSign, String accessKeySecret) {
try {
Mac mac = Mac.getInstance(ALGORITHM_NAME);
mac.init(new SecretKeySpec(
accessKeySecret.getBytes(ENCODING),
ALGORITHM_NAME
));
byte[] signData = mac.doFinal(stringToSign.getBytes(ENCODING));
return BaseEncoding.base64().encode(signData);
} catch (NoSuchAlgorithmException | UnsupportedEncodingException | InvalidKeyException e) {
throw new IllegalArgumentException(e.toString());
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.signature;
import com.google.common.io.BaseEncoding;
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
/**
* @author nisiyong
*/
public class HmacSha1Utils {
private static final String ALGORITHM_NAME = "HmacSHA1";
private static final String ENCODING = "UTF-8";
public static String signString(String stringToSign, String accessKeySecret) {
try {
Mac mac = Mac.getInstance(ALGORITHM_NAME);
mac.init(new SecretKeySpec(
accessKeySecret.getBytes(ENCODING),
ALGORITHM_NAME
));
byte[] signData = mac.doFinal(stringToSign.getBytes(ENCODING));
return BaseEncoding.base64().encode(signData);
} catch (NoSuchAlgorithmException | UnsupportedEncodingException | InvalidKeyException e) {
throw new IllegalArgumentException(e.toString());
}
}
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/resources/application-ctrip.properties | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Titan Datasource (Ctrip only)
fat.titan.url=${fat_titan_url}
fat.titan.dbname=${fat_titan_dbname}
uat.titan.url=${uat_titan_url}
uat.titan.dbname=${uat_titan_dbname}
pro.titan.url=${pro_titan_url}
pro.titan.dbname=${pro_titan_dbname}
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Titan Datasource (Ctrip only)
fat.titan.url=${fat_titan_url}
fat.titan.dbname=${fat_titan_dbname}
uat.titan.url=${uat_titan_url}
uat.titan.dbname=${uat_titan_dbname}
pro.titan.url=${pro_titan_url}
pro.titan.dbname=${pro_titan_dbname}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigManager.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConfigManager {
/**
* Get the config instance for the namespace specified.
* @param namespace the namespace
* @return the config instance for the namespace
*/
Config getConfig(String namespace);
/**
* Get the config file instance for the namespace specified.
* @param namespace the namespace
* @param configFileFormat the config file format
* @return the config file instance for the namespace
*/
ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConfigManager {
/**
* Get the config instance for the namespace specified.
* @param namespace the namespace
* @return the config instance for the namespace
*/
Config getConfig(String namespace);
/**
* Get the config file instance for the namespace specified.
* @param namespace the namespace
* @param configFileFormat the config file format
* @return the config file instance for the namespace
*/
ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat);
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/common/config/AppConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.demo.spring.common.config;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import org.springframework.context.annotation.Configuration;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Configuration
@EnableApolloConfig(value = "application", order = 10)
public class AppConfig {
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.demo.spring.common.config;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import org.springframework.context.annotation.Configuration;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Configuration
@EnableApolloConfig(value = "application", order = 10)
public class AppConfig {
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RepositoryChangeListener.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import java.util.Properties;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface RepositoryChangeListener {
/**
* Invoked when config repository changes.
* @param namespace the namespace of this repository change
* @param newProperties the properties after change
*/
void onRepositoryChange(String namespace, Properties newProperties);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import java.util.Properties;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface RepositoryChangeListener {
/**
* Invoked when config repository changes.
* @param namespace the namespace of this repository change
* @param newProperties the properties after change
*/
void onRepositoryChange(String namespace, Properties newProperties);
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/ConsulDiscoveryService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.metaservice.service;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.google.common.collect.Lists;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
/**
* @author : kl
* Service discovery consul implementation
**/
@Service
@Profile({"consul-discovery"})
public class ConsulDiscoveryService implements DiscoveryService {
private final ConsulDiscoveryClient discoveryClient;
public ConsulDiscoveryService(ConsulDiscoveryClient discoveryClient) {
this.discoveryClient = discoveryClient;
}
@Override
public List<ServiceDTO> getServiceInstances(String serviceId) {
List<ServiceInstance> instances = discoveryClient.getInstances(serviceId);
List<ServiceDTO> serviceDTOList = Lists.newLinkedList();
if (!CollectionUtils.isEmpty(instances)) {
instances.forEach(instance -> {
ServiceDTO serviceDTO = this.toServiceDTO(instance, serviceId);
serviceDTOList.add(serviceDTO);
});
}
return serviceDTOList;
}
private ServiceDTO toServiceDTO(ServiceInstance instance, String appName) {
ServiceDTO service = new ServiceDTO();
service.setAppName(appName);
service.setInstanceId(instance.getInstanceId());
String homePageUrl = "http://" + instance.getHost() + ":" + instance.getPort() + "/";
service.setHomepageUrl(homePageUrl);
return service;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.metaservice.service;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.google.common.collect.Lists;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
/**
* @author : kl
* Service discovery consul implementation
**/
@Service
@Profile({"consul-discovery"})
public class ConsulDiscoveryService implements DiscoveryService {
private final ConsulDiscoveryClient discoveryClient;
public ConsulDiscoveryService(ConsulDiscoveryClient discoveryClient) {
this.discoveryClient = discoveryClient;
}
@Override
public List<ServiceDTO> getServiceInstances(String serviceId) {
List<ServiceInstance> instances = discoveryClient.getInstances(serviceId);
List<ServiceDTO> serviceDTOList = Lists.newLinkedList();
if (!CollectionUtils.isEmpty(instances)) {
instances.forEach(instance -> {
ServiceDTO serviceDTO = this.toServiceDTO(instance, serviceId);
serviceDTOList.add(serviceDTO);
});
}
return serviceDTOList;
}
private ServiceDTO toServiceDTO(ServiceInstance instance, String appName) {
ServiceDTO service = new ServiceDTO();
service.setAppName(appName);
service.setInstanceId(instance.getInstanceId());
String homePageUrl = "http://" + instance.getHost() + ":" + instance.getPort() + "/";
service.setHomepageUrl(homePageUrl);
return service;
}
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/vendor/ui-ace/worker-json.js | "no use strict";!function(e){function t(e,t){var n=e,r="";while(n){var i=t[n];if(typeof i=="string")return i+r;if(i)return i.location.replace(/\/*$/,"/")+(r||i.main||i.name);if(i===!1)return"";var s=n.lastIndexOf("/");if(s===-1)break;r=n.substr(s)+r,n=n.slice(0,s)}return e}if(typeof e.window!="undefined"&&e.document)return;if(e.require&&e.define)return;e.console||(e.console=function(){var e=Array.prototype.slice.call(arguments,0);postMessage({type:"log",data:e})},e.console.error=e.console.warn=e.console.log=e.console.trace=e.console),e.window=e,e.ace=e,e.onerror=function(e,t,n,r,i){postMessage({type:"error",data:{message:e,data:i.data,file:t,line:n,col:r,stack:i.stack}})},e.normalizeModule=function(t,n){if(n.indexOf("!")!==-1){var r=n.split("!");return e.normalizeModule(t,r[0])+"!"+e.normalizeModule(t,r[1])}if(n.charAt(0)=="."){var i=t.split("/").slice(0,-1).join("/");n=(i?i+"/":"")+n;while(n.indexOf(".")!==-1&&s!=n){var s=n;n=n.replace(/^\.\//,"").replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return n},e.require=function(r,i){i||(i=r,r=null);if(!i.charAt)throw new Error("worker.js require() accepts only (parentId, id) as arguments");i=e.normalizeModule(r,i);var s=e.require.modules[i];if(s)return s.initialized||(s.initialized=!0,s.exports=s.factory().exports),s.exports;if(!e.require.tlns)return console.log("unable to load "+i);var o=t(i,e.require.tlns);return o.slice(-3)!=".js"&&(o+=".js"),e.require.id=i,e.require.modules[i]={},importScripts(o),e.require(r,i)},e.require.modules={},e.require.tlns={},e.define=function(t,n,r){arguments.length==2?(r=n,typeof t!="string"&&(n=t,t=e.require.id)):arguments.length==1&&(r=t,n=[],t=e.require.id);if(typeof r!="function"){e.require.modules[t]={exports:r,initialized:!0};return}n.length||(n=["require","exports","module"]);var i=function(n){return e.require(t,n)};e.require.modules[t]={exports:{},factory:function(){var e=this,t=r.apply(this,n.map(function(t){switch(t){case"require":return i;case"exports":return e.exports;case"module":return e;default:return i(t)}}));return t&&(e.exports=t),e}}},e.define.amd={},require.tlns={},e.initBaseUrls=function(t){for(var n in t)require.tlns[n]=t[n]},e.initSender=function(){var n=e.require("ace/lib/event_emitter").EventEmitter,r=e.require("ace/lib/oop"),i=function(){};return function(){r.implement(this,n),this.callback=function(e,t){postMessage({type:"call",id:t,data:e})},this.emit=function(e,t){postMessage({type:"event",name:e,data:t})}}.call(i.prototype),new i};var n=e.main=null,r=e.sender=null;e.onmessage=function(t){var i=t.data;if(i.event&&r)r._signal(i.event,i.data);else if(i.command)if(n[i.command])n[i.command].apply(n,i.args);else{if(!e[i.command])throw new Error("Unknown command:"+i.command);e[i.command].apply(e,i.args)}else if(i.init){e.initBaseUrls(i.tlns),require("ace/lib/es5-shim"),r=e.sender=e.initSender();var s=require(i.module)[i.classname];n=e.main=new s(r)}}}(this),define("ace/lib/oop",["require","exports","module"],function(e,t,n){"use strict";t.inherits=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})},t.mixin=function(e,t){for(var n in t)e[n]=t[n];return e},t.implement=function(e,n){t.mixin(e,n)}}),define("ace/range",["require","exports","module"],function(e,t,n){"use strict";var r=function(e,t){return e.row-t.row||e.column-t.column},i=function(e,t,n,r){this.start={row:e,column:t},this.end={row:n,column:r}};(function(){this.isEqual=function(e){return this.start.row===e.start.row&&this.end.row===e.end.row&&this.start.column===e.start.column&&this.end.column===e.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(e,t){return this.compare(e,t)==0},this.compareRange=function(e){var t,n=e.end,r=e.start;return t=this.compare(n.row,n.column),t==1?(t=this.compare(r.row,r.column),t==1?2:t==0?1:0):t==-1?-2:(t=this.compare(r.row,r.column),t==-1?-1:t==1?42:0)},this.comparePoint=function(e){return this.compare(e.row,e.column)},this.containsRange=function(e){return this.comparePoint(e.start)==0&&this.comparePoint(e.end)==0},this.intersects=function(e){var t=this.compareRange(e);return t==-1||t==0||t==1},this.isEnd=function(e,t){return this.end.row==e&&this.end.column==t},this.isStart=function(e,t){return this.start.row==e&&this.start.column==t},this.setStart=function(e,t){typeof e=="object"?(this.start.column=e.column,this.start.row=e.row):(this.start.row=e,this.start.column=t)},this.setEnd=function(e,t){typeof e=="object"?(this.end.column=e.column,this.end.row=e.row):(this.end.row=e,this.end.column=t)},this.inside=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)||this.isStart(e,t)?!1:!0:!1},this.insideStart=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)?!1:!0:!1},this.insideEnd=function(e,t){return this.compare(e,t)==0?this.isStart(e,t)?!1:!0:!1},this.compare=function(e,t){return!this.isMultiLine()&&e===this.start.row?t<this.start.column?-1:t>this.end.column?1:0:e<this.start.row?-1:e>this.end.row?1:this.start.row===e?t>=this.start.column?0:-1:this.end.row===e?t<=this.end.column?0:1:0},this.compareStart=function(e,t){return this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.compareEnd=function(e,t){return this.end.row==e&&this.end.column==t?1:this.compare(e,t)},this.compareInside=function(e,t){return this.end.row==e&&this.end.column==t?1:this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.clipRows=function(e,t){if(this.end.row>t)var n={row:t+1,column:0};else if(this.end.row<e)var n={row:e,column:0};if(this.start.row>t)var r={row:t+1,column:0};else if(this.start.row<e)var r={row:e,column:0};return i.fromPoints(r||this.start,n||this.end)},this.extend=function(e,t){var n=this.compare(e,t);if(n==0)return this;if(n==-1)var r={row:e,column:t};else var s={row:e,column:t};return i.fromPoints(r||this.start,s||this.end)},this.isEmpty=function(){return this.start.row===this.end.row&&this.start.column===this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return i.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new i(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new i(this.start.row,0,this.end.row,0)},this.toScreenRange=function(e){var t=e.documentToScreenPosition(this.start),n=e.documentToScreenPosition(this.end);return new i(t.row,t.column,n.row,n.column)},this.moveBy=function(e,t){this.start.row+=e,this.start.column+=t,this.end.row+=e,this.end.column+=t}}).call(i.prototype),i.fromPoints=function(e,t){return new i(e.row,e.column,t.row,t.column)},i.comparePoints=r,i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},t.Range=i}),define("ace/apply_delta",["require","exports","module"],function(e,t,n){"use strict";function r(e,t){throw console.log("Invalid Delta:",e),"Invalid Delta: "+t}function i(e,t){return t.row>=0&&t.row<e.length&&t.column>=0&&t.column<=e[t.row].length}function s(e,t){t.action!="insert"&&t.action!="remove"&&r(t,"delta.action must be 'insert' or 'remove'"),t.lines instanceof Array||r(t,"delta.lines must be an Array"),(!t.start||!t.end)&&r(t,"delta.start/end must be an present");var n=t.start;i(e,t.start)||r(t,"delta.start must be contained in document");var s=t.end;t.action=="remove"&&!i(e,s)&&r(t,"delta.end must contained in document for 'remove' actions");var o=s.row-n.row,u=s.column-(o==0?n.column:0);(o!=t.lines.length-1||t.lines[o].length!=u)&&r(t,"delta.range must match delta lines")}t.applyDelta=function(e,t,n){var r=t.start.row,i=t.start.column,s=e[r]||"";switch(t.action){case"insert":var o=t.lines;if(o.length===1)e[r]=s.substring(0,i)+t.lines[0]+s.substring(i);else{var u=[r,1].concat(t.lines);e.splice.apply(e,u),e[r]=s.substring(0,i)+e[r],e[r+t.lines.length-1]+=s.substring(i)}break;case"remove":var a=t.end.column,f=t.end.row;r===f?e[r]=s.substring(0,i)+s.substring(a):e.splice(r,f-r+1,s.substring(0,i)+e[f].substring(a))}}}),define("ace/lib/event_emitter",["require","exports","module"],function(e,t,n){"use strict";var r={},i=function(){this.propagationStopped=!0},s=function(){this.defaultPrevented=!0};r._emit=r._dispatchEvent=function(e,t){this._eventRegistry||(this._eventRegistry={}),this._defaultHandlers||(this._defaultHandlers={});var n=this._eventRegistry[e]||[],r=this._defaultHandlers[e];if(!n.length&&!r)return;if(typeof t!="object"||!t)t={};t.type||(t.type=e),t.stopPropagation||(t.stopPropagation=i),t.preventDefault||(t.preventDefault=s),n=n.slice();for(var o=0;o<n.length;o++){n[o](t,this);if(t.propagationStopped)break}if(r&&!t.defaultPrevented)return r(t,this)},r._signal=function(e,t){var n=(this._eventRegistry||{})[e];if(!n)return;n=n.slice();for(var r=0;r<n.length;r++)n[r](t,this)},r.once=function(e,t){var n=this;t&&this.addEventListener(e,function r(){n.removeEventListener(e,r),t.apply(null,arguments)})},r.setDefaultHandler=function(e,t){var n=this._defaultHandlers;n||(n=this._defaultHandlers={_disabled_:{}});if(n[e]){var r=n[e],i=n._disabled_[e];i||(n._disabled_[e]=i=[]),i.push(r);var s=i.indexOf(t);s!=-1&&i.splice(s,1)}n[e]=t},r.removeDefaultHandler=function(e,t){var n=this._defaultHandlers;if(!n)return;var r=n._disabled_[e];if(n[e]==t){var i=n[e];r&&this.setDefaultHandler(e,r.pop())}else if(r){var s=r.indexOf(t);s!=-1&&r.splice(s,1)}},r.on=r.addEventListener=function(e,t,n){this._eventRegistry=this._eventRegistry||{};var r=this._eventRegistry[e];return r||(r=this._eventRegistry[e]=[]),r.indexOf(t)==-1&&r[n?"unshift":"push"](t),t},r.off=r.removeListener=r.removeEventListener=function(e,t){this._eventRegistry=this._eventRegistry||{};var n=this._eventRegistry[e];if(!n)return;var r=n.indexOf(t);r!==-1&&n.splice(r,1)},r.removeAllListeners=function(e){this._eventRegistry&&(this._eventRegistry[e]=[])},t.EventEmitter=r}),define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=t.Anchor=function(e,t,n){this.$onChange=this.onChange.bind(this),this.attach(e),typeof n=="undefined"?this.setPosition(t.row,t.column):this.setPosition(t,n)};(function(){function e(e,t,n){var r=n?e.column<=t.column:e.column<t.column;return e.row<t.row||e.row==t.row&&r}function t(t,n,r){var i=t.action=="insert",s=(i?1:-1)*(t.end.row-t.start.row),o=(i?1:-1)*(t.end.column-t.start.column),u=t.start,a=i?u:t.end;return e(n,u,r)?{row:n.row,column:n.column}:e(a,n,!r)?{row:n.row+s,column:n.column+(n.row==a.row?o:0)}:{row:u.row,column:u.column}}r.implement(this,i),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.$insertRight=!1,this.onChange=function(e){if(e.start.row==e.end.row&&e.start.row!=this.row)return;if(e.start.row>this.row)return;var n=t(e,{row:this.row,column:this.column},this.$insertRight);this.setPosition(n.row,n.column,!0)},this.setPosition=function(e,t,n){var r;n?r={row:e,column:t}:r=this.$clipPositionToDocument(e,t);if(this.row==r.row&&this.column==r.column)return;var i={row:this.row,column:this.column};this.row=r.row,this.column=r.column,this._signal("change",{old:i,value:r})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.attach=function(e){this.document=e||this.document,this.document.on("change",this.$onChange)},this.$clipPositionToDocument=function(e,t){var n={};return e>=this.document.getLength()?(n.row=Math.max(0,this.document.getLength()-1),n.column=this.document.getLine(n.row).length):e<0?(n.row=0,n.column=0):(n.row=e,n.column=Math.min(this.document.getLine(n.row).length,Math.max(0,t))),t<0&&(n.column=0),n}}).call(s.prototype)}),define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./apply_delta").applyDelta,s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=e("./anchor").Anchor,a=function(e){this.$lines=[""],e.length===0?this.$lines=[""]:Array.isArray(e)?this.insertMergedLines({row:0,column:0},e):this.insert({row:0,column:0},e)};(function(){r.implement(this,s),this.setValue=function(e){var t=this.getLength()-1;this.remove(new o(0,0,t,this.getLine(t).length)),this.insert({row:0,column:0},e)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(e,t){return new u(this,e,t)},"aaa".split(/a/).length===0?this.$split=function(e){return e.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(e){return e.split(/\r\n|\r|\n/)},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r\n|\r|\n)/m);this.$autoNewLine=t?t[1]:"\n",this._signal("changeNewLineMode")},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";default:return this.$autoNewLine||"\n"}},this.$autoNewLine="",this.$newLineMode="auto",this.setNewLineMode=function(e){if(this.$newLineMode===e)return;this.$newLineMode=e,this._signal("changeNewLineMode")},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(e){return e=="\r\n"||e=="\r"||e=="\n"},this.getLine=function(e){return this.$lines[e]||""},this.getLines=function(e,t){return this.$lines.slice(e,t+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(e){return this.getLinesForRange(e).join(this.getNewLineCharacter())},this.getLinesForRange=function(e){var t;if(e.start.row===e.end.row)t=[this.getLine(e.start.row).substring(e.start.column,e.end.column)];else{t=this.getLines(e.start.row,e.end.row),t[0]=(t[0]||"").substring(e.start.column);var n=t.length-1;e.end.row-e.start.row==n&&(t[n]=t[n].substring(0,e.end.column))}return t},this.insertLines=function(e,t){return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."),this.insertFullLines(e,t)},this.removeLines=function(e,t){return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."),this.removeFullLines(e,t)},this.insertNewLine=function(e){return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."),this.insertMergedLines(e,["",""])},this.insert=function(e,t){return this.getLength()<=1&&this.$detectNewLine(t),this.insertMergedLines(e,this.$split(t))},this.insertInLine=function(e,t){var n=this.clippedPos(e.row,e.column),r=this.pos(e.row,e.column+t.length);return this.applyDelta({start:n,end:r,action:"insert",lines:[t]},!0),this.clonePos(r)},this.clippedPos=function(e,t){var n=this.getLength();e===undefined?e=n:e<0?e=0:e>=n&&(e=n-1,t=undefined);var r=this.getLine(e);return t==undefined&&(t=r.length),t=Math.min(Math.max(t,0),r.length),{row:e,column:t}},this.clonePos=function(e){return{row:e.row,column:e.column}},this.pos=function(e,t){return{row:e,column:t}},this.$clipPosition=function(e){var t=this.getLength();return e.row>=t?(e.row=Math.max(0,t-1),e.column=this.getLine(t-1).length):(e.row=Math.max(0,e.row),e.column=Math.min(Math.max(e.column,0),this.getLine(e.row).length)),e},this.insertFullLines=function(e,t){e=Math.min(Math.max(e,0),this.getLength());var n=0;e<this.getLength()?(t=t.concat([""]),n=0):(t=[""].concat(t),e--,n=this.$lines[e].length),this.insertMergedLines({row:e,column:n},t)},this.insertMergedLines=function(e,t){var n=this.clippedPos(e.row,e.column),r={row:n.row+t.length-1,column:(t.length==1?n.column:0)+t[t.length-1].length};return this.applyDelta({start:n,end:r,action:"insert",lines:t}),this.clonePos(r)},this.remove=function(e){var t=this.clippedPos(e.start.row,e.start.column),n=this.clippedPos(e.end.row,e.end.column);return this.applyDelta({start:t,end:n,action:"remove",lines:this.getLinesForRange({start:t,end:n})}),this.clonePos(t)},this.removeInLine=function(e,t,n){var r=this.clippedPos(e,t),i=this.clippedPos(e,n);return this.applyDelta({start:r,end:i,action:"remove",lines:this.getLinesForRange({start:r,end:i})},!0),this.clonePos(r)},this.removeFullLines=function(e,t){e=Math.min(Math.max(0,e),this.getLength()-1),t=Math.min(Math.max(0,t),this.getLength()-1);var n=t==this.getLength()-1&&e>0,r=t<this.getLength()-1,i=n?e-1:e,s=n?this.getLine(i).length:0,u=r?t+1:t,a=r?0:this.getLine(u).length,f=new o(i,s,u,a),l=this.$lines.slice(e,t+1);return this.applyDelta({start:f.start,end:f.end,action:"remove",lines:this.getLinesForRange(f)}),l},this.removeNewLine=function(e){e<this.getLength()-1&&e>=0&&this.applyDelta({start:this.pos(e,this.getLine(e).length),end:this.pos(e+1,0),action:"remove",lines:["",""]})},this.replace=function(e,t){e instanceof o||(e=o.fromPoints(e.start,e.end));if(t.length===0&&e.isEmpty())return e.start;if(t==this.getTextRange(e))return e.end;this.remove(e);var n;return t?n=this.insert(e.start,t):n=e.start,n},this.applyDeltas=function(e){for(var t=0;t<e.length;t++)this.applyDelta(e[t])},this.revertDeltas=function(e){for(var t=e.length-1;t>=0;t--)this.revertDelta(e[t])},this.applyDelta=function(e,t){var n=e.action=="insert";if(n?e.lines.length<=1&&!e.lines[0]:!o.comparePoints(e.start,e.end))return;n&&e.lines.length>2e4&&this.$splitAndapplyLargeDelta(e,2e4),i(this.$lines,e,t),this._signal("change",e)},this.$splitAndapplyLargeDelta=function(e,t){var n=e.lines,r=n.length,i=e.start.row,s=e.start.column,o=0,u=0;do{o=u,u+=t-1;var a=n.slice(o,u);if(u>r){e.lines=a,e.start.row=i+o,e.start.column=s;break}a.push(""),this.applyDelta({start:this.pos(i+o,s),end:this.pos(i+u,s=0),action:e.action,lines:a},!0)}while(!0)},this.revertDelta=function(e){this.applyDelta({start:this.clonePos(e.start),end:this.clonePos(e.end),action:e.action=="insert"?"remove":"insert",lines:e.lines.slice()})},this.indexToPosition=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length;for(var i=t||0,s=n.length;i<s;i++){e-=n[i].length+r;if(e<0)return{row:i,column:e+n[i].length+r}}return{row:s-1,column:n[s-1].length}},this.positionToIndex=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length,i=0,s=Math.min(e.row,n.length);for(var o=t||0;o<s;++o)i+=n[o].length+r;return i+e.column}}).call(a.prototype),t.Document=a}),define("ace/lib/lang",["require","exports","module"],function(e,t,n){"use strict";t.last=function(e){return e[e.length-1]},t.stringReverse=function(e){return e.split("").reverse().join("")},t.stringRepeat=function(e,t){var n="";while(t>0){t&1&&(n+=e);if(t>>=1)e+=e}return n};var r=/^\s\s*/,i=/\s\s*$/;t.stringTrimLeft=function(e){return e.replace(r,"")},t.stringTrimRight=function(e){return e.replace(i,"")},t.copyObject=function(e){var t={};for(var n in e)t[n]=e[n];return t},t.copyArray=function(e){var t=[];for(var n=0,r=e.length;n<r;n++)e[n]&&typeof e[n]=="object"?t[n]=this.copyObject(e[n]):t[n]=e[n];return t},t.deepCopy=function s(e){if(typeof e!="object"||!e)return e;var t;if(Array.isArray(e)){t=[];for(var n=0;n<e.length;n++)t[n]=s(e[n]);return t}if(Object.prototype.toString.call(e)!=="[object Object]")return e;t={};for(var n in e)t[n]=s(e[n]);return t},t.arrayToMap=function(e){var t={};for(var n=0;n<e.length;n++)t[e[n]]=1;return t},t.createMap=function(e){var t=Object.create(null);for(var n in e)t[n]=e[n];return t},t.arrayRemove=function(e,t){for(var n=0;n<=e.length;n++)t===e[n]&&e.splice(n,1)},t.escapeRegExp=function(e){return e.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},t.escapeHTML=function(e){return e.replace(/&/g,"&").replace(/"/g,""").replace(/'/g,"'").replace(/</g,"<")},t.getMatchOffsets=function(e,t){var n=[];return e.replace(t,function(e){n.push({offset:arguments[arguments.length-2],length:e.length})}),n},t.deferredCall=function(e){var t=null,n=function(){t=null,e()},r=function(e){return r.cancel(),t=setTimeout(n,e||0),r};return r.schedule=r,r.call=function(){return this.cancel(),e(),r},r.cancel=function(){return clearTimeout(t),t=null,r},r.isPending=function(){return t},r},t.delayedCall=function(e,t){var n=null,r=function(){n=null,e()},i=function(e){n==null&&(n=setTimeout(r,e||t))};return i.delay=function(e){n&&clearTimeout(n),n=setTimeout(r,e||t)},i.schedule=i,i.call=function(){this.cancel(),e()},i.cancel=function(){n&&clearTimeout(n),n=null},i.isPending=function(){return n},i}}),define("ace/worker/mirror",["require","exports","module","ace/range","ace/document","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../range").Range,i=e("../document").Document,s=e("../lib/lang"),o=t.Mirror=function(e){this.sender=e;var t=this.doc=new i(""),n=this.deferredUpdate=s.delayedCall(this.onUpdate.bind(this)),r=this;e.on("change",function(e){var i=e.data;if(i[0].start)t.applyDeltas(i);else for(var s=0;s<i.length;s+=2){if(Array.isArray(i[s+1]))var o={action:"insert",start:i[s],lines:i[s+1]};else var o={action:"remove",start:i[s],end:i[s+1]};t.applyDelta(o,!0)}if(r.$timeout)return n.schedule(r.$timeout);r.onUpdate()})};(function(){this.$timeout=500,this.setTimeout=function(e){this.$timeout=e},this.setValue=function(e){this.doc.setValue(e),this.deferredUpdate.schedule(this.$timeout)},this.getValue=function(e){this.sender.callback(this.doc.getValue(),e)},this.onUpdate=function(){},this.isPending=function(){return this.deferredUpdate.isPending()}}).call(o.prototype)}),define("ace/mode/json/json_parse",["require","exports","module"],function(e,t,n){"use strict";var r,i,s={'"':'"',"\\":"\\","/":"/",b:"\b",f:"\f",n:"\n",r:"\r",t:" "},o,u=function(e){throw{name:"SyntaxError",message:e,at:r,text:o}},a=function(e){return e&&e!==i&&u("Expected '"+e+"' instead of '"+i+"'"),i=o.charAt(r),r+=1,i},f=function(){var e,t="";i==="-"&&(t="-",a("-"));while(i>="0"&&i<="9")t+=i,a();if(i==="."){t+=".";while(a()&&i>="0"&&i<="9")t+=i}if(i==="e"||i==="E"){t+=i,a();if(i==="-"||i==="+")t+=i,a();while(i>="0"&&i<="9")t+=i,a()}e=+t;if(!isNaN(e))return e;u("Bad number")},l=function(){var e,t,n="",r;if(i==='"')while(a()){if(i==='"')return a(),n;if(i==="\\"){a();if(i==="u"){r=0;for(t=0;t<4;t+=1){e=parseInt(a(),16);if(!isFinite(e))break;r=r*16+e}n+=String.fromCharCode(r)}else{if(typeof s[i]!="string")break;n+=s[i]}}else n+=i}u("Bad string")},c=function(){while(i&&i<=" ")a()},h=function(){switch(i){case"t":return a("t"),a("r"),a("u"),a("e"),!0;case"f":return a("f"),a("a"),a("l"),a("s"),a("e"),!1;case"n":return a("n"),a("u"),a("l"),a("l"),null}u("Unexpected '"+i+"'")},p,d=function(){var e=[];if(i==="["){a("["),c();if(i==="]")return a("]"),e;while(i){e.push(p()),c();if(i==="]")return a("]"),e;a(","),c()}}u("Bad array")},v=function(){var e,t={};if(i==="{"){a("{"),c();if(i==="}")return a("}"),t;while(i){e=l(),c(),a(":"),Object.hasOwnProperty.call(t,e)&&u('Duplicate key "'+e+'"'),t[e]=p(),c();if(i==="}")return a("}"),t;a(","),c()}}u("Bad object")};return p=function(){c();switch(i){case"{":return v();case"[":return d();case'"':return l();case"-":return f();default:return i>="0"&&i<="9"?f():h()}},function(e,t){var n;return o=e,r=0,i=" ",n=p(),c(),i&&u("Syntax error"),typeof t=="function"?function s(e,n){var r,i,o=e[n];if(o&&typeof o=="object")for(r in o)Object.hasOwnProperty.call(o,r)&&(i=s(o,r),i!==undefined?o[r]=i:delete o[r]);return t.call(e,n,o)}({"":n},""):n}}),define("ace/mode/json_worker",["require","exports","module","ace/lib/oop","ace/worker/mirror","ace/mode/json/json_parse"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../worker/mirror").Mirror,s=e("./json/json_parse"),o=t.JsonWorker=function(e){i.call(this,e),this.setTimeout(200)};r.inherits(o,i),function(){this.onUpdate=function(){var e=this.doc.getValue(),t=[];try{e&&s(e)}catch(n){var r=this.doc.indexToPosition(n.at-1);t.push({row:r.row,column:r.column,text:n.message,type:"error"})}this.sender.emit("annotate",t)}}.call(o.prototype)}),define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[e===void 0?0:e,t===void 0?this.length-e:t].concat(u.call(arguments,2))):[]}}Array.isArray||(Array.isArray=function(t){return a(t)=="[object Array]"});var m=Object("a"),g=m[0]!="a"||!(0 in m);Array.prototype.forEach||(Array.prototype.forEach=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=arguments[1],s=-1,o=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError;while(++s<o)s in r&&t.call(i,r[s],s,n)}),Array.prototype.map||(Array.prototype.map=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=Array(i),o=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var u=0;u<i;u++)u in r&&(s[u]=t.call(o,r[u],u,n));return s}),Array.prototype.filter||(Array.prototype.filter=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=[],o,u=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var f=0;f<i;f++)f in r&&(o=r[f],t.call(u,o,f,n)&&s.push(o));return s}),Array.prototype.every||(Array.prototype.every=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&!t.call(s,r[o],o,n))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&t.call(s,r[o],o,n))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduce of empty array with no initial value");var s=0,o;if(arguments.length>=2)o=arguments[1];else do{if(s in r){o=r[s++];break}if(++s>=i)throw new TypeError("reduce of empty array with no initial value")}while(!0);for(;s<i;s++)s in r&&(o=t.call(void 0,o,r[s],s,n));return o}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduceRight of empty array with no initial value");var s,o=i-1;if(arguments.length>=2)s=arguments[1];else do{if(o in r){s=r[o--];break}if(--o<0)throw new TypeError("reduceRight of empty array with no initial value")}while(!0);do o in this&&(s=t.call(void 0,s,r[o],o,n));while(o--);return s});if(!Array.prototype.indexOf||[0,1].indexOf(1,2)!=-1)Array.prototype.indexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=0;arguments.length>1&&(i=H(arguments[1])),i=i>=0?i:Math.max(0,r+i);for(;i<r;i++)if(i in n&&n[i]===t)return i;return-1};if(!Array.prototype.lastIndexOf||[0,1].lastIndexOf(0,-3)!=-1)Array.prototype.lastIndexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=r-1;arguments.length>1&&(i=Math.min(i,H(arguments[1]))),i=i>=0?i:r-Math.abs(i);for(;i>=0;i--)if(i in n&&t===n[i])return i;return-1};Object.getPrototypeOf||(Object.getPrototypeOf=function(t){return t.__proto__||(t.constructor?t.constructor.prototype:o)});if(!Object.getOwnPropertyDescriptor){var y="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(t,n){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(y+t);if(!f(t,n))return;var r,i,s;r={enumerable:!0,configurable:!0};if(d){var u=t.__proto__;t.__proto__=o;var i=h(t,n),s=p(t,n);t.__proto__=u;if(i||s)return i&&(r.get=i),s&&(r.set=s),r}return r.value=t[n],r}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(t){return Object.keys(t)});if(!Object.create){var b;Object.prototype.__proto__===null?b=function(){return{__proto__:null}}:b=function(){var e={};for(var t in e)e[t]=null;return e.constructor=e.hasOwnProperty=e.propertyIsEnumerable=e.isPrototypeOf=e.toLocaleString=e.toString=e.valueOf=e.__proto__=null,e},Object.create=function(t,n){var r;if(t===null)r=b();else{if(typeof t!="object")throw new TypeError("typeof prototype["+typeof t+"] != 'object'");var i=function(){};i.prototype=t,r=new i,r.__proto__=t}return n!==void 0&&Object.defineProperties(r,n),r}}if(Object.defineProperty){var E=w({}),S=typeof document=="undefined"||w(document.createElement("div"));if(!E||!S)var x=Object.defineProperty}if(!Object.defineProperty||x){var T="Property description must be an object: ",N="Object.defineProperty called on non-object: ",C="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(t,n,r){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(N+t);if(typeof r!="object"&&typeof r!="function"||r===null)throw new TypeError(T+r);if(x)try{return x.call(Object,t,n,r)}catch(i){}if(f(r,"value"))if(d&&(h(t,n)||p(t,n))){var s=t.__proto__;t.__proto__=o,delete t[n],t[n]=r.value,t.__proto__=s}else t[n]=r.value;else{if(!d)throw new TypeError(C);f(r,"get")&&l(t,n,r.get),f(r,"set")&&c(t,n,r.set)}return t}}Object.defineProperties||(Object.defineProperties=function(t,n){for(var r in n)f(n,r)&&Object.defineProperty(t,r,n[r]);return t}),Object.seal||(Object.seal=function(t){return t}),Object.freeze||(Object.freeze=function(t){return t});try{Object.freeze(function(){})}catch(k){Object.freeze=function(t){return function(n){return typeof n=="function"?n:t(n)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(t){return t}),Object.isSealed||(Object.isSealed=function(t){return!1}),Object.isFrozen||(Object.isFrozen=function(t){return!1}),Object.isExtensible||(Object.isExtensible=function(t){if(Object(t)===t)throw new TypeError;var n="";while(f(t,n))n+="?";t[n]=!0;var r=f(t,n);return delete t[n],r});if(!Object.keys){var L=!0,A=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],O=A.length;for(var M in{toString:null})L=!1;Object.keys=function I(e){if(typeof e!="object"&&typeof e!="function"||e===null)throw new TypeError("Object.keys called on a non-object");var I=[];for(var t in e)f(e,t)&&I.push(t);if(L)for(var n=0,r=O;n<r;n++){var i=A[n];f(e,i)&&I.push(i)}return I}}Date.now||(Date.now=function(){return(new Date).getTime()});var _=" \n \f\r \u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\ufeff";if(!String.prototype.trim||_.trim()){_="["+_+"]";var D=new RegExp("^"+_+_+"*"),P=new RegExp(_+_+"*$");String.prototype.trim=function(){return String(this).replace(D,"").replace(P,"")}}var F=function(e){if(e==null)throw new TypeError("can't convert "+e+" to object");return Object(e)}})
| "no use strict";!function(e){function t(e,t){var n=e,r="";while(n){var i=t[n];if(typeof i=="string")return i+r;if(i)return i.location.replace(/\/*$/,"/")+(r||i.main||i.name);if(i===!1)return"";var s=n.lastIndexOf("/");if(s===-1)break;r=n.substr(s)+r,n=n.slice(0,s)}return e}if(typeof e.window!="undefined"&&e.document)return;if(e.require&&e.define)return;e.console||(e.console=function(){var e=Array.prototype.slice.call(arguments,0);postMessage({type:"log",data:e})},e.console.error=e.console.warn=e.console.log=e.console.trace=e.console),e.window=e,e.ace=e,e.onerror=function(e,t,n,r,i){postMessage({type:"error",data:{message:e,data:i.data,file:t,line:n,col:r,stack:i.stack}})},e.normalizeModule=function(t,n){if(n.indexOf("!")!==-1){var r=n.split("!");return e.normalizeModule(t,r[0])+"!"+e.normalizeModule(t,r[1])}if(n.charAt(0)=="."){var i=t.split("/").slice(0,-1).join("/");n=(i?i+"/":"")+n;while(n.indexOf(".")!==-1&&s!=n){var s=n;n=n.replace(/^\.\//,"").replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return n},e.require=function(r,i){i||(i=r,r=null);if(!i.charAt)throw new Error("worker.js require() accepts only (parentId, id) as arguments");i=e.normalizeModule(r,i);var s=e.require.modules[i];if(s)return s.initialized||(s.initialized=!0,s.exports=s.factory().exports),s.exports;if(!e.require.tlns)return console.log("unable to load "+i);var o=t(i,e.require.tlns);return o.slice(-3)!=".js"&&(o+=".js"),e.require.id=i,e.require.modules[i]={},importScripts(o),e.require(r,i)},e.require.modules={},e.require.tlns={},e.define=function(t,n,r){arguments.length==2?(r=n,typeof t!="string"&&(n=t,t=e.require.id)):arguments.length==1&&(r=t,n=[],t=e.require.id);if(typeof r!="function"){e.require.modules[t]={exports:r,initialized:!0};return}n.length||(n=["require","exports","module"]);var i=function(n){return e.require(t,n)};e.require.modules[t]={exports:{},factory:function(){var e=this,t=r.apply(this,n.map(function(t){switch(t){case"require":return i;case"exports":return e.exports;case"module":return e;default:return i(t)}}));return t&&(e.exports=t),e}}},e.define.amd={},require.tlns={},e.initBaseUrls=function(t){for(var n in t)require.tlns[n]=t[n]},e.initSender=function(){var n=e.require("ace/lib/event_emitter").EventEmitter,r=e.require("ace/lib/oop"),i=function(){};return function(){r.implement(this,n),this.callback=function(e,t){postMessage({type:"call",id:t,data:e})},this.emit=function(e,t){postMessage({type:"event",name:e,data:t})}}.call(i.prototype),new i};var n=e.main=null,r=e.sender=null;e.onmessage=function(t){var i=t.data;if(i.event&&r)r._signal(i.event,i.data);else if(i.command)if(n[i.command])n[i.command].apply(n,i.args);else{if(!e[i.command])throw new Error("Unknown command:"+i.command);e[i.command].apply(e,i.args)}else if(i.init){e.initBaseUrls(i.tlns),require("ace/lib/es5-shim"),r=e.sender=e.initSender();var s=require(i.module)[i.classname];n=e.main=new s(r)}}}(this),define("ace/lib/oop",["require","exports","module"],function(e,t,n){"use strict";t.inherits=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})},t.mixin=function(e,t){for(var n in t)e[n]=t[n];return e},t.implement=function(e,n){t.mixin(e,n)}}),define("ace/range",["require","exports","module"],function(e,t,n){"use strict";var r=function(e,t){return e.row-t.row||e.column-t.column},i=function(e,t,n,r){this.start={row:e,column:t},this.end={row:n,column:r}};(function(){this.isEqual=function(e){return this.start.row===e.start.row&&this.end.row===e.end.row&&this.start.column===e.start.column&&this.end.column===e.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(e,t){return this.compare(e,t)==0},this.compareRange=function(e){var t,n=e.end,r=e.start;return t=this.compare(n.row,n.column),t==1?(t=this.compare(r.row,r.column),t==1?2:t==0?1:0):t==-1?-2:(t=this.compare(r.row,r.column),t==-1?-1:t==1?42:0)},this.comparePoint=function(e){return this.compare(e.row,e.column)},this.containsRange=function(e){return this.comparePoint(e.start)==0&&this.comparePoint(e.end)==0},this.intersects=function(e){var t=this.compareRange(e);return t==-1||t==0||t==1},this.isEnd=function(e,t){return this.end.row==e&&this.end.column==t},this.isStart=function(e,t){return this.start.row==e&&this.start.column==t},this.setStart=function(e,t){typeof e=="object"?(this.start.column=e.column,this.start.row=e.row):(this.start.row=e,this.start.column=t)},this.setEnd=function(e,t){typeof e=="object"?(this.end.column=e.column,this.end.row=e.row):(this.end.row=e,this.end.column=t)},this.inside=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)||this.isStart(e,t)?!1:!0:!1},this.insideStart=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)?!1:!0:!1},this.insideEnd=function(e,t){return this.compare(e,t)==0?this.isStart(e,t)?!1:!0:!1},this.compare=function(e,t){return!this.isMultiLine()&&e===this.start.row?t<this.start.column?-1:t>this.end.column?1:0:e<this.start.row?-1:e>this.end.row?1:this.start.row===e?t>=this.start.column?0:-1:this.end.row===e?t<=this.end.column?0:1:0},this.compareStart=function(e,t){return this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.compareEnd=function(e,t){return this.end.row==e&&this.end.column==t?1:this.compare(e,t)},this.compareInside=function(e,t){return this.end.row==e&&this.end.column==t?1:this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.clipRows=function(e,t){if(this.end.row>t)var n={row:t+1,column:0};else if(this.end.row<e)var n={row:e,column:0};if(this.start.row>t)var r={row:t+1,column:0};else if(this.start.row<e)var r={row:e,column:0};return i.fromPoints(r||this.start,n||this.end)},this.extend=function(e,t){var n=this.compare(e,t);if(n==0)return this;if(n==-1)var r={row:e,column:t};else var s={row:e,column:t};return i.fromPoints(r||this.start,s||this.end)},this.isEmpty=function(){return this.start.row===this.end.row&&this.start.column===this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return i.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new i(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new i(this.start.row,0,this.end.row,0)},this.toScreenRange=function(e){var t=e.documentToScreenPosition(this.start),n=e.documentToScreenPosition(this.end);return new i(t.row,t.column,n.row,n.column)},this.moveBy=function(e,t){this.start.row+=e,this.start.column+=t,this.end.row+=e,this.end.column+=t}}).call(i.prototype),i.fromPoints=function(e,t){return new i(e.row,e.column,t.row,t.column)},i.comparePoints=r,i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},t.Range=i}),define("ace/apply_delta",["require","exports","module"],function(e,t,n){"use strict";function r(e,t){throw console.log("Invalid Delta:",e),"Invalid Delta: "+t}function i(e,t){return t.row>=0&&t.row<e.length&&t.column>=0&&t.column<=e[t.row].length}function s(e,t){t.action!="insert"&&t.action!="remove"&&r(t,"delta.action must be 'insert' or 'remove'"),t.lines instanceof Array||r(t,"delta.lines must be an Array"),(!t.start||!t.end)&&r(t,"delta.start/end must be an present");var n=t.start;i(e,t.start)||r(t,"delta.start must be contained in document");var s=t.end;t.action=="remove"&&!i(e,s)&&r(t,"delta.end must contained in document for 'remove' actions");var o=s.row-n.row,u=s.column-(o==0?n.column:0);(o!=t.lines.length-1||t.lines[o].length!=u)&&r(t,"delta.range must match delta lines")}t.applyDelta=function(e,t,n){var r=t.start.row,i=t.start.column,s=e[r]||"";switch(t.action){case"insert":var o=t.lines;if(o.length===1)e[r]=s.substring(0,i)+t.lines[0]+s.substring(i);else{var u=[r,1].concat(t.lines);e.splice.apply(e,u),e[r]=s.substring(0,i)+e[r],e[r+t.lines.length-1]+=s.substring(i)}break;case"remove":var a=t.end.column,f=t.end.row;r===f?e[r]=s.substring(0,i)+s.substring(a):e.splice(r,f-r+1,s.substring(0,i)+e[f].substring(a))}}}),define("ace/lib/event_emitter",["require","exports","module"],function(e,t,n){"use strict";var r={},i=function(){this.propagationStopped=!0},s=function(){this.defaultPrevented=!0};r._emit=r._dispatchEvent=function(e,t){this._eventRegistry||(this._eventRegistry={}),this._defaultHandlers||(this._defaultHandlers={});var n=this._eventRegistry[e]||[],r=this._defaultHandlers[e];if(!n.length&&!r)return;if(typeof t!="object"||!t)t={};t.type||(t.type=e),t.stopPropagation||(t.stopPropagation=i),t.preventDefault||(t.preventDefault=s),n=n.slice();for(var o=0;o<n.length;o++){n[o](t,this);if(t.propagationStopped)break}if(r&&!t.defaultPrevented)return r(t,this)},r._signal=function(e,t){var n=(this._eventRegistry||{})[e];if(!n)return;n=n.slice();for(var r=0;r<n.length;r++)n[r](t,this)},r.once=function(e,t){var n=this;t&&this.addEventListener(e,function r(){n.removeEventListener(e,r),t.apply(null,arguments)})},r.setDefaultHandler=function(e,t){var n=this._defaultHandlers;n||(n=this._defaultHandlers={_disabled_:{}});if(n[e]){var r=n[e],i=n._disabled_[e];i||(n._disabled_[e]=i=[]),i.push(r);var s=i.indexOf(t);s!=-1&&i.splice(s,1)}n[e]=t},r.removeDefaultHandler=function(e,t){var n=this._defaultHandlers;if(!n)return;var r=n._disabled_[e];if(n[e]==t){var i=n[e];r&&this.setDefaultHandler(e,r.pop())}else if(r){var s=r.indexOf(t);s!=-1&&r.splice(s,1)}},r.on=r.addEventListener=function(e,t,n){this._eventRegistry=this._eventRegistry||{};var r=this._eventRegistry[e];return r||(r=this._eventRegistry[e]=[]),r.indexOf(t)==-1&&r[n?"unshift":"push"](t),t},r.off=r.removeListener=r.removeEventListener=function(e,t){this._eventRegistry=this._eventRegistry||{};var n=this._eventRegistry[e];if(!n)return;var r=n.indexOf(t);r!==-1&&n.splice(r,1)},r.removeAllListeners=function(e){this._eventRegistry&&(this._eventRegistry[e]=[])},t.EventEmitter=r}),define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=t.Anchor=function(e,t,n){this.$onChange=this.onChange.bind(this),this.attach(e),typeof n=="undefined"?this.setPosition(t.row,t.column):this.setPosition(t,n)};(function(){function e(e,t,n){var r=n?e.column<=t.column:e.column<t.column;return e.row<t.row||e.row==t.row&&r}function t(t,n,r){var i=t.action=="insert",s=(i?1:-1)*(t.end.row-t.start.row),o=(i?1:-1)*(t.end.column-t.start.column),u=t.start,a=i?u:t.end;return e(n,u,r)?{row:n.row,column:n.column}:e(a,n,!r)?{row:n.row+s,column:n.column+(n.row==a.row?o:0)}:{row:u.row,column:u.column}}r.implement(this,i),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.$insertRight=!1,this.onChange=function(e){if(e.start.row==e.end.row&&e.start.row!=this.row)return;if(e.start.row>this.row)return;var n=t(e,{row:this.row,column:this.column},this.$insertRight);this.setPosition(n.row,n.column,!0)},this.setPosition=function(e,t,n){var r;n?r={row:e,column:t}:r=this.$clipPositionToDocument(e,t);if(this.row==r.row&&this.column==r.column)return;var i={row:this.row,column:this.column};this.row=r.row,this.column=r.column,this._signal("change",{old:i,value:r})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.attach=function(e){this.document=e||this.document,this.document.on("change",this.$onChange)},this.$clipPositionToDocument=function(e,t){var n={};return e>=this.document.getLength()?(n.row=Math.max(0,this.document.getLength()-1),n.column=this.document.getLine(n.row).length):e<0?(n.row=0,n.column=0):(n.row=e,n.column=Math.min(this.document.getLine(n.row).length,Math.max(0,t))),t<0&&(n.column=0),n}}).call(s.prototype)}),define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./apply_delta").applyDelta,s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=e("./anchor").Anchor,a=function(e){this.$lines=[""],e.length===0?this.$lines=[""]:Array.isArray(e)?this.insertMergedLines({row:0,column:0},e):this.insert({row:0,column:0},e)};(function(){r.implement(this,s),this.setValue=function(e){var t=this.getLength()-1;this.remove(new o(0,0,t,this.getLine(t).length)),this.insert({row:0,column:0},e)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(e,t){return new u(this,e,t)},"aaa".split(/a/).length===0?this.$split=function(e){return e.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(e){return e.split(/\r\n|\r|\n/)},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r\n|\r|\n)/m);this.$autoNewLine=t?t[1]:"\n",this._signal("changeNewLineMode")},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";default:return this.$autoNewLine||"\n"}},this.$autoNewLine="",this.$newLineMode="auto",this.setNewLineMode=function(e){if(this.$newLineMode===e)return;this.$newLineMode=e,this._signal("changeNewLineMode")},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(e){return e=="\r\n"||e=="\r"||e=="\n"},this.getLine=function(e){return this.$lines[e]||""},this.getLines=function(e,t){return this.$lines.slice(e,t+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(e){return this.getLinesForRange(e).join(this.getNewLineCharacter())},this.getLinesForRange=function(e){var t;if(e.start.row===e.end.row)t=[this.getLine(e.start.row).substring(e.start.column,e.end.column)];else{t=this.getLines(e.start.row,e.end.row),t[0]=(t[0]||"").substring(e.start.column);var n=t.length-1;e.end.row-e.start.row==n&&(t[n]=t[n].substring(0,e.end.column))}return t},this.insertLines=function(e,t){return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."),this.insertFullLines(e,t)},this.removeLines=function(e,t){return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."),this.removeFullLines(e,t)},this.insertNewLine=function(e){return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."),this.insertMergedLines(e,["",""])},this.insert=function(e,t){return this.getLength()<=1&&this.$detectNewLine(t),this.insertMergedLines(e,this.$split(t))},this.insertInLine=function(e,t){var n=this.clippedPos(e.row,e.column),r=this.pos(e.row,e.column+t.length);return this.applyDelta({start:n,end:r,action:"insert",lines:[t]},!0),this.clonePos(r)},this.clippedPos=function(e,t){var n=this.getLength();e===undefined?e=n:e<0?e=0:e>=n&&(e=n-1,t=undefined);var r=this.getLine(e);return t==undefined&&(t=r.length),t=Math.min(Math.max(t,0),r.length),{row:e,column:t}},this.clonePos=function(e){return{row:e.row,column:e.column}},this.pos=function(e,t){return{row:e,column:t}},this.$clipPosition=function(e){var t=this.getLength();return e.row>=t?(e.row=Math.max(0,t-1),e.column=this.getLine(t-1).length):(e.row=Math.max(0,e.row),e.column=Math.min(Math.max(e.column,0),this.getLine(e.row).length)),e},this.insertFullLines=function(e,t){e=Math.min(Math.max(e,0),this.getLength());var n=0;e<this.getLength()?(t=t.concat([""]),n=0):(t=[""].concat(t),e--,n=this.$lines[e].length),this.insertMergedLines({row:e,column:n},t)},this.insertMergedLines=function(e,t){var n=this.clippedPos(e.row,e.column),r={row:n.row+t.length-1,column:(t.length==1?n.column:0)+t[t.length-1].length};return this.applyDelta({start:n,end:r,action:"insert",lines:t}),this.clonePos(r)},this.remove=function(e){var t=this.clippedPos(e.start.row,e.start.column),n=this.clippedPos(e.end.row,e.end.column);return this.applyDelta({start:t,end:n,action:"remove",lines:this.getLinesForRange({start:t,end:n})}),this.clonePos(t)},this.removeInLine=function(e,t,n){var r=this.clippedPos(e,t),i=this.clippedPos(e,n);return this.applyDelta({start:r,end:i,action:"remove",lines:this.getLinesForRange({start:r,end:i})},!0),this.clonePos(r)},this.removeFullLines=function(e,t){e=Math.min(Math.max(0,e),this.getLength()-1),t=Math.min(Math.max(0,t),this.getLength()-1);var n=t==this.getLength()-1&&e>0,r=t<this.getLength()-1,i=n?e-1:e,s=n?this.getLine(i).length:0,u=r?t+1:t,a=r?0:this.getLine(u).length,f=new o(i,s,u,a),l=this.$lines.slice(e,t+1);return this.applyDelta({start:f.start,end:f.end,action:"remove",lines:this.getLinesForRange(f)}),l},this.removeNewLine=function(e){e<this.getLength()-1&&e>=0&&this.applyDelta({start:this.pos(e,this.getLine(e).length),end:this.pos(e+1,0),action:"remove",lines:["",""]})},this.replace=function(e,t){e instanceof o||(e=o.fromPoints(e.start,e.end));if(t.length===0&&e.isEmpty())return e.start;if(t==this.getTextRange(e))return e.end;this.remove(e);var n;return t?n=this.insert(e.start,t):n=e.start,n},this.applyDeltas=function(e){for(var t=0;t<e.length;t++)this.applyDelta(e[t])},this.revertDeltas=function(e){for(var t=e.length-1;t>=0;t--)this.revertDelta(e[t])},this.applyDelta=function(e,t){var n=e.action=="insert";if(n?e.lines.length<=1&&!e.lines[0]:!o.comparePoints(e.start,e.end))return;n&&e.lines.length>2e4&&this.$splitAndapplyLargeDelta(e,2e4),i(this.$lines,e,t),this._signal("change",e)},this.$splitAndapplyLargeDelta=function(e,t){var n=e.lines,r=n.length,i=e.start.row,s=e.start.column,o=0,u=0;do{o=u,u+=t-1;var a=n.slice(o,u);if(u>r){e.lines=a,e.start.row=i+o,e.start.column=s;break}a.push(""),this.applyDelta({start:this.pos(i+o,s),end:this.pos(i+u,s=0),action:e.action,lines:a},!0)}while(!0)},this.revertDelta=function(e){this.applyDelta({start:this.clonePos(e.start),end:this.clonePos(e.end),action:e.action=="insert"?"remove":"insert",lines:e.lines.slice()})},this.indexToPosition=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length;for(var i=t||0,s=n.length;i<s;i++){e-=n[i].length+r;if(e<0)return{row:i,column:e+n[i].length+r}}return{row:s-1,column:n[s-1].length}},this.positionToIndex=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length,i=0,s=Math.min(e.row,n.length);for(var o=t||0;o<s;++o)i+=n[o].length+r;return i+e.column}}).call(a.prototype),t.Document=a}),define("ace/lib/lang",["require","exports","module"],function(e,t,n){"use strict";t.last=function(e){return e[e.length-1]},t.stringReverse=function(e){return e.split("").reverse().join("")},t.stringRepeat=function(e,t){var n="";while(t>0){t&1&&(n+=e);if(t>>=1)e+=e}return n};var r=/^\s\s*/,i=/\s\s*$/;t.stringTrimLeft=function(e){return e.replace(r,"")},t.stringTrimRight=function(e){return e.replace(i,"")},t.copyObject=function(e){var t={};for(var n in e)t[n]=e[n];return t},t.copyArray=function(e){var t=[];for(var n=0,r=e.length;n<r;n++)e[n]&&typeof e[n]=="object"?t[n]=this.copyObject(e[n]):t[n]=e[n];return t},t.deepCopy=function s(e){if(typeof e!="object"||!e)return e;var t;if(Array.isArray(e)){t=[];for(var n=0;n<e.length;n++)t[n]=s(e[n]);return t}if(Object.prototype.toString.call(e)!=="[object Object]")return e;t={};for(var n in e)t[n]=s(e[n]);return t},t.arrayToMap=function(e){var t={};for(var n=0;n<e.length;n++)t[e[n]]=1;return t},t.createMap=function(e){var t=Object.create(null);for(var n in e)t[n]=e[n];return t},t.arrayRemove=function(e,t){for(var n=0;n<=e.length;n++)t===e[n]&&e.splice(n,1)},t.escapeRegExp=function(e){return e.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},t.escapeHTML=function(e){return e.replace(/&/g,"&").replace(/"/g,""").replace(/'/g,"'").replace(/</g,"<")},t.getMatchOffsets=function(e,t){var n=[];return e.replace(t,function(e){n.push({offset:arguments[arguments.length-2],length:e.length})}),n},t.deferredCall=function(e){var t=null,n=function(){t=null,e()},r=function(e){return r.cancel(),t=setTimeout(n,e||0),r};return r.schedule=r,r.call=function(){return this.cancel(),e(),r},r.cancel=function(){return clearTimeout(t),t=null,r},r.isPending=function(){return t},r},t.delayedCall=function(e,t){var n=null,r=function(){n=null,e()},i=function(e){n==null&&(n=setTimeout(r,e||t))};return i.delay=function(e){n&&clearTimeout(n),n=setTimeout(r,e||t)},i.schedule=i,i.call=function(){this.cancel(),e()},i.cancel=function(){n&&clearTimeout(n),n=null},i.isPending=function(){return n},i}}),define("ace/worker/mirror",["require","exports","module","ace/range","ace/document","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../range").Range,i=e("../document").Document,s=e("../lib/lang"),o=t.Mirror=function(e){this.sender=e;var t=this.doc=new i(""),n=this.deferredUpdate=s.delayedCall(this.onUpdate.bind(this)),r=this;e.on("change",function(e){var i=e.data;if(i[0].start)t.applyDeltas(i);else for(var s=0;s<i.length;s+=2){if(Array.isArray(i[s+1]))var o={action:"insert",start:i[s],lines:i[s+1]};else var o={action:"remove",start:i[s],end:i[s+1]};t.applyDelta(o,!0)}if(r.$timeout)return n.schedule(r.$timeout);r.onUpdate()})};(function(){this.$timeout=500,this.setTimeout=function(e){this.$timeout=e},this.setValue=function(e){this.doc.setValue(e),this.deferredUpdate.schedule(this.$timeout)},this.getValue=function(e){this.sender.callback(this.doc.getValue(),e)},this.onUpdate=function(){},this.isPending=function(){return this.deferredUpdate.isPending()}}).call(o.prototype)}),define("ace/mode/json/json_parse",["require","exports","module"],function(e,t,n){"use strict";var r,i,s={'"':'"',"\\":"\\","/":"/",b:"\b",f:"\f",n:"\n",r:"\r",t:" "},o,u=function(e){throw{name:"SyntaxError",message:e,at:r,text:o}},a=function(e){return e&&e!==i&&u("Expected '"+e+"' instead of '"+i+"'"),i=o.charAt(r),r+=1,i},f=function(){var e,t="";i==="-"&&(t="-",a("-"));while(i>="0"&&i<="9")t+=i,a();if(i==="."){t+=".";while(a()&&i>="0"&&i<="9")t+=i}if(i==="e"||i==="E"){t+=i,a();if(i==="-"||i==="+")t+=i,a();while(i>="0"&&i<="9")t+=i,a()}e=+t;if(!isNaN(e))return e;u("Bad number")},l=function(){var e,t,n="",r;if(i==='"')while(a()){if(i==='"')return a(),n;if(i==="\\"){a();if(i==="u"){r=0;for(t=0;t<4;t+=1){e=parseInt(a(),16);if(!isFinite(e))break;r=r*16+e}n+=String.fromCharCode(r)}else{if(typeof s[i]!="string")break;n+=s[i]}}else n+=i}u("Bad string")},c=function(){while(i&&i<=" ")a()},h=function(){switch(i){case"t":return a("t"),a("r"),a("u"),a("e"),!0;case"f":return a("f"),a("a"),a("l"),a("s"),a("e"),!1;case"n":return a("n"),a("u"),a("l"),a("l"),null}u("Unexpected '"+i+"'")},p,d=function(){var e=[];if(i==="["){a("["),c();if(i==="]")return a("]"),e;while(i){e.push(p()),c();if(i==="]")return a("]"),e;a(","),c()}}u("Bad array")},v=function(){var e,t={};if(i==="{"){a("{"),c();if(i==="}")return a("}"),t;while(i){e=l(),c(),a(":"),Object.hasOwnProperty.call(t,e)&&u('Duplicate key "'+e+'"'),t[e]=p(),c();if(i==="}")return a("}"),t;a(","),c()}}u("Bad object")};return p=function(){c();switch(i){case"{":return v();case"[":return d();case'"':return l();case"-":return f();default:return i>="0"&&i<="9"?f():h()}},function(e,t){var n;return o=e,r=0,i=" ",n=p(),c(),i&&u("Syntax error"),typeof t=="function"?function s(e,n){var r,i,o=e[n];if(o&&typeof o=="object")for(r in o)Object.hasOwnProperty.call(o,r)&&(i=s(o,r),i!==undefined?o[r]=i:delete o[r]);return t.call(e,n,o)}({"":n},""):n}}),define("ace/mode/json_worker",["require","exports","module","ace/lib/oop","ace/worker/mirror","ace/mode/json/json_parse"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../worker/mirror").Mirror,s=e("./json/json_parse"),o=t.JsonWorker=function(e){i.call(this,e),this.setTimeout(200)};r.inherits(o,i),function(){this.onUpdate=function(){var e=this.doc.getValue(),t=[];try{e&&s(e)}catch(n){var r=this.doc.indexToPosition(n.at-1);t.push({row:r.row,column:r.column,text:n.message,type:"error"})}this.sender.emit("annotate",t)}}.call(o.prototype)}),define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[e===void 0?0:e,t===void 0?this.length-e:t].concat(u.call(arguments,2))):[]}}Array.isArray||(Array.isArray=function(t){return a(t)=="[object Array]"});var m=Object("a"),g=m[0]!="a"||!(0 in m);Array.prototype.forEach||(Array.prototype.forEach=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=arguments[1],s=-1,o=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError;while(++s<o)s in r&&t.call(i,r[s],s,n)}),Array.prototype.map||(Array.prototype.map=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=Array(i),o=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var u=0;u<i;u++)u in r&&(s[u]=t.call(o,r[u],u,n));return s}),Array.prototype.filter||(Array.prototype.filter=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=[],o,u=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var f=0;f<i;f++)f in r&&(o=r[f],t.call(u,o,f,n)&&s.push(o));return s}),Array.prototype.every||(Array.prototype.every=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&!t.call(s,r[o],o,n))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&t.call(s,r[o],o,n))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduce of empty array with no initial value");var s=0,o;if(arguments.length>=2)o=arguments[1];else do{if(s in r){o=r[s++];break}if(++s>=i)throw new TypeError("reduce of empty array with no initial value")}while(!0);for(;s<i;s++)s in r&&(o=t.call(void 0,o,r[s],s,n));return o}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduceRight of empty array with no initial value");var s,o=i-1;if(arguments.length>=2)s=arguments[1];else do{if(o in r){s=r[o--];break}if(--o<0)throw new TypeError("reduceRight of empty array with no initial value")}while(!0);do o in this&&(s=t.call(void 0,s,r[o],o,n));while(o--);return s});if(!Array.prototype.indexOf||[0,1].indexOf(1,2)!=-1)Array.prototype.indexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=0;arguments.length>1&&(i=H(arguments[1])),i=i>=0?i:Math.max(0,r+i);for(;i<r;i++)if(i in n&&n[i]===t)return i;return-1};if(!Array.prototype.lastIndexOf||[0,1].lastIndexOf(0,-3)!=-1)Array.prototype.lastIndexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=r-1;arguments.length>1&&(i=Math.min(i,H(arguments[1]))),i=i>=0?i:r-Math.abs(i);for(;i>=0;i--)if(i in n&&t===n[i])return i;return-1};Object.getPrototypeOf||(Object.getPrototypeOf=function(t){return t.__proto__||(t.constructor?t.constructor.prototype:o)});if(!Object.getOwnPropertyDescriptor){var y="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(t,n){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(y+t);if(!f(t,n))return;var r,i,s;r={enumerable:!0,configurable:!0};if(d){var u=t.__proto__;t.__proto__=o;var i=h(t,n),s=p(t,n);t.__proto__=u;if(i||s)return i&&(r.get=i),s&&(r.set=s),r}return r.value=t[n],r}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(t){return Object.keys(t)});if(!Object.create){var b;Object.prototype.__proto__===null?b=function(){return{__proto__:null}}:b=function(){var e={};for(var t in e)e[t]=null;return e.constructor=e.hasOwnProperty=e.propertyIsEnumerable=e.isPrototypeOf=e.toLocaleString=e.toString=e.valueOf=e.__proto__=null,e},Object.create=function(t,n){var r;if(t===null)r=b();else{if(typeof t!="object")throw new TypeError("typeof prototype["+typeof t+"] != 'object'");var i=function(){};i.prototype=t,r=new i,r.__proto__=t}return n!==void 0&&Object.defineProperties(r,n),r}}if(Object.defineProperty){var E=w({}),S=typeof document=="undefined"||w(document.createElement("div"));if(!E||!S)var x=Object.defineProperty}if(!Object.defineProperty||x){var T="Property description must be an object: ",N="Object.defineProperty called on non-object: ",C="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(t,n,r){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(N+t);if(typeof r!="object"&&typeof r!="function"||r===null)throw new TypeError(T+r);if(x)try{return x.call(Object,t,n,r)}catch(i){}if(f(r,"value"))if(d&&(h(t,n)||p(t,n))){var s=t.__proto__;t.__proto__=o,delete t[n],t[n]=r.value,t.__proto__=s}else t[n]=r.value;else{if(!d)throw new TypeError(C);f(r,"get")&&l(t,n,r.get),f(r,"set")&&c(t,n,r.set)}return t}}Object.defineProperties||(Object.defineProperties=function(t,n){for(var r in n)f(n,r)&&Object.defineProperty(t,r,n[r]);return t}),Object.seal||(Object.seal=function(t){return t}),Object.freeze||(Object.freeze=function(t){return t});try{Object.freeze(function(){})}catch(k){Object.freeze=function(t){return function(n){return typeof n=="function"?n:t(n)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(t){return t}),Object.isSealed||(Object.isSealed=function(t){return!1}),Object.isFrozen||(Object.isFrozen=function(t){return!1}),Object.isExtensible||(Object.isExtensible=function(t){if(Object(t)===t)throw new TypeError;var n="";while(f(t,n))n+="?";t[n]=!0;var r=f(t,n);return delete t[n],r});if(!Object.keys){var L=!0,A=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],O=A.length;for(var M in{toString:null})L=!1;Object.keys=function I(e){if(typeof e!="object"&&typeof e!="function"||e===null)throw new TypeError("Object.keys called on a non-object");var I=[];for(var t in e)f(e,t)&&I.push(t);if(L)for(var n=0,r=O;n<r;n++){var i=A[n];f(e,i)&&I.push(i)}return I}}Date.now||(Date.now=function(){return(new Date).getTime()});var _=" \n \f\r \u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\ufeff";if(!String.prototype.trim||_.trim()){_="["+_+"]";var D=new RegExp("^"+_+_+"*"),P=new RegExp(_+_+"*$");String.prototype.trim=function(){return String(this).replace(D,"").replace(P,"")}}var F=function(e){if(e==null)throw new TypeError("can't convert "+e+" to object");return Object(e)}})
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/AbstractUnitTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.Silent.class)
public abstract class AbstractUnitTest {
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.Silent.class)
public abstract class AbstractUnitTest {
}
| -1 |
apolloconfig/apollo | 3,878 | add history query. | ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| Accelerator96 | 2021-08-06T12:54:42Z | 2021-08-13T03:06:53Z | 2e2919d21c4590212b6b471075f81749e4606c26 | 9e0b1ee9a9984ed021714e4474ce44e44738a04c | add history query.. ## What's the purpose of this PR
添加了通过配置的key对变更历史的查询
## Which issue(s) this PR fixes:
Fixes #3195
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceHealthIndicator.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice;
import com.ctrip.framework.apollo.biz.service.AppService;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Component;
@Component
public class ConfigServiceHealthIndicator implements HealthIndicator {
private final AppService appService;
public ConfigServiceHealthIndicator(final AppService appService) {
this.appService = appService;
}
@Override
public Health health() {
check();
return Health.up().build();
}
private void check() {
PageRequest pageable = PageRequest.of(0, 1);
appService.findAll(pageable);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice;
import com.ctrip.framework.apollo.biz.service.AppService;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Component;
@Component
public class ConfigServiceHealthIndicator implements HealthIndicator {
private final AppService appService;
public ConfigServiceHealthIndicator(final AppService appService) {
this.appService = appService;
}
@Override
public Health health() {
check();
return Health.up().build();
}
private void check() {
PageRequest pageable = PageRequest.of(0, 1);
appService.findAll(pageable);
}
}
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<name>Apollo</name>
<packaging>pom</packaging>
<description>Ctrip Configuration Center</description>
<url>https://github.com/ctripcorp/apollo</url>
<organization>
<name>Ctrip, Inc.</name>
<url>http://www.ctrip.com</url>
</organization>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
<scm>
<url>https://github.com/ctripcorp/apollo</url>
<connection>scm:git:git://github.com/ctripcorp/apollo.git</connection>
<developerConnection>scm:git:ssh://git@github.com/ctripcorp/apollo.git</developerConnection>
</scm>
<ciManagement>
<system>GitHub Actions</system>
<url>https://github.com/ctripcorp/apollo/actions</url>
</ciManagement>
<issueManagement>
<system>github</system>
<url>https://github.com/ctripcorp/apollo/issues</url>
</issueManagement>
<properties>
<revision>1.9.0-SNAPSHOT</revision>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>2.4.2</spring-boot.version>
<spring-cloud.version>2020.0.1</spring-cloud.version>
<jaxb.version>2.3.0</jaxb.version>
<javax.activation.version>1.1.1</javax.activation.version>
<javax.mail.version>1.6.2</javax.mail.version>
<javassist.version>3.23.1-GA</javassist.version>
<nacos-discovery-api.version>1.4.0</nacos-discovery-api.version>
<!-- Plugins Version -->
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<maven-war-plugin.version>3.0.0</maven-war-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<!-- for travis usage -->
<github.global.server>github</github.global.server>
<github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token>
</properties>
<modules>
<module>apollo-buildtools</module>
<module>apollo-core</module>
<module>apollo-client</module>
<module>apollo-client-config-data</module>
<module>apollo-common</module>
<module>apollo-biz</module>
<module>apollo-configservice</module>
<module>apollo-adminservice</module>
<module>apollo-portal</module>
<module>apollo-assembly</module>
<module>apollo-demo</module>
<module>apollo-mockserver</module>
<module>apollo-openapi</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-biz</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-buildtools</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-configservice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-adminservice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-portal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-openapi</artifactId>
<version>${project.version}</version>
</dependency>
<!-- ctrip internal dependencies, only used when ctrip profiles are enabled -->
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>com.ctrip.platform</groupId>
<artifactId>ctrip-dal-client</artifactId>
<version>1.0.2</version>
<exclusions>
<exclusion>
<artifactId>logback-core</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with bcpkix-jdk15on -->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
</exclusion>
<!-- duplicated with hibernate-jpa-2.1-api -->
<exclusion>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
<version>3.5.2</version>
<exclusions>
<exclusion>
<artifactId>logback-core</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.credis</groupId>
<artifactId>credis</artifactId>
<version>2.4.11</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework</groupId>
<artifactId>vi</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-sso</groupId>
<artifactId>apollo-sso-ctrip</artifactId>
<version>1.1.0</version>
<exclusions>
<!-- partially duplicated with org.ow2.asm:asm -->
<exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-ctrip-service</groupId>
<artifactId>apollo-email-service</artifactId>
<version>1.0.0</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--third party -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<!-- for jdk 7 compatibility -->
<version>29.0-android</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>5.0.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<!-- to fix CVE-2020-26217 -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.17</version>
</dependency>
<!--for test -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.191</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-lambda</artifactId>
<version>1.2.0</version>
<scope>test</scope>
</dependency>
<!-- declare Spring BOMs in order -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- required by eureka -->
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client4</artifactId>
<version>1.19.4</version>
</dependency>
<!-- ctrip modified -->
<!-- removed duplicated javax/persistence classes -->
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>8.0.37</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${javax.activation.version}</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>${javax.mail.version}</version>
</dependency>
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<!-- end of JDK 11+ -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<!-- for junit 4 -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<id>attach-javadoc</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<doclint>none</doclint>
</configuration>
</execution>
</executions>
<configuration>
<show>public</show>
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
<links>
<link>http://docs.oracle.com/javase/7/docs/api</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${maven-install-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<configuration>
<executable>true</executable>
<attach>false</attach>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.3</version>
<configuration>
<xmlOutput>true</xmlOutput>
<effort>Max</effort>
<threshold>Low</threshold>
<failOnError>false</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.6</version>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<verbose>true</verbose>
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/apollo-git.properties</generateGitPropertiesFilename>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Need to set releases.repo and snapshots.repo properties in your .m2/settings.xml -->
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*.yml</include>
<include>**/*.yaml</include>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/*.yml</exclude>
<exclude>**/*.yaml</exclude>
<exclude>**/*.properties</exclude>
<exclude>**/*.xml</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/config</directory>
<filtering>true</filtering>
<includes>
<include>application-github.properties</include>
</includes>
</resource>
<resource>
<directory>src/main/config</directory>
<filtering>false</filtering>
<excludes>
<exclude>application-github.properties</exclude>
</excludes>
</resource>
</resources>
</build>
<profiles>
<profile>
<!-- for travis usage -->
<id>travis</id>
<activation>
<property>
<name>env.TRAVIS</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.12</version>
<configuration>
<message>Site for ${project.artifactId}, ${project.version}</message>
<path>${github.path}</path>
<merge>true</merge>
</configuration>
<executions>
<execution>
<goals>
<goal>site</goal>
</goals>
<phase>site</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.3</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.2.0</version>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!-- for open source usage -->
<id>github</id>
<properties>
<package.environment>github</package.environment>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<!-- for ctrip development -->
<id>ctrip-dev</id>
<properties>
<package.environment>ctrip</package.environment>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<!-- use ctrip modified version instead -->
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring-cloud.version}</version>
<exclusions>
<!-- already in java -->
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with netty-all -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
<!-- duplicated with spring-aop -->
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- end of eureka -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>nacos-discovery</id>
<properties>
<nacos.discovery.version>0.2.7</nacos.discovery.version>
<fastjson.version>1.2.75</fastjson.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-discovery-spring-boot-starter</artifactId>
<version>${nacos.discovery.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
<profile>
<!-- for ctrip development with logging capability -->
<id>ctrip-logging</id>
<dependencies>
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<!-- for ctrip production -->
<id>ctrip</id>
<properties>
<package.environment>ctrip</package.environment>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<!-- use ctrip modified version instead -->
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring-cloud.version}</version>
<exclusions>
<!-- already in java -->
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with netty-all -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
<!-- duplicated with spring-aop -->
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- end of eureka -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.platform</groupId>
<artifactId>ctrip-dal-client</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>configdb</id>
<build>
<plugins>
<plugin>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-maven-plugin</artifactId>
<version>5.2.4</version>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
</dependencies>
<configuration>
<configFile>scripts/flyway/flyway-configdb.properties</configFile>
</configuration>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>portaldb</id>
<build>
<plugins>
<plugin>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-maven-plugin</artifactId>
<version>5.2.4</version>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
</dependencies>
<configuration>
<configFile>scripts/flyway/flyway-portaldb.properties</configFile>
</configuration>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.9</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>summary</report>
<report>dependency-info</report>
<report>project-team</report>
<report>scm</report>
<report>issue-tracking</report>
<report>mailing-list</report>
<!-- <report>dependency-management</report> -->
<!-- <report>dependencies</report> -->
<!-- <report>dependency-convergence</report> -->
<report>cim</report>
<report>plugin-management</report>
<report>plugins</report>
<report>distribution-management</report>
<report>license</report>
<report>modules</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<configuration>
<configLocation>google_checks.xml</configLocation>
<headerLocation>LICENSE-2.0.txt</headerLocation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.6</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.3</version>
</plugin>
</plugins>
</reporting>
<distributionManagement>
<repository>
<id>releases</id>
<url>${releases.repo}</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<url>${snapshots.repo}</url>
</snapshotRepository>
</distributionManagement>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<name>Apollo</name>
<packaging>pom</packaging>
<description>Ctrip Configuration Center</description>
<url>https://github.com/ctripcorp/apollo</url>
<organization>
<name>Ctrip, Inc.</name>
<url>http://www.ctrip.com</url>
</organization>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
<scm>
<url>https://github.com/ctripcorp/apollo</url>
<connection>scm:git:git://github.com/ctripcorp/apollo.git</connection>
<developerConnection>scm:git:ssh://git@github.com/ctripcorp/apollo.git</developerConnection>
</scm>
<ciManagement>
<system>GitHub Actions</system>
<url>https://github.com/ctripcorp/apollo/actions</url>
</ciManagement>
<issueManagement>
<system>github</system>
<url>https://github.com/ctripcorp/apollo/issues</url>
</issueManagement>
<properties>
<revision>1.9.0</revision>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>2.4.2</spring-boot.version>
<spring-cloud.version>2020.0.1</spring-cloud.version>
<jaxb.version>2.3.0</jaxb.version>
<javax.activation.version>1.1.1</javax.activation.version>
<javax.mail.version>1.6.2</javax.mail.version>
<javassist.version>3.23.1-GA</javassist.version>
<nacos-discovery-api.version>1.4.0</nacos-discovery-api.version>
<!-- Plugins Version -->
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<maven-war-plugin.version>3.0.0</maven-war-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<!-- for travis usage -->
<github.global.server>github</github.global.server>
<github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token>
</properties>
<modules>
<module>apollo-buildtools</module>
<module>apollo-core</module>
<module>apollo-client</module>
<module>apollo-client-config-data</module>
<module>apollo-common</module>
<module>apollo-biz</module>
<module>apollo-configservice</module>
<module>apollo-adminservice</module>
<module>apollo-portal</module>
<module>apollo-assembly</module>
<module>apollo-demo</module>
<module>apollo-mockserver</module>
<module>apollo-openapi</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-biz</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-buildtools</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-configservice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-adminservice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-portal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-openapi</artifactId>
<version>${project.version}</version>
</dependency>
<!-- ctrip internal dependencies, only used when ctrip profiles are enabled -->
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>com.ctrip.platform</groupId>
<artifactId>ctrip-dal-client</artifactId>
<version>1.0.2</version>
<exclusions>
<exclusion>
<artifactId>logback-core</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with bcpkix-jdk15on -->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
</exclusion>
<!-- duplicated with hibernate-jpa-2.1-api -->
<exclusion>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
<version>3.5.2</version>
<exclusions>
<exclusion>
<artifactId>logback-core</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.credis</groupId>
<artifactId>credis</artifactId>
<version>2.4.11</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework</groupId>
<artifactId>vi</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-sso</groupId>
<artifactId>apollo-sso-ctrip</artifactId>
<version>1.1.0</version>
<exclusions>
<!-- partially duplicated with org.ow2.asm:asm -->
<exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-ctrip-service</groupId>
<artifactId>apollo-email-service</artifactId>
<version>1.0.0</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--third party -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<!-- for jdk 7 compatibility -->
<version>29.0-android</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>5.0.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<!-- to fix CVE-2020-26217 -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.17</version>
</dependency>
<!--for test -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.191</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-lambda</artifactId>
<version>1.2.0</version>
<scope>test</scope>
</dependency>
<!-- declare Spring BOMs in order -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- required by eureka -->
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client4</artifactId>
<version>1.19.4</version>
</dependency>
<!-- ctrip modified -->
<!-- removed duplicated javax/persistence classes -->
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>8.0.37</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${javax.activation.version}</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>${javax.mail.version}</version>
</dependency>
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<!-- end of JDK 11+ -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<!-- for junit 4 -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<id>attach-javadoc</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<doclint>none</doclint>
</configuration>
</execution>
</executions>
<configuration>
<show>public</show>
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
<links>
<link>http://docs.oracle.com/javase/7/docs/api</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${maven-install-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<configuration>
<executable>true</executable>
<attach>false</attach>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.3</version>
<configuration>
<xmlOutput>true</xmlOutput>
<effort>Max</effort>
<threshold>Low</threshold>
<failOnError>false</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.6</version>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<verbose>true</verbose>
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/apollo-git.properties</generateGitPropertiesFilename>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Need to set releases.repo and snapshots.repo properties in your .m2/settings.xml -->
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*.yml</include>
<include>**/*.yaml</include>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/*.yml</exclude>
<exclude>**/*.yaml</exclude>
<exclude>**/*.properties</exclude>
<exclude>**/*.xml</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/config</directory>
<filtering>true</filtering>
<includes>
<include>application-github.properties</include>
</includes>
</resource>
<resource>
<directory>src/main/config</directory>
<filtering>false</filtering>
<excludes>
<exclude>application-github.properties</exclude>
</excludes>
</resource>
</resources>
</build>
<profiles>
<profile>
<!-- for travis usage -->
<id>travis</id>
<activation>
<property>
<name>env.TRAVIS</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.12</version>
<configuration>
<message>Site for ${project.artifactId}, ${project.version}</message>
<path>${github.path}</path>
<merge>true</merge>
</configuration>
<executions>
<execution>
<goals>
<goal>site</goal>
</goals>
<phase>site</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.3</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.2.0</version>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!-- for open source usage -->
<id>github</id>
<properties>
<package.environment>github</package.environment>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<!-- for ctrip development -->
<id>ctrip-dev</id>
<properties>
<package.environment>ctrip</package.environment>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<!-- use ctrip modified version instead -->
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring-cloud.version}</version>
<exclusions>
<!-- already in java -->
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with netty-all -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
<!-- duplicated with spring-aop -->
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- end of eureka -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>nacos-discovery</id>
<properties>
<nacos.discovery.version>0.2.7</nacos.discovery.version>
<fastjson.version>1.2.75</fastjson.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-discovery-spring-boot-starter</artifactId>
<version>${nacos.discovery.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
<profile>
<!-- for ctrip development with logging capability -->
<id>ctrip-logging</id>
<dependencies>
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<!-- for ctrip production -->
<id>ctrip</id>
<properties>
<package.environment>ctrip</package.environment>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<!-- use ctrip modified version instead -->
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring-cloud.version}</version>
<exclusions>
<!-- already in java -->
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with netty-all -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
<!-- duplicated with spring-aop -->
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- end of eureka -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.platform</groupId>
<artifactId>ctrip-dal-client</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>configdb</id>
<build>
<plugins>
<plugin>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-maven-plugin</artifactId>
<version>5.2.4</version>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
</dependencies>
<configuration>
<configFile>scripts/flyway/flyway-configdb.properties</configFile>
</configuration>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>portaldb</id>
<build>
<plugins>
<plugin>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-maven-plugin</artifactId>
<version>5.2.4</version>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
</dependencies>
<configuration>
<configFile>scripts/flyway/flyway-portaldb.properties</configFile>
</configuration>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.9</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>summary</report>
<report>dependency-info</report>
<report>project-team</report>
<report>scm</report>
<report>issue-tracking</report>
<report>mailing-list</report>
<!-- <report>dependency-management</report> -->
<!-- <report>dependencies</report> -->
<!-- <report>dependency-convergence</report> -->
<report>cim</report>
<report>plugin-management</report>
<report>plugins</report>
<report>distribution-management</report>
<report>license</report>
<report>modules</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<configuration>
<configLocation>google_checks.xml</configLocation>
<headerLocation>LICENSE-2.0.txt</headerLocation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.6</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.3</version>
</plugin>
</plugins>
</reporting>
<distributionManagement>
<repository>
<id>releases</id>
<url>${releases.repo}</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<url>${snapshots.repo}</url>
</snapshotRepository>
</distributionManagement>
</project>
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-dev
labels:
app: service-apollo-admin-server-dev
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-dev
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-dev
labels:
app: deployment-apollo-admin-server-dev
spec:
replicas: 2
selector:
matchLabels:
app: pod-apollo-admin-server-dev
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-dev
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-dev
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-dev
configMap:
name: configmap-apollo-admin-server-dev
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-adminservice:1.9.0-SNAPSHOT
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-dev
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-dev
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-dev.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-dev
labels:
app: service-apollo-admin-server-dev
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-dev
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-dev
labels:
app: deployment-apollo-admin-server-dev
spec:
replicas: 2
selector:
matchLabels:
app: pod-apollo-admin-server-dev
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-dev
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-dev
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-dev
configMap:
name: configmap-apollo-admin-server-dev
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-adminservice:1.9.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-dev
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-dev
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-dev.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-dev
labels:
app: service-apollo-meta-server-dev
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-dev
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-dev
labels:
app: service-apollo-config-server-dev
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30002
selector:
app: pod-apollo-config-server-dev
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-dev
labels:
app: statefulset-apollo-config-server-dev
spec:
serviceName: service-apollo-meta-server-dev
replicas: 2
selector:
matchLabels:
app: pod-apollo-config-server-dev
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-dev
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-dev
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-dev
configMap:
name: configmap-apollo-config-server-dev
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-configservice:1.9.0-SNAPSHOT
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-dev
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-dev
mountPath: /apollo-configservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-dev.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-dev
labels:
app: service-apollo-meta-server-dev
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-dev
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-dev
labels:
app: service-apollo-config-server-dev
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30002
selector:
app: pod-apollo-config-server-dev
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-dev
labels:
app: statefulset-apollo-config-server-dev
spec:
serviceName: service-apollo-meta-server-dev
replicas: 2
selector:
matchLabels:
app: pod-apollo-config-server-dev
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-dev
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-dev
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-dev
configMap:
name: configmap-apollo-config-server-dev
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-configservice:1.9.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-dev
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-dev
mountPath: /apollo-configservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-dev.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-fat
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-fat
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-fat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-fat-0.service-apollo-meta-server-fat:8080/eureka/,http://statefulset-apollo-config-server-fat-1.service-apollo-meta-server-fat:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-fat
labels:
app: service-apollo-admin-server-fat
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-fat
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-fat
labels:
app: deployment-apollo-admin-server-fat
spec:
replicas: 2
selector:
matchLabels:
app: pod-apollo-admin-server-fat
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-fat
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-fat
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-fat
configMap:
name: configmap-apollo-admin-server-fat
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-adminservice:1.9.0-SNAPSHOT
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-fat
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-fat
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-fat.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-fat
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-fat
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-fat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-fat-0.service-apollo-meta-server-fat:8080/eureka/,http://statefulset-apollo-config-server-fat-1.service-apollo-meta-server-fat:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-fat
labels:
app: service-apollo-admin-server-fat
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-fat
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-fat
labels:
app: deployment-apollo-admin-server-fat
spec:
replicas: 2
selector:
matchLabels:
app: pod-apollo-admin-server-fat
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-fat
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-fat
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-fat
configMap:
name: configmap-apollo-admin-server-fat
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-adminservice:1.9.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-fat
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-fat
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-fat.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-config-server-fat.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-fat
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-fat
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-fat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-fat-0.service-apollo-meta-server-fat:8080/eureka/,http://statefulset-apollo-config-server-fat-1.service-apollo-meta-server-fat:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-fat
labels:
app: service-apollo-meta-server-fat
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-fat
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-fat
labels:
app: service-apollo-config-server-fat
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30003
selector:
app: pod-apollo-config-server-fat
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-fat
labels:
app: statefulset-apollo-config-server-fat
spec:
serviceName: service-apollo-meta-server-fat
replicas: 2
selector:
matchLabels:
app: pod-apollo-config-server-fat
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-fat
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-fat
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-fat
configMap:
name: configmap-apollo-config-server-fat
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-configservice:1.9.0-SNAPSHOT
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-fat
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-fat
mountPath: /apollo-configservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-fat.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-fat
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-fat
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-fat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-fat-0.service-apollo-meta-server-fat:8080/eureka/,http://statefulset-apollo-config-server-fat-1.service-apollo-meta-server-fat:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-fat
labels:
app: service-apollo-meta-server-fat
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-fat
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-fat
labels:
app: service-apollo-config-server-fat
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30003
selector:
app: pod-apollo-config-server-fat
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-fat
labels:
app: statefulset-apollo-config-server-fat
spec:
serviceName: service-apollo-meta-server-fat
replicas: 2
selector:
matchLabels:
app: pod-apollo-config-server-fat
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-fat
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-fat
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-fat
configMap:
name: configmap-apollo-config-server-fat
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-configservice:1.9.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-fat
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-fat
mountPath: /apollo-configservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-fat.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-prod
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-prod
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-prod
labels:
app: service-apollo-admin-server-prod
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-prod
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-prod
labels:
app: deployment-apollo-admin-server-prod
spec:
replicas: 2
selector:
matchLabels:
app: pod-apollo-admin-server-prod
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-prod
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-prod
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-prod
configMap:
name: configmap-apollo-admin-server-prod
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-adminservice:1.9.0-SNAPSHOT
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-prod
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-prod
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-prod.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-prod
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-prod
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-prod
labels:
app: service-apollo-admin-server-prod
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-prod
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-prod
labels:
app: deployment-apollo-admin-server-prod
spec:
replicas: 2
selector:
matchLabels:
app: pod-apollo-admin-server-prod
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-prod
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-prod
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-prod
configMap:
name: configmap-apollo-admin-server-prod
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-adminservice:1.9.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-prod
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-prod
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-prod.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-prod
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-prod
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-prod
labels:
app: service-apollo-meta-server-prod
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-prod
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-prod
labels:
app: service-apollo-config-server-prod
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30005
selector:
app: pod-apollo-config-server-prod
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-prod
labels:
app: statefulset-apollo-config-server-prod
spec:
serviceName: service-apollo-meta-server-prod
replicas: 2
selector:
matchLabels:
app: pod-apollo-config-server-prod
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-prod
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-prod
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-prod
configMap:
name: configmap-apollo-config-server-prod
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-configservice:1.9.0-SNAPSHOT
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-prod
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-prod
mountPath: /apollo-configservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-prod.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-prod
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-prod
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-prod
labels:
app: service-apollo-meta-server-prod
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-prod
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-prod
labels:
app: service-apollo-config-server-prod
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30005
selector:
app: pod-apollo-config-server-prod
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-prod
labels:
app: statefulset-apollo-config-server-prod
spec:
serviceName: service-apollo-meta-server-prod
replicas: 2
selector:
matchLabels:
app: pod-apollo-config-server-prod
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-prod
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-prod
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-prod
configMap:
name: configmap-apollo-config-server-prod
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-configservice:1.9.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-prod
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-prod
mountPath: /apollo-configservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-prod.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-admin-server-uat.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-uat
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-uat
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-uat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-uat-0.service-apollo-meta-server-uat:8080/eureka/,http://statefulset-apollo-config-server-uat-1.service-apollo-meta-server-uat:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-uat
labels:
app: service-apollo-admin-server-uat
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-uat
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-uat
labels:
app: deployment-apollo-admin-server-uat
spec:
replicas: 2
selector:
matchLabels:
app: pod-apollo-admin-server-uat
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-uat
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-uat
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-uat
configMap:
name: configmap-apollo-admin-server-uat
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-adminservice:1.9.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-uat
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-uat
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-uat.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-uat
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-uat
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-uat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-uat-0.service-apollo-meta-server-uat:8080/eureka/,http://statefulset-apollo-config-server-uat-1.service-apollo-meta-server-uat:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-uat
labels:
app: service-apollo-admin-server-uat
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-uat
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-uat
labels:
app: deployment-apollo-admin-server-uat
spec:
replicas: 2
selector:
matchLabels:
app: pod-apollo-admin-server-uat
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-uat
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-uat
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-uat
configMap:
name: configmap-apollo-admin-server-uat
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-adminservice:1.9.0
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-uat
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-uat
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-uat.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-config-server-uat.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-uat
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-uat
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-uat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-uat-0.service-apollo-meta-server-uat:8080/eureka/,http://statefulset-apollo-config-server-uat-1.service-apollo-meta-server-uat:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-uat
labels:
app: service-apollo-meta-server-uat
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-uat
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-uat
labels:
app: service-apollo-config-server-uat
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30004
selector:
app: pod-apollo-config-server-uat
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-uat
labels:
app: statefulset-apollo-config-server-uat
spec:
serviceName: service-apollo-meta-server-uat
replicas: 2
selector:
matchLabels:
app: pod-apollo-config-server-uat
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-uat
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-uat
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-uat
configMap:
name: configmap-apollo-config-server-uat
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-configservice:1.9.0-SNAPSHOT
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-uat
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-uat
mountPath: /apollo-configservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-uat.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 15
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-uat
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-uat
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-uat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-uat-0.service-apollo-meta-server-uat:8080/eureka/,http://statefulset-apollo-config-server-uat-1.service-apollo-meta-server-uat:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-uat
labels:
app: service-apollo-meta-server-uat
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-uat
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-uat
labels:
app: service-apollo-config-server-uat
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30004
selector:
app: pod-apollo-config-server-uat
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-uat
labels:
app: statefulset-apollo-config-server-uat
spec:
serviceName: service-apollo-meta-server-uat
replicas: 2
selector:
matchLabels:
app: pod-apollo-config-server-uat
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-uat
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-uat
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-uat
configMap:
name: configmap-apollo-config-server-uat
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-configservice:1.9.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-uat
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-uat
mountPath: /apollo-configservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-uat.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 15
dnsPolicy: ClusterFirst
restartPolicy: Always
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# 为外部 mysql 服务设置 service
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-portal-server
labels:
app: service-mysql-for-portal-server
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-portal-server
subsets:
- addresses:
# 更改为你的 mysql addresses, 例如 1.1.1.1
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306
---
# configmap for apollo-portal-server
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-portal-server
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-portal-server.sre:3306/ApolloPortalDB?characterEncoding=utf8
# mysql username
spring.datasource.username = FillInCorrectUser
# mysql password
spring.datasource.password = FillInCorrectPassword
# enabled environments
apollo.portal.envs = dev,fat,uat,pro
apollo-env.properties: |
dev.meta=http://service-apollo-config-server-dev.sre:8080
fat.meta=http://service-apollo-config-server-fat.sre:8080
uat.meta=http://service-apollo-config-server-uat.sre:8080
pro.meta=http://service-apollo-config-server-prod.sre:8080
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-portal-server
labels:
app: service-apollo-portal-server
spec:
ports:
- protocol: TCP
port: 8070
targetPort: 8070
nodePort: 30001
selector:
app: pod-apollo-portal-server
type: NodePort
# portal session 保持
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-portal-server
labels:
app: deployment-apollo-portal-server
spec:
# 2 个实例
replicas: 2
selector:
matchLabels:
app: pod-apollo-portal-server
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-portal-server
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-portal-server
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-portal-server
configMap:
name: configmap-apollo-portal-server
items:
- key: application-github.properties
path: application-github.properties
- key: apollo-env.properties
path: apollo-env.properties
containers:
- image: apolloconfig/apollo-portal:1.9.0-SNAPSHOT
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-portal-server
ports:
- protocol: TCP
containerPort: 8070
volumeMounts:
- name: volume-configmap-apollo-portal-server
mountPath: /apollo-portal/config/application-github.properties
subPath: application-github.properties
- name: volume-configmap-apollo-portal-server
mountPath: /apollo-portal/config/apollo-env.properties
subPath: apollo-env.properties
env:
- name: APOLLO_PORTAL_SERVICE_NAME
value: "service-apollo-portal-server.sre"
readinessProbe:
tcpSocket:
port: 8070
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8070
# 120s 内, server 未启动则重启 container
initialDelaySeconds: 120
periodSeconds: 15
dnsPolicy: ClusterFirst
restartPolicy: Always
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# 为外部 mysql 服务设置 service
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-portal-server
labels:
app: service-mysql-for-portal-server
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-portal-server
subsets:
- addresses:
# 更改为你的 mysql addresses, 例如 1.1.1.1
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306
---
# configmap for apollo-portal-server
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-portal-server
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-portal-server.sre:3306/ApolloPortalDB?characterEncoding=utf8
# mysql username
spring.datasource.username = FillInCorrectUser
# mysql password
spring.datasource.password = FillInCorrectPassword
# enabled environments
apollo.portal.envs = dev,fat,uat,pro
apollo-env.properties: |
dev.meta=http://service-apollo-config-server-dev.sre:8080
fat.meta=http://service-apollo-config-server-fat.sre:8080
uat.meta=http://service-apollo-config-server-uat.sre:8080
pro.meta=http://service-apollo-config-server-prod.sre:8080
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-portal-server
labels:
app: service-apollo-portal-server
spec:
ports:
- protocol: TCP
port: 8070
targetPort: 8070
nodePort: 30001
selector:
app: pod-apollo-portal-server
type: NodePort
# portal session 保持
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-portal-server
labels:
app: deployment-apollo-portal-server
spec:
# 2 个实例
replicas: 2
selector:
matchLabels:
app: pod-apollo-portal-server
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-portal-server
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-portal-server
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-portal-server
configMap:
name: configmap-apollo-portal-server
items:
- key: application-github.properties
path: application-github.properties
- key: apollo-env.properties
path: apollo-env.properties
containers:
- image: apolloconfig/apollo-portal:1.9.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-portal-server
ports:
- protocol: TCP
containerPort: 8070
volumeMounts:
- name: volume-configmap-apollo-portal-server
mountPath: /apollo-portal/config/application-github.properties
subPath: application-github.properties
- name: volume-configmap-apollo-portal-server
mountPath: /apollo-portal/config/apollo-env.properties
subPath: apollo-env.properties
env:
- name: APOLLO_PORTAL_SERVICE_NAME
value: "service-apollo-portal-server.sre"
readinessProbe:
tcpSocket:
port: 8070
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8070
# 120s 内, server 未启动则重启 container
initialDelaySeconds: 120
periodSeconds: 15
dnsPolicy: ClusterFirst
restartPolicy: Always
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/helm/apollo-portal/Chart.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v2
name: apollo-portal
description: A Helm chart for Apollo Portal
type: application
version: 0.3.0
appVersion: 1.9.0-SNAPSHOT
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- name: nobodyiam
email: nobodyiam@gmail.com
url: https://github.com/nobodyiam
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v2
name: apollo-portal
description: A Helm chart for Apollo Portal
type: application
version: 0.3.0
appVersion: 1.9.0
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- name: nobodyiam
email: nobodyiam@gmail.com
url: https://github.com/nobodyiam
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/helm/apollo-service/Chart.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v2
name: apollo-service
description: A Helm chart for Apollo Config Service and Apollo Admin Service
type: application
version: 0.3.0
appVersion: 1.9.0-SNAPSHOT
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- name: nobodyiam
email: nobodyiam@gmail.com
url: https://github.com/nobodyiam
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v2
name: apollo-service
description: A Helm chart for Apollo Config Service and Apollo Admin Service
type: application
version: 0.3.0
appVersion: 1.9.0
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- name: nobodyiam
email: nobodyiam@gmail.com
url: https://github.com/nobodyiam
| 1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/yaml/case2.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key1: "anotherValue"
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key1: "anotherValue"
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/XmlConfigAnnotationTest6.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config/>
<bean class="com.ctrip.framework.apollo.spring.XMLConfigAnnotationTest.TestApolloConfigChangeListenerWithInterestedKeysBean"/>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config/>
<bean class="com.ctrip.framework.apollo.spring.XMLConfigAnnotationTest.TestApolloConfigChangeListenerWithInterestedKeysBean"/>
</beans>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-configservice</artifactId>
<name>Apollo ConfigService</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-biz</artifactId>
</dependency>
<!-- end of apollo -->
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
<exclusions>
<exclusion>
<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>ribbon-eureka</artifactId>
<groupId>com.netflix.ribbon</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-core</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-ec2</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-autoscaling</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-sts</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-route53</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client4</artifactId>
</dependency>
<!-- end of eureka -->
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-api</artifactId>
<version>${nacos-discovery-api.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
<!-- end of JDK 1.8+ -->
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<!-- end of JDK 11+ -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<imageName>apolloconfig/${project.artifactId}</imageName>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<serverId>docker-hub</serverId>
<buildArgs>
<VERSION>${project.version}</VERSION>
</buildArgs>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>*.zip</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>nacos-discovery</id>
<dependencies>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-discovery-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-configservice</artifactId>
<name>Apollo ConfigService</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-biz</artifactId>
</dependency>
<!-- end of apollo -->
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
<exclusions>
<exclusion>
<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>ribbon-eureka</artifactId>
<groupId>com.netflix.ribbon</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-core</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-ec2</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-autoscaling</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-sts</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-route53</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client4</artifactId>
</dependency>
<!-- end of eureka -->
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-api</artifactId>
<version>${nacos-discovery-api.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
<!-- end of JDK 1.8+ -->
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<!-- end of JDK 11+ -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<imageName>apolloconfig/${project.artifactId}</imageName>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<serverId>docker-hub</serverId>
<buildArgs>
<VERSION>${project.version}</VERSION>
</buildArgs>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>*.zip</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>nacos-discovery</id>
<dependencies>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-discovery-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-openapi/src/test/resources/log4j2.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration monitorInterval="60">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="[apollo-open-api][%t]%d %-5p [%c] %m%n"/>
</Console>
<Async name="Async" includeLocation="true">
<AppenderRef ref="Console"/>
</Async>
</appenders>
<loggers>
<logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
<AppenderRef ref="Async" level="WARN"/>
</logger>
<root level="INFO">
<AppenderRef ref="Async"/>
</root>
</loggers>
</configuration>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration monitorInterval="60">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="[apollo-open-api][%t]%d %-5p [%c] %m%n"/>
</Console>
<Async name="Async" includeLocation="true">
<AppenderRef ref="Console"/>
</Async>
</appenders>
<loggers>
<logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
<AppenderRef ref="Async" level="WARN"/>
</logger>
<root level="INFO">
<AppenderRef ref="Async"/>
</root>
</loggers>
</configuration>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/XmlConfigPlaceholderTest2.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config namespaces="application"/>
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config namespaces="application"/>
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-buildtools/style/eclipse-java-google-style.xml | <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<profiles version="13">
<profile kind="CodeFormatterProfile" name="GoogleStyle" version="13">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_prefer_two_fragments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_comment_inline_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_local_variable_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="1040"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression.count_dependent" value="16|4|80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration.count_dependent" value="16|4|49"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments" value="16"/>
<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_local_variable_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants.count_dependent" value="16|5|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_type_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_field_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment_new_line_at_start_of_html_paragraph" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comment_prefix" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_parameter_annotation" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter.count_dependent" value="1040|-1|1040"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.force_if_else_statement_brace" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="3"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_package_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="1585"/>
<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_new_anonymous_class" value="20"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_member_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_for_statement" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
</profile>
</profiles>
| <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<profiles version="13">
<profile kind="CodeFormatterProfile" name="GoogleStyle" version="13">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_prefer_two_fragments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_comment_inline_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_local_variable_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="1040"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression.count_dependent" value="16|4|80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration.count_dependent" value="16|4|49"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments" value="16"/>
<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_local_variable_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants.count_dependent" value="16|5|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_type_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_field_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment_new_line_at_start_of_html_paragraph" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comment_prefix" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_parameter_annotation" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter.count_dependent" value="1040|-1|1040"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.force_if_else_statement_brace" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="3"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_package_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="1585"/>
<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_new_anonymous_class" value="20"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_member_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_for_statement" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
</profile>
</profiles>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/yaml/case7.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
xxx
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
xxx
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-mockserver/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apollo</artifactId>
<groupId>com.ctrip.framework.apollo</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-mockserver</artifactId>
<name>Apollo Mock Server</name>
<properties>
<java.version>1.7</java.version>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<version>3.11.0</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.11.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apollo</artifactId>
<groupId>com.ctrip.framework.apollo</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-mockserver</artifactId>
<name>Apollo Mock Server</name>
<properties>
<java.version>1.7</java.version>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<version>3.11.0</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.11.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-mysql-for-apollo-dev-env.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# 为外部 mysql 服务设置 service
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-dev-env
labels:
app: service-mysql-for-apollo-dev-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-dev-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# 为外部 mysql 服务设置 service
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-dev-env
labels:
app: service-mysql-for-apollo-dev-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-dev-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/logback.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<property name="LOG_FILE"
value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-portal.log}" />
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
<root level="INFO">
<if condition='isDefined("LOG_APPENDERS")'>
<then>
<if condition='property("LOG_APPENDERS").contains("CONSOLE")'>
<then>
<appender-ref ref="CONSOLE"/>
</then>
</if>
<if condition='property("LOG_APPENDERS").contains("FILE")'>
<then>
<appender-ref ref="FILE"/>
</then>
</if>
</then>
<else>
<appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
</else>
</if>
</root>
</configuration>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<property name="LOG_FILE"
value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-portal.log}" />
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
<root level="INFO">
<if condition='isDefined("LOG_APPENDERS")'>
<then>
<if condition='property("LOG_APPENDERS").contains("CONSOLE")'>
<then>
<appender-ref ref="CONSOLE"/>
</then>
</if>
<if condition='property("LOG_APPENDERS").contains("FILE")'>
<then>
<appender-ref ref="FILE"/>
</then>
</if>
</then>
<else>
<appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
</else>
</if>
</root>
</configuration>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/main/resources/logback.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<property name="LOG_FILE"
value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-configservice.log}" />
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
<root level="INFO">
<if condition='isDefined("LOG_APPENDERS")'>
<then>
<if condition='property("LOG_APPENDERS").contains("CONSOLE")'>
<then>
<appender-ref ref="CONSOLE"/>
</then>
</if>
<if condition='property("LOG_APPENDERS").contains("FILE")'>
<then>
<appender-ref ref="FILE"/>
</then>
</if>
</then>
<else>
<appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
</else>
</if>
</root>
</configuration>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<property name="LOG_FILE"
value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-configservice.log}" />
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
<root level="INFO">
<if condition='isDefined("LOG_APPENDERS")'>
<then>
<if condition='property("LOG_APPENDERS").contains("CONSOLE")'>
<then>
<appender-ref ref="CONSOLE"/>
</then>
</if>
<if condition='property("LOG_APPENDERS").contains("FILE")'>
<then>
<appender-ref ref="FILE"/>
</then>
</if>
</then>
<else>
<appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
</else>
</if>
</root>
</configuration>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/config.namespace.placeholder.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config namespaces="${xxx.from.system.property}"/>
<apollo:config namespaces="${yyy.from.system.property}" order="10"/>
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config namespaces="${xxx.from.system.property}"/>
<apollo:config namespaces="${yyy.from.system.property}" order="10"/>
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/test/resources/yaml/case1.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key3:
key4:
key5: '(%sender%) %message%'
key6: '* %sender% %message%'
# commented: "xxx"
list:
- 'item 1'
- 'item 2'
intList:
- 100
- 200
listOfMap:
- key: '#mychannel'
value: ''
- key: '#myprivatechannel'
value: 'mypassword'
listOfList:
- - 'a1'
- 'a2'
- - 'b1'
- 'b2'
listOfList2: [ ['a1', 'a2'], ['b1', 'b2'] ]
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key3:
key4:
key5: '(%sender%) %message%'
key6: '* %sender% %message%'
# commented: "xxx"
list:
- 'item 1'
- 'item 2'
intList:
- 100
- 200
listOfMap:
- key: '#mychannel'
value: ''
- key: '#myprivatechannel'
value: 'mypassword'
listOfList:
- - 'a1'
- 'a2'
- - 'b1'
- 'b2'
listOfList2: [ ['a1', 'a2'], ['b1', 'b2'] ]
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/test/resources/yaml/case3.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
!!javax.script.ScriptEngineManager [
!!java.net.URLClassLoader [[
!!java.net.URL ["http://localhost"]
]]
] | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
!!javax.script.ScriptEngineManager [
!!java.net.URLClassLoader [[
!!java.net.URL ["http://localhost"]
]]
] | -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/yaml/case1-new.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1001
batch: 2001
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1001
batch: 2001
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-mysql-for-apollo-fat-env.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-fat-env
labels:
app: service-mysql-for-apollo-fat-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-fat-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-fat-env
labels:
app: service-mysql-for-apollo-fat-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-fat-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/yaml/case3.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/helm/apollo-portal/templates/service-portaldb.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.portaldb.service.enabled -}}
---
# service definition for mysql
kind: Service
apiVersion: v1
metadata:
name: {{include "apollo.portaldb.serviceName" .}}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
type: {{ .Values.portaldb.service.type }}
{{- if eq .Values.portaldb.service.type "ExternalName" }}
externalName: {{ required "portaldb.host is required!" .Values.portaldb.host }}
{{- else }}
ports:
- protocol: TCP
port: {{ .Values.portaldb.service.port }}
targetPort: {{ .Values.portaldb.port }}
---
kind: Endpoints
apiVersion: v1
metadata:
name: {{include "apollo.portaldb.serviceName" .}}
subsets:
- addresses:
- ip: {{ required "portaldb.host is required!" .Values.portaldb.host }}
ports:
- protocol: TCP
port: {{ .Values.portaldb.port }}
{{- end }}
{{- end }} | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.portaldb.service.enabled -}}
---
# service definition for mysql
kind: Service
apiVersion: v1
metadata:
name: {{include "apollo.portaldb.serviceName" .}}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
type: {{ .Values.portaldb.service.type }}
{{- if eq .Values.portaldb.service.type "ExternalName" }}
externalName: {{ required "portaldb.host is required!" .Values.portaldb.host }}
{{- else }}
ports:
- protocol: TCP
port: {{ .Values.portaldb.service.port }}
targetPort: {{ .Values.portaldb.port }}
---
kind: Endpoints
apiVersion: v1
metadata:
name: {{include "apollo.portaldb.serviceName" .}}
subsets:
- addresses:
- ip: {{ required "portaldb.host is required!" .Values.portaldb.host }}
ports:
- protocol: TCP
port: {{ .Values.portaldb.port }}
{{- end }}
{{- end }} | -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/yaml/case4.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
batch: 2000
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
batch: 2000
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-client-config-data</artifactId>
<name>Apollo Client Config Data</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<scope>provided</scope>
</dependency>
<!-- annotation processor -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<!-- optional -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
<optional>true</optional>
</dependency>
<!-- test -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-lambda</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-client-config-data</artifactId>
<name>Apollo Client Config Data</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<scope>provided</scope>
</dependency>
<!-- annotation processor -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<!-- optional -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
<optional>true</optional>
</dependency>
<!-- test -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-lambda</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-biz</artifactId>
<name>Apollo Biz</name>
<packaging>jar</packaging>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<!-- end of eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-biz</artifactId>
<name>Apollo Biz</name>
<packaging>jar</packaging>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<!-- end of eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/charts/index.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v1
entries:
apollo-portal:
- apiVersion: v2
appVersion: 1.8.2
created: "2021-06-02T23:05:43.379448+08:00"
description: A Helm chart for Apollo Portal
digest: 5586b2597ebe098a26c94273855461891041241628d85dc13e05ce661ff5e7a2
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.2.2.tgz
version: 0.2.2
- apiVersion: v2
appVersion: 1.8.1
created: "2021-06-02T23:05:43.378586+08:00"
description: A Helm chart for Apollo Portal
digest: 8bac1b48361e2717d7d4ee669a85a14ee22ada96f249300d90ee563def63baea
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.2.1.tgz
version: 0.2.1
- apiVersion: v2
appVersion: 1.8.0
created: "2021-06-02T23:05:43.377736+08:00"
description: A Helm chart for Apollo Portal
digest: 8a55c5f3ddd76b9768067fe6eecfb34b588084557c11882e263abb2af7dfc173
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.2.0.tgz
version: 0.2.0
- apiVersion: v2
appVersion: 1.7.2
created: "2021-06-02T23:05:43.376846+08:00"
description: A Helm chart for Apollo Portal
digest: 1db8b2435e0471ef55c63c47b970e4ae059800f88ed4ac4f1ca6cd27fe502722
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.2.tgz
version: 0.1.2
- apiVersion: v2
appVersion: 1.7.1
created: "2021-06-02T23:05:43.375959+08:00"
description: A Helm chart for Apollo Portal
digest: 7c1b4efa13d4cc54a714b3ec836f609a8f97286c465789f6d807d1227cfc5b74
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
appVersion: 1.7.0
created: "2021-06-02T23:05:43.37481+08:00"
description: A Helm chart for Apollo Portal
digest: b838e4478f0c031093691defeffb5805d51189989db0eb9caaa2dc67905c8391
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.0.tgz
version: 0.1.0
apollo-service:
- apiVersion: v2
appVersion: 1.8.2
created: "2021-06-02T23:05:43.388235+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 7291d516b94390843439bae7a2635561e713a549339a314fa2ef79ef098b6ab4
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.2.2.tgz
version: 0.2.2
- apiVersion: v2
appVersion: 1.8.1
created: "2021-06-02T23:05:43.387399+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: f88f0c6942353b3d49b4caa43a7580b885ccc94a646428694adc2ed3d43e49fe
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.2.1.tgz
version: 0.2.1
- apiVersion: v2
appVersion: 1.8.0
created: "2021-06-02T23:05:43.385355+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 73e66c651499f93b6f3891e979dcbe2a20ad37809087e42bc98643c604c457c6
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.2.0.tgz
version: 0.2.0
- apiVersion: v2
appVersion: 1.7.2
created: "2021-06-02T23:05:43.38449+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: be9379611b45db416a32b7e1367527faec7c29a969493ca4a0a72b5b87a280f4
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.2.tgz
version: 0.1.2
- apiVersion: v2
appVersion: 1.7.1
created: "2021-06-02T23:05:43.381142+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 787a26590d68735341b7839c14274492097fed4a0843fc9a1e5c692194199707
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
appVersion: 1.7.0
created: "2021-06-02T23:05:43.380337+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 65c08f39b54ad1ac1d849cc841ce978bd6e95b0b6cbd2423d9f17f66bc7e8d3e
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.0.tgz
version: 0.1.0
generated: "2021-06-02T23:05:43.373363+08:00"
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v1
entries:
apollo-portal:
- apiVersion: v2
appVersion: 1.8.2
created: "2021-06-02T23:05:43.379448+08:00"
description: A Helm chart for Apollo Portal
digest: 5586b2597ebe098a26c94273855461891041241628d85dc13e05ce661ff5e7a2
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.2.2.tgz
version: 0.2.2
- apiVersion: v2
appVersion: 1.8.1
created: "2021-06-02T23:05:43.378586+08:00"
description: A Helm chart for Apollo Portal
digest: 8bac1b48361e2717d7d4ee669a85a14ee22ada96f249300d90ee563def63baea
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.2.1.tgz
version: 0.2.1
- apiVersion: v2
appVersion: 1.8.0
created: "2021-06-02T23:05:43.377736+08:00"
description: A Helm chart for Apollo Portal
digest: 8a55c5f3ddd76b9768067fe6eecfb34b588084557c11882e263abb2af7dfc173
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.2.0.tgz
version: 0.2.0
- apiVersion: v2
appVersion: 1.7.2
created: "2021-06-02T23:05:43.376846+08:00"
description: A Helm chart for Apollo Portal
digest: 1db8b2435e0471ef55c63c47b970e4ae059800f88ed4ac4f1ca6cd27fe502722
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.2.tgz
version: 0.1.2
- apiVersion: v2
appVersion: 1.7.1
created: "2021-06-02T23:05:43.375959+08:00"
description: A Helm chart for Apollo Portal
digest: 7c1b4efa13d4cc54a714b3ec836f609a8f97286c465789f6d807d1227cfc5b74
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
appVersion: 1.7.0
created: "2021-06-02T23:05:43.37481+08:00"
description: A Helm chart for Apollo Portal
digest: b838e4478f0c031093691defeffb5805d51189989db0eb9caaa2dc67905c8391
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.0.tgz
version: 0.1.0
apollo-service:
- apiVersion: v2
appVersion: 1.8.2
created: "2021-06-02T23:05:43.388235+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 7291d516b94390843439bae7a2635561e713a549339a314fa2ef79ef098b6ab4
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.2.2.tgz
version: 0.2.2
- apiVersion: v2
appVersion: 1.8.1
created: "2021-06-02T23:05:43.387399+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: f88f0c6942353b3d49b4caa43a7580b885ccc94a646428694adc2ed3d43e49fe
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.2.1.tgz
version: 0.2.1
- apiVersion: v2
appVersion: 1.8.0
created: "2021-06-02T23:05:43.385355+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 73e66c651499f93b6f3891e979dcbe2a20ad37809087e42bc98643c604c457c6
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.2.0.tgz
version: 0.2.0
- apiVersion: v2
appVersion: 1.7.2
created: "2021-06-02T23:05:43.38449+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: be9379611b45db416a32b7e1367527faec7c29a969493ca4a0a72b5b87a280f4
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.2.tgz
version: 0.1.2
- apiVersion: v2
appVersion: 1.7.1
created: "2021-06-02T23:05:43.381142+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 787a26590d68735341b7839c14274492097fed4a0843fc9a1e5c692194199707
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
appVersion: 1.7.0
created: "2021-06-02T23:05:43.380337+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 65c08f39b54ad1ac1d849cc841ce978bd6e95b0b6cbd2423d9f17f66bc7e8d3e
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.0.tgz
version: 0.1.0
generated: "2021-06-02T23:05:43.373363+08:00"
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/resources/datasource.xml | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!--
for ctrip datasource
-->
<Datasources>
<Datasource
name="${pro_titan_dbname}"
testWhileIdle="true"
testOnBorrow="true"
testOnReturn="false"
validationQuery="SELECT 1"
initSql="set names utf8mb4"
validationInterval="30000"
timeBetweenEvictionRunsMillis="5000"
maxActive="100"
minIdle="10"
maxWait="10000"
initialSize="10"
removeAbandonedTimeout="60"
removeAbandoned="true"
logAbandoned="false"
minEvictableIdleTimeMillis="30000"
option="sendStringParametersAsUnicode=false"
/>
</Datasources>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!--
for ctrip datasource
-->
<Datasources>
<Datasource
name="${pro_titan_dbname}"
testWhileIdle="true"
testOnBorrow="true"
testOnReturn="false"
validationQuery="SELECT 1"
initSql="set names utf8mb4"
validationInterval="30000"
timeBetweenEvictionRunsMillis="5000"
maxActive="100"
minIdle="10"
maxWait="10000"
initialSize="10"
removeAbandonedTimeout="60"
removeAbandoned="true"
logAbandoned="false"
minEvictableIdleTimeMillis="30000"
option="sendStringParametersAsUnicode=false"
/>
</Datasources>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/XmlConfigPlaceholderTest7.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config />
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout}"/>
<property name="batch" value="${batch}"/>
</bean>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config />
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout}"/>
<property name="batch" value="${batch}"/>
</bean>
</beans>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/XmlConfigPlaceholderTest8.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config />
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderAutoUpdateTest.TestXmlBeanWithConstructorArgs">
<constructor-arg index="0" value="${timeout}"/>
<constructor-arg index="1" value="${batch}"/>
</bean>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config />
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderAutoUpdateTest.TestXmlBeanWithConstructorArgs">
<constructor-arg index="0" value="${timeout}"/>
<constructor-arg index="1" value="${batch}"/>
</bean>
</beans>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/helm/apollo-service/templates/ingress-adminservice.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.adminService.ingress.enabled -}}
{{- $fullName := include "apollo.adminService.fullName" . -}}
{{- $svcPort := .Values.adminService.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
{{- with .Values.adminService.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.adminService.ingress.tls }}
tls:
{{- range .Values.adminService.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.adminService.ingress.hosts }}
- host: {{ .host | quote }}
http:
paths:
{{- range .paths }}
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.adminService.ingress.enabled -}}
{{- $fullName := include "apollo.adminService.fullName" . -}}
{{- $svcPort := .Values.adminService.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
{{- with .Values.adminService.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.adminService.ingress.tls }}
tls:
{{- range .Values.adminService.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.adminService.ingress.hosts }}
- host: {{ .host | quote }}
http:
paths:
{{- range .paths }}
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/helm/apollo-portal/templates/deployment-portal.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-portal
kind: ConfigMap
apiVersion: v1
metadata:
{{- $portalFullName := include "apollo.portal.fullName" . }}
name: {{ $portalFullName }}
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://{{include "apollo.portaldb.serviceName" .}}:{{include "apollo.portaldb.servicePort" .}}/{{ .Values.portaldb.dbName }}{{ if .Values.portaldb.connectionStringProperties }}?{{ .Values.portaldb.connectionStringProperties }}{{ end }}
spring.datasource.username = {{ required "portaldb.userName is required!" .Values.portaldb.userName }}
spring.datasource.password = {{ required "portaldb.password is required!" .Values.portaldb.password }}
{{- if .Values.config.envs }}
apollo.portal.envs = {{ .Values.config.envs }}
{{- end }}
{{- if .Values.config.contextPath }}
server.servlet.context-path = {{ .Values.config.contextPath }}
{{- end }}
apollo-env.properties: |
{{- range $env, $address := .Values.config.metaServers }}
{{ $env }}.meta = {{ $address }}
{{- end }}
{{- range $fileName, $content := .Values.config.files }}
{{ $fileName | indent 2 }}: |
{{ $content | indent 4 }}
{{- end }}
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ $portalFullName }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ $portalFullName }}
{{- with .Values.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
template:
metadata:
labels:
app: {{ $portalFullName }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: configmap-{{ $portalFullName }}
configMap:
name: {{ $portalFullName }}
items:
- key: application-github.properties
path: application-github.properties
- key: apollo-env.properties
path: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- key: {{ $fileName }}
path: {{ $fileName }}
{{- end }}
defaultMode: 420
containers:
- name: {{ .Values.name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.containerPort }}
protocol: TCP
env:
- name: SPRING_PROFILES_ACTIVE
value: {{ .Values.config.profiles | quote }}
{{- range $key, $value := .Values.env }}
- name: {{ $key }}
value: {{ $value }}
{{- end }}
volumeMounts:
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/application-github.properties
subPath: application-github.properties
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/apollo-env.properties
subPath: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/{{ $fileName }}
subPath: {{ $fileName }}
{{- end }}
livenessProbe:
tcpSocket:
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
readinessProbe:
httpGet:
path: {{ .Values.config.contextPath }}/health
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-portal
kind: ConfigMap
apiVersion: v1
metadata:
{{- $portalFullName := include "apollo.portal.fullName" . }}
name: {{ $portalFullName }}
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://{{include "apollo.portaldb.serviceName" .}}:{{include "apollo.portaldb.servicePort" .}}/{{ .Values.portaldb.dbName }}{{ if .Values.portaldb.connectionStringProperties }}?{{ .Values.portaldb.connectionStringProperties }}{{ end }}
spring.datasource.username = {{ required "portaldb.userName is required!" .Values.portaldb.userName }}
spring.datasource.password = {{ required "portaldb.password is required!" .Values.portaldb.password }}
{{- if .Values.config.envs }}
apollo.portal.envs = {{ .Values.config.envs }}
{{- end }}
{{- if .Values.config.contextPath }}
server.servlet.context-path = {{ .Values.config.contextPath }}
{{- end }}
apollo-env.properties: |
{{- range $env, $address := .Values.config.metaServers }}
{{ $env }}.meta = {{ $address }}
{{- end }}
{{- range $fileName, $content := .Values.config.files }}
{{ $fileName | indent 2 }}: |
{{ $content | indent 4 }}
{{- end }}
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ $portalFullName }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ $portalFullName }}
{{- with .Values.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
template:
metadata:
labels:
app: {{ $portalFullName }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: configmap-{{ $portalFullName }}
configMap:
name: {{ $portalFullName }}
items:
- key: application-github.properties
path: application-github.properties
- key: apollo-env.properties
path: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- key: {{ $fileName }}
path: {{ $fileName }}
{{- end }}
defaultMode: 420
containers:
- name: {{ .Values.name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.containerPort }}
protocol: TCP
env:
- name: SPRING_PROFILES_ACTIVE
value: {{ .Values.config.profiles | quote }}
{{- range $key, $value := .Values.env }}
- name: {{ $key }}
value: {{ $value }}
{{- end }}
volumeMounts:
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/application-github.properties
subPath: application-github.properties
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/apollo-env.properties
subPath: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/{{ $fileName }}
subPath: {{ $fileName }}
{{- end }}
livenessProbe:
tcpSocket:
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
readinessProbe:
httpGet:
path: {{ .Values.config.contextPath }}/health
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/test/resources/logback-test.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-buildtools/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-buildtools</artifactId>
<name>Apollo BuildTools</name>
<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target</outputDirectory>
<resources>
<resource>
<directory>src/main/scripts</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-buildtools</artifactId>
<name>Apollo BuildTools</name>
<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target</outputDirectory>
<resources>
<resource>
<directory>src/main/scripts</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/assembly/assembly-descriptor.xml | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>apollo-assembly</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<!--scripts -->
<fileSet>
<directory>src/main/scripts</directory>
<outputDirectory>scripts</outputDirectory>
<includes>
<include>*.sh</include>
</includes>
<fileMode>0755</fileMode>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>src/main/config</directory>
<outputDirectory>config</outputDirectory>
<excludes>
<exclude>apollo-configservice.conf</exclude>
<exclude>application-github.properties</exclude>
</excludes>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>src/main/config</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>apollo-configservice.conf</include>
</includes>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>target/classes</directory>
<outputDirectory>/config</outputDirectory>
<includes>
<include>application-github.properties</include>
</includes>
</fileSet>
<!--artifact -->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>${project.artifactId}-*.jar</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
</fileSets>
</assembly>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>apollo-assembly</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<!--scripts -->
<fileSet>
<directory>src/main/scripts</directory>
<outputDirectory>scripts</outputDirectory>
<includes>
<include>*.sh</include>
</includes>
<fileMode>0755</fileMode>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>src/main/config</directory>
<outputDirectory>config</outputDirectory>
<excludes>
<exclude>apollo-configservice.conf</exclude>
<exclude>application-github.properties</exclude>
</excludes>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>src/main/config</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>apollo-configservice.conf</include>
</includes>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>target/classes</directory>
<outputDirectory>/config</outputDirectory>
<includes>
<include>application-github.properties</include>
</includes>
</fileSet>
<!--artifact -->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>${project.artifactId}-*.jar</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
</fileSets>
</assembly>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-demo/src/main/resources/log4j2.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration monitorInterval="60">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="[apollo-demo][%t]%d %-5p [%c] %m%n"/>
</Console>
<Async name="Async" includeLocation="true">
<AppenderRef ref="Console"/>
</Async>
</appenders>
<loggers>
<logger name="com.ctrip.framework.apollo" additivity="false" level="INFO">
<AppenderRef ref="Async"/>
</logger>
<logger name="com.ctrip.framework.apollo.demo" additivity="false" level="DEBUG">
<AppenderRef ref="Async"/>
</logger>
<root level="INFO">
<AppenderRef ref="Async"/>
</root>
</loggers>
</configuration>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration monitorInterval="60">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="[apollo-demo][%t]%d %-5p [%c] %m%n"/>
</Console>
<Async name="Async" includeLocation="true">
<AppenderRef ref="Console"/>
</Async>
</appenders>
<loggers>
<logger name="com.ctrip.framework.apollo" additivity="false" level="INFO">
<AppenderRef ref="Async"/>
</logger>
<logger name="com.ctrip.framework.apollo.demo" additivity="false" level="DEBUG">
<AppenderRef ref="Async"/>
</logger>
<root level="INFO">
<AppenderRef ref="Async"/>
</root>
</loggers>
</configuration>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/yaml/case5.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
batch: 2000
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
batch: 2000
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-adminservice/src/test/resources/logback-test.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-core</artifactId>
<name>Apollo Core</name>
<packaging>jar</packaging>
<properties>
<java.version>1.7</java.version>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- json -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<!-- end of json -->
<!-- util -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<!-- end of util -->
<!-- log -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- end of log -->
<!-- test -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<!-- end of test -->
</dependencies>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-core</artifactId>
<name>Apollo Core</name>
<packaging>jar</packaging>
<properties>
<java.version>1.7</java.version>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- json -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<!-- end of json -->
<!-- util -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<!-- end of util -->
<!-- log -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- end of log -->
<!-- test -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<!-- end of test -->
</dependencies>
</project>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-demo/src/main/resources/spring.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config order="10"/>
<apollo:config namespaces="TEST1.apollo,application.yaml" order="11"/>
<bean class="com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean">
<property name="timeout" value="${timeout:200}"/>
<property name="batch" value="${batch:100}"/>
</bean>
<context:annotation-config />
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config order="10"/>
<apollo:config namespaces="TEST1.apollo,application.yaml" order="11"/>
<bean class="com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean">
<property name="timeout" value="${timeout:200}"/>
<property name="batch" value="${batch:100}"/>
</bean>
<context:annotation-config />
</beans>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/yaml/case4.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
--- # document start
# Comments in YAML look like this.
################
# SCALAR TYPES #
################
# Our root object (which continues for the entire document) will be a map,
# which is equivalent to a dictionary, hash or object in other languages.
key: value
another_key: Another value goes here.
a_number_value: 100
scientific_notation: 1e+12
# The number 1 will be interpreted as a number, not a boolean. if you want
# it to be interpreted as a boolean, use true
boolean: true
null_value: null
key with spaces: value
# Notice that strings don't need to be quoted. However, they can be.
however: 'A string, enclosed in quotes.'
'Keys can be quoted too.': "Useful if you want to put a ':' in your key."
single quotes: 'have ''one'' escape pattern'
double quotes: "have many: \", \0, \t, \u263A, \x0d\x0a == \r\n, and more."
# Multiple-line strings can be written either as a 'literal block' (using |),
# or a 'folded block' (using '>').
literal_block: |
This entire block of text will be the value of the 'literal_block' key,
with line breaks being preserved.
The literal continues until de-dented, and the leading indentation is
stripped.
Any lines that are 'more-indented' keep the rest of their indentation -
these lines will be indented by 4 spaces.
folded_style: >
This entire block of text will be the value of 'folded_style', but this
time, all newlines will be replaced with a single space.
Blank lines, like above, are converted to a newline character.
'More-indented' lines keep their newlines, too -
this text will appear over two lines.
####################
# COLLECTION TYPES #
####################
# Nesting uses indentation. 2 space indent is preferred (but not required).
a_nested_map:
key: value
another_key: Another Value
another_nested_map:
hello: hello
# Maps don't have to have string keys.
0.25: a float key
# Keys can also be complex, like multi-line objects
# We use ? followed by a space to indicate the start of a complex key.
? |
This is a key
that has multiple lines
: and this is its value
# YAML also allows mapping between sequences with the complex key syntax
# Some language parsers might complain
# An example
? - Manchester United
- Real Madrid
: [2001-01-01, 2002-02-02]
# Sequences (equivalent to lists or arrays) look like this
# (note that the '-' counts as indentation):
a_sequence:
- Item 1
- Item 2
- 0.5 # sequences can contain disparate types.
- Item 4
- key: value
another_key: another_value
-
- This is a sequence
- inside another sequence
- - - Nested sequence indicators
- can be collapsed
# Since YAML is a superset of JSON, you can also write JSON-style maps and
# sequences:
json_map: {"key": "value"}
json_seq: [3, 2, 1, "takeoff"]
and quotes are optional: {key: [3, 2, 1, takeoff]}
#######################
# EXTRA YAML FEATURES #
#######################
# YAML also has a handy feature called 'anchors', which let you easily duplicate
# content across your document. Both of these keys will have the same value:
anchored_content: &anchor_name This string will appear as the value of two keys.
other_anchor: *anchor_name
# Anchors can be used to duplicate/inherit properties
base: &base
name: Everyone has same name
# The regexp << is called Merge Key Language-Independent Type. It is used to
# indicate that all the keys of one or more specified maps should be inserted
# into the current map.
foo: &foo
<<: *base
age: 10
bar: &bar
<<: *base
age: 20
# foo and bar would also have name: Everyone has same name
# YAML also has tags, which you can use to explicitly declare types.
explicit_string: !!str 0.5
####################
# EXTRA YAML TYPES #
####################
# Strings and numbers aren't the only scalars that YAML can understand.
# ISO-formatted date and datetime literals are also parsed.
datetime: 2001-12-15T02:59:43.1Z
datetime_with_spaces: 2001-12-14 21:59:43.10 -5
date: 2002-12-14
# YAML also has a set type, which looks like this:
set:
? item1
? item2
? item3
or: {item1, item2, item3}
# Sets are just maps with null values; the above is equivalent to:
set2:
item1: null
item2: null
item3: null
... # document end
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
--- # document start
# Comments in YAML look like this.
################
# SCALAR TYPES #
################
# Our root object (which continues for the entire document) will be a map,
# which is equivalent to a dictionary, hash or object in other languages.
key: value
another_key: Another value goes here.
a_number_value: 100
scientific_notation: 1e+12
# The number 1 will be interpreted as a number, not a boolean. if you want
# it to be interpreted as a boolean, use true
boolean: true
null_value: null
key with spaces: value
# Notice that strings don't need to be quoted. However, they can be.
however: 'A string, enclosed in quotes.'
'Keys can be quoted too.': "Useful if you want to put a ':' in your key."
single quotes: 'have ''one'' escape pattern'
double quotes: "have many: \", \0, \t, \u263A, \x0d\x0a == \r\n, and more."
# Multiple-line strings can be written either as a 'literal block' (using |),
# or a 'folded block' (using '>').
literal_block: |
This entire block of text will be the value of the 'literal_block' key,
with line breaks being preserved.
The literal continues until de-dented, and the leading indentation is
stripped.
Any lines that are 'more-indented' keep the rest of their indentation -
these lines will be indented by 4 spaces.
folded_style: >
This entire block of text will be the value of 'folded_style', but this
time, all newlines will be replaced with a single space.
Blank lines, like above, are converted to a newline character.
'More-indented' lines keep their newlines, too -
this text will appear over two lines.
####################
# COLLECTION TYPES #
####################
# Nesting uses indentation. 2 space indent is preferred (but not required).
a_nested_map:
key: value
another_key: Another Value
another_nested_map:
hello: hello
# Maps don't have to have string keys.
0.25: a float key
# Keys can also be complex, like multi-line objects
# We use ? followed by a space to indicate the start of a complex key.
? |
This is a key
that has multiple lines
: and this is its value
# YAML also allows mapping between sequences with the complex key syntax
# Some language parsers might complain
# An example
? - Manchester United
- Real Madrid
: [2001-01-01, 2002-02-02]
# Sequences (equivalent to lists or arrays) look like this
# (note that the '-' counts as indentation):
a_sequence:
- Item 1
- Item 2
- 0.5 # sequences can contain disparate types.
- Item 4
- key: value
another_key: another_value
-
- This is a sequence
- inside another sequence
- - - Nested sequence indicators
- can be collapsed
# Since YAML is a superset of JSON, you can also write JSON-style maps and
# sequences:
json_map: {"key": "value"}
json_seq: [3, 2, 1, "takeoff"]
and quotes are optional: {key: [3, 2, 1, takeoff]}
#######################
# EXTRA YAML FEATURES #
#######################
# YAML also has a handy feature called 'anchors', which let you easily duplicate
# content across your document. Both of these keys will have the same value:
anchored_content: &anchor_name This string will appear as the value of two keys.
other_anchor: *anchor_name
# Anchors can be used to duplicate/inherit properties
base: &base
name: Everyone has same name
# The regexp << is called Merge Key Language-Independent Type. It is used to
# indicate that all the keys of one or more specified maps should be inserted
# into the current map.
foo: &foo
<<: *base
age: 10
bar: &bar
<<: *base
age: 20
# foo and bar would also have name: Everyone has same name
# YAML also has tags, which you can use to explicitly declare types.
explicit_string: !!str 0.5
####################
# EXTRA YAML TYPES #
####################
# Strings and numbers aren't the only scalars that YAML can understand.
# ISO-formatted date and datetime literals are also parsed.
datetime: 2001-12-15T02:59:43.1Z
datetime_with_spaces: 2001-12-14 21:59:43.10 -5
date: 2002-12-14
# YAML also has a set type, which looks like this:
set:
? item1
? item2
? item3
or: {item1, item2, item3}
# Sets are just maps with null values; the above is equivalent to:
set2:
item1: null
item2: null
item3: null
... # document end
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./.licenserc.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
header:
license:
spdx-id: Apache-2.0
copyright-owner: Apollo Authors
paths-ignore:
- '.github/ISSUE_TEMPLATE'
- '.github/PULL_REQUEST_TEMPLATE'
- '**/.gitignore'
- '**/.helmignore'
- '.gitmodules'
- '.gitattributes'
- '.mvn'
- '**/*.md'
- '**/*.svg'
- '**/*.json'
- '**/*.conf'
- '**/*.ftl'
- '**/*.iml'
- '**/*.tpl'
- '**/*.factories'
- '**/*.handlers'
- '**/*.schemas'
- '**/*.nojekyll'
- 'mvnw'
- 'mvnw.cmd'
- '**/target/**'
- 'LICENSE'
- 'NOTICE'
- 'CNAME'
- '**/resources/META-INF/services/**'
- '**/vendor/**'
- 'apollo-buildtools/src/main/resources/google_checks.xml'
- 'apollo-core/src/test/resources/META-INF/app-with-utf8bom.properties'
- 'apollo-core/src/test/resources/properties/server-with-utf8bom.properties'
comment: on-failure
license-location-threshold: 130
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
header:
license:
spdx-id: Apache-2.0
copyright-owner: Apollo Authors
paths-ignore:
- '.github/ISSUE_TEMPLATE'
- '.github/PULL_REQUEST_TEMPLATE'
- '**/.gitignore'
- '**/.helmignore'
- '.gitmodules'
- '.gitattributes'
- '.mvn'
- '**/*.md'
- '**/*.svg'
- '**/*.json'
- '**/*.conf'
- '**/*.ftl'
- '**/*.iml'
- '**/*.tpl'
- '**/*.factories'
- '**/*.handlers'
- '**/*.schemas'
- '**/*.nojekyll'
- 'mvnw'
- 'mvnw.cmd'
- '**/target/**'
- 'LICENSE'
- 'NOTICE'
- 'CNAME'
- '**/resources/META-INF/services/**'
- '**/vendor/**'
- 'apollo-buildtools/src/main/resources/google_checks.xml'
- 'apollo-core/src/test/resources/META-INF/app-with-utf8bom.properties'
- 'apollo-core/src/test/resources/properties/server-with-utf8bom.properties'
comment: on-failure
license-location-threshold: 130
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-mysql-for-apollo-uat-env.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-uat-env
labels:
app: service-mysql-for-apollo-uat-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-uat-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-uat-env
labels:
app: service-mysql-for-apollo-uat-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-uat-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/log4j2.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration monitorInterval="60">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="[apollo-client][%t]%d %-5p [%c] %m%n"/>
</Console>
<Async name="Async" includeLocation="true">
<AppenderRef ref="Console"/>
</Async>
</appenders>
<loggers>
<logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
<AppenderRef ref="Async" level="WARN"/>
</logger>
<root level="INFO">
<AppenderRef ref="Async"/>
</root>
</loggers>
</configuration>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration monitorInterval="60">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="[apollo-client][%t]%d %-5p [%c] %m%n"/>
</Console>
<Async name="Async" includeLocation="true">
<AppenderRef ref="Console"/>
</Async>
</appenders>
<loggers>
<logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
<AppenderRef ref="Async" level="WARN"/>
</logger>
<root level="INFO">
<AppenderRef ref="Async"/>
</root>
</loggers>
</configuration>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-openapi/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apollo</artifactId>
<groupId>com.ctrip.framework.apollo</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-openapi</artifactId>
<name>Apollo Open Api</name>
<properties>
<java.version>1.7</java.version>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apollo</artifactId>
<groupId>com.ctrip.framework.apollo</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-openapi</artifactId>
<name>Apollo Open Api</name>
<properties>
<java.version>1.7</java.version>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/XmlConfigAnnotationTest2.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config/>
<bean class="com.ctrip.framework.apollo.spring.XMLConfigAnnotationTest.TestApolloConfigBean2"/>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config/>
<bean class="com.ctrip.framework.apollo.spring.XMLConfigAnnotationTest.TestApolloConfigBean2"/>
</beans>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/test/resources/logback-test.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-assembly/src/test/resources/logback-test.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/XmlConfigPlaceholderTest5.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config namespaces="application" order="abc"/>
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config namespaces="application" order="abc"/>
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-assembly/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-assembly</artifactId>
<name>Apollo Assembly</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-configservice</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-adminservice</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-portal</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-assembly</artifactId>
<name>Apollo Assembly</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-configservice</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-adminservice</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-portal</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/yaml/case9.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
!!javax.script.ScriptEngineManager [
!!java.net.URLClassLoader [[
!!java.net.URL ["http://localhost"]
]]
] | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
!!javax.script.ScriptEngineManager [
!!java.net.URLClassLoader [[
!!java.net.URL ["http://localhost"]
]]
] | -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/XmlConfigPlaceholderTest6.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config namespaces="FX.apollo,application"/>
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config namespaces="FX.apollo,application"/>
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| -1 |
apolloconfig/apollo | 3,876 | upgrade version to 1.9.0 | ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-06T11:58:26Z | 2021-08-06T12:42:21Z | cda2d6ccbc815b9379ba85e83f0390ff2c836a54 | 7ede9d85537eb07b0febfb06436455a537c9082b | upgrade version to 1.9.0. ## What's the purpose of this PR
upgrade version to 1.9.0
## Which issue(s) this PR fixes:
## Brief changelog
upgrade version to 1.9.0
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/XmlConfigPlaceholderTest1.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config />
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config />
<bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
<property name="timeout" value="${timeout:100}"/>
<property name="batch" value="${batch:200}"/>
</bean>
</beans>
| -1 |