This is an automated email from the ASF dual-hosted git repository.
jialiang pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
omit 304f56fc6f Merge branch 'upgrade/jdk-spring-dependencies' into trunk
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/trunk (5262967ff6)
\
O -- O -- O (304f56fc6f)
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
Jenkinsfile | 2 +-
ambari-admin/pom.xml | 2 +-
ambari-agent/conf/unix/ambari-env.sh | 1 -
ambari-agent/pom.xml | 6 +-
ambari-funtest/pom.xml | 2 +-
ambari-project/pom.xml | 116 ++++----
ambari-server-spi/pom.xml | 5 -
ambari-server/conf/ambari-env.sh | 1 +
ambari-server/conf/unix/ambari-env.sh | 32 +--
ambari-server/pom.xml | 141 ++++------
.../apache/ambari/annotations/ClusterScale.java | 36 ---
.../ambari/annotations/ConfigurationMarkdown.java | 54 ----
.../server/api/AmbariCsrfProtectionFilter.java | 13 +-
.../server/api/services/ConfigGroupService.java | 2 +
.../server/api/services/ConfigurationService.java | 2 +
.../server/api/services/HostComponentService.java | 2 +
.../ambari/server/api/services/LocalUriInfo.java | 15 +-
.../api/services/RequestScheduleService.java | 2 +
.../api/services/ServiceConfigVersionService.java | 2 +
.../ambari/server/api/services/ServiceService.java | 1 +
.../checks/DatabaseConsistencyCheckHelper.java | 4 +-
.../ambari/server/configuration/Configuration.java | 64 +++--
.../controller/AmbariManagementController.java | 5 -
.../controller/AmbariManagementControllerImpl.java | 10 -
.../ambari/server/controller/AmbariServer.java | 40 ++-
.../internal/BlueprintConfigurationProcessor.java | 23 +-
.../apache/ambari/server/orm/DBAccessorImpl.java | 8 +-
.../server/orm/entities/UpgradeHistoryEntity.java | 2 +-
.../server/scheduler/ExecutionScheduleManager.java | 148 +++--------
.../internal/InternalTokenClientFilter.java | 18 +-
.../org/apache/ambari/server/utils/StageUtils.java | 2 +-
ambari-server/src/main/python/ambari-server.py | 6 -
.../python/ambari_server/serverConfiguration.py | 27 +-
.../src/main/python/ambari_server/serverSetup.py | 28 +-
.../src/main/python/ambari_server_main.py | 14 +-
.../3.0.0/package/scripts/infra_solr.py | 4 +-
.../3.0.0/package/scripts/params.py | 3 +-
.../AMBARI_METRICS/3.0.0/configuration/ams-env.xml | 4 +-
.../3.0.0/configuration/ams-hbase-env.xml | 2 +-
.../services/HIVE/package/scripts/hive_service.py | 2 +-
.../3.2.0/services/HIVE/package/scripts/params.py | 4 +-
.../RANGER/configuration/admin-properties.xml | 1 -
.../services/RANGER/package/scripts/params.py | 3 -
.../RANGER/package/scripts/setup_ranger_xml.py | 3 +-
.../services/RANGER_KMS/package/scripts/kms.py | 2 +-
.../services/RANGER_KMS/package/scripts/params.py | 2 -
.../src/main/resources/version_definition.xsd | 7 -
.../apache/ambari/server/RandomPortJerseyTest.java | 13 +-
.../server/actionmanager/TestActionScheduler.java | 24 +-
.../alerts/AmbariPerformanceRunnableTest.java | 6 +
.../server/api/AmbariCsrfProtectionFilterTest.java | 32 +--
.../ambari/server/api/AmbariErrorHandlerIT.java | 33 ++-
.../server/api/services/BaseRequestTest.java | 6 +-
.../server/api/services/LoggingServiceTest.java | 5 +-
.../server/api/services/PersistServiceTest.java | 74 +++---
.../stackadvisor/StackAdvisorRunnerTest.java | 28 +-
.../commands/StackAdvisorCommandTest.java | 23 +-
.../server/bootstrap/BootStrapResourceTest.java | 59 ++---
.../checks/DatabaseConsistencyCheckHelperTest.java | 2 +-
.../checks/HostsMasterMaintenanceCheckTest.java | 13 +
.../checks/HostsRepositoryVersionCheckTest.java | 45 +++-
.../apache/ambari/server/checks/LZOCheckTest.java | 4 +
.../RequiredServicesInRepositoryCheckTest.java | 5 +
.../checks/ServicesMaintenanceModeCheckTest.java | 18 ++
.../ambari/server/checks/ServicesUpCheckTest.java | 4 +-
.../server/configuration/ConfigurationTest.java | 2 +-
.../AmbariManagementControllerImplTest.java | 16 ++
.../BlueprintConfigurationProcessorTest.java | 18 +-
.../internal/ClientConfigResourceProviderTest.java | 63 ++---
.../GroupPrivilegeResourceProviderTest.java | 2 +-
.../PreUpgradeCheckResourceProviderTest.java | 35 +--
.../RecommendationResourceProviderTest.java | 294 +++++++++++----------
.../RemoteClusterResourceProviderTest.java | 5 +
.../UserAuthorizationResourceProviderTest.java | 2 +-
.../UserPrivilegeResourceProviderTest.java | 2 +-
.../internal/ViewURLResourceProviderTest.java | 5 +
.../logging/LoggingRequestHelperImplTest.java | 4 +-
.../utilities/webserver/StartServer.java | 16 +-
.../ambari/server/proxy/ProxyServiceTest.java | 58 ++--
.../scheduler/ExecutionScheduleManagerTest.java | 19 +-
.../server/scheduler/ExecutionSchedulerTest.java | 106 ++++----
.../AmbariProxiedUserDetailsServiceTest.java | 118 ++++-----
.../authorization/LdapServerPropertiesTest.java | 4 +-
.../security/ldap/AmbariLdapDataPopulatorTest.java | 2 -
.../kerberos/FinalizeKerberosServerActionTest.java | 2 +-
.../upgrade/orchestrate/UpgradeHelperTest.java | 96 +++----
.../ambari/server/state/CheckHelperTest.java | 6 +
.../server/topology/AsyncCallableServiceTest.java | 2 +-
.../server/topology/ConfigureClusterTaskTest.java | 3 -
.../server/topology/TopologyManagerTest.java | 4 +
.../validators/ClusterConfigTypeValidatorTest.java | 4 +-
.../apache/ambari/server/utils/StageUtilsTest.java | 6 +-
ambari-server/src/test/python/TestAmbariServer.py | 1 -
ambari-serviceadvisor/pom.xml | 2 +-
ambari-utility/pom.xml | 8 +-
ambari-views/examples/auto-cluster-view/pom.xml | 6 +-
ambari-views/examples/calculator-view/pom.xml | 4 +-
ambari-views/examples/cluster-view/pom.xml | 4 +-
ambari-views/examples/favorite-view/pom.xml | 4 +-
ambari-views/examples/hello-servlet-view/pom.xml | 4 +-
ambari-views/pom.xml | 8 +-
ambari-web/pom.xml | 2 +-
contrib/ambari-log4j/pom.xml | 20 +-
contrib/fast-hdfs-resource/pom.xml | 1 -
contrib/views/commons/pom.xml | 13 +-
.../ambari/view/commons/hdfs/UploadService.java | 24 +-
contrib/views/files/pom.xml | 6 +-
.../ambari/view/filebrowser/FilebrowserTest.java | 4 +-
contrib/views/pig/pom.xml | 24 +-
contrib/views/utils/pom.xml | 22 +-
contrib/views/wfmanager/pom.xml | 12 +-
.../views/wfmanager/src/main/resources/ui/pom.xml | 2 +-
pom.xml | 8 +-
113 files changed, 1034 insertions(+), 1306 deletions(-)
delete mode 100644
ambari-server/src/main/java/org/apache/ambari/annotations/ClusterScale.java
delete mode 100644
ambari-server/src/main/java/org/apache/ambari/annotations/ConfigurationMarkdown.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
