diff --git a/DBIx-Safe-1.2.5.tar.gz b/DBIx-Safe-1.2.5.tar.gz deleted file mode 100644 index 9ab629b5876ba986a3562a8f4811f915c875bd03..0000000000000000000000000000000000000000 Binary files a/DBIx-Safe-1.2.5.tar.gz and /dev/null differ diff --git a/ambari.spec b/ambari.spec new file mode 100644 index 0000000000000000000000000000000000000000..1199ca3b4b138661558753a95470cf0716ec9af7 --- /dev/null +++ b/ambari.spec @@ -0,0 +1,36 @@ +Summary: A complex directed-acyclic-graph of tasks for processing data. +Name: ambari +Version: 2.7.6 +Release: 1 +License: Apache License v2.0 +URL: https://ambari.apache.org/ +# Source0: https://github.com/apache/ambari/archive/refs/tags/release-2.7.6.tar.gz +Source0: release-2.7.6.tar.gz +Patch0: ambari_fix.patch + +%global debug_package %{nil} + +BuildRequires: maven java-1.8.0-openjdk java-1.8.0-openjdk-devel +Requires: java-1.8.0-openjdk python3-devel +BuildArch: x86_64 aarch64 + +%description +Apache Ambari is a tool for provisioning, managing, and monitoring Apache Hadoop clusters. + +%prep +%autosetup -p1 -n %{name}-release-%{version} + +%build +mvn clean install -DskipTests -Drat.skip -nsu -Dsim + +%install +mkdir -p %{buildroot}/opt/%{name}-release-%{version} +cp -rf ../%{name}-release-%{version} %{buildroot}/opt/%{name}-release-%{version} +exit 0 + +%files +/opt/%{name}-release-%{version} + +%changelog +* Fri Dec 3 2021 PengLei - 2.7.0-1 +- Init package diff --git a/ambari.yaml b/ambari.yaml new file mode 100644 index 0000000000000000000000000000000000000000..3aa829c95b4e56a91558cb656900d8606652366f --- /dev/null +++ b/ambari.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: apache/ambari +tag_prefix: "release-" +separator: "." diff --git a/ambari_fix.patch b/ambari_fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..29f2b0156fe8826aeb1f9794b13136ea71748262 --- /dev/null +++ b/ambari_fix.patch @@ -0,0 +1,905 @@ +diff -uprN ambari-release-2.7.6/ambari-admin/pom.xml ambari-release-2.7.6-test/ambari-admin/pom.xml +--- ambari-release-2.7.6/ambari-admin/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-admin/pom.xml 2021-12-13 07:53:54.531306050 +0000 +@@ -61,9 +61,10 @@ + + com.github.eirslett + frontend-maven-plugin +- 1.4 +- +- v4.5.0 ++ ${frontend-maven-plugin.version} ++ ++ ${ambari.web.skip} ++ v4.5.0 + v0.23.2 + src/main/resources/ui/admin-web/ + false +@@ -104,7 +105,8 @@ + exec + + +- ${basedir}/src/main/resources/ui/admin-web ++ ${ambari.web.skip} ++ ${basedir}/src/main/resources/ui/admin-web + ${basedir}/src/main/resources/ui/admin-web/node/${executable.node} + + ${basedir}/src/main/resources/ui/admin-web/node_modules/bower/bin/bower +@@ -120,7 +122,8 @@ + exec + + +- ${basedir}/src/main/resources/ui/admin-web ++ ${ambari.web.skip} ++ ${basedir}/src/main/resources/ui/admin-web + ${basedir}/src/main/resources/ui/admin-web/node/${executable.node} + + ${basedir}/src/main/resources/ui/admin-web/node_modules/gulp/bin/gulp +@@ -135,7 +138,8 @@ + exec + + +- ++ ${ambari.web.skip} ++ + ${executable.shell} + ${basedir} + ${args.shell} ${basedir}${dirsep}set-ambari-version.${fileextension.shell} ${ambariVersion} +@@ -149,7 +153,8 @@ + exec + + +- ${basedir}/src/main/resources/ui/admin-web ++ ${ambari.web.skip} ++ ${basedir}/src/main/resources/ui/admin-web + npm + + run +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py 2021-12-13 07:53:54.531306050 +0000 +@@ -143,7 +143,7 @@ class AmbariConfig: + else: + raise Exception("No config found at {0}, use default".format(configPath)) + +- except Exception, err: ++ except Exception as err: + logger.warn(err) + setattr(cls, "_conf_cache", config) + return config +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/Controller.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/Controller.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/Controller.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/Controller.py 2021-12-13 07:53:54.531306050 +0000 +@@ -269,7 +269,7 @@ class Controller(threading.Thread): + if commands: + try: + self.actionQueue.cancel(commands) +- except Exception, err: ++ except Exception as err: + logger.error("Exception occurred on commands cancel: %s", err.message) + + def addToQueue(self, commands): +@@ -476,7 +476,7 @@ class Controller(threading.Thread): + self.isRegistered = False + logger.exception("SSLError while trying to heartbeat.") + return +- except Exception, err: ++ except Exception as err: + if "code" in err: + logger.error(err.code) + else: +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/Facter.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/Facter.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/Facter.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/Facter.py 2021-12-13 07:53:54.531306050 +0000 +@@ -72,7 +72,7 @@ class Facter(object): + else: + raise Exception("No config found, use default") + +- except Exception, err: ++ except Exception as err: + log.warn(err) + return config + +@@ -495,7 +495,7 @@ class FacterLinux(Facter): + 0x8915, # SIOCGIFADDR + struct.pack('256s', ifname[:15]) + )[20:24]) +- except Exception, err: ++ except Exception as err: + log.warn("Can't get the IP address for {0}".format(ifname)) + + return ip_address_by_ifname +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/HostCheckReportFileHandler.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/HostCheckReportFileHandler.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/HostCheckReportFileHandler.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/HostCheckReportFileHandler.py 2021-12-13 07:53:54.531306050 +0000 +@@ -54,7 +54,7 @@ class HostCheckReportFileHandler: + else: + raise Exception("No config found, use default") + +- except Exception, err: ++ except Exception as err: + logger.warn(err) + return config + +@@ -83,7 +83,7 @@ class HostCheckReportFileHandler: + self.touchFile(self.hostCheckCustomActionsFilePath) + with open(self.hostCheckCustomActionsFilePath, 'wb') as configfile: + config.write(configfile) +- except Exception, err: ++ except Exception as err: + logger.error("Can't write host check file at %s :%s " % (self.hostCheckCustomActionsFilePath, err.message)) + traceback.print_exc() + +@@ -168,7 +168,7 @@ class HostCheckReportFileHandler: + self.touchFile(self.hostCheckFilePath) + with open(self.hostCheckFilePath, 'wb') as configfile: + config.write(configfile) +- except Exception, err: ++ except Exception as err: + logger.error("Can't write host check file at %s :%s " % (self.hostCheckFilePath, err.message)) + traceback.print_exc() + +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/HostCleanup.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/HostCleanup.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/HostCleanup.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/HostCleanup.py 2021-12-13 07:53:54.531306050 +0000 +@@ -115,7 +115,7 @@ class HostCleanup: + else: + raise Exception("No config found, use default") + +- except Exception, err: ++ except Exception as err: + logger.warn(err) + return config + +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/hostname.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/hostname.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/hostname.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/hostname.py 2021-12-13 07:53:54.531306050 +0000 +@@ -122,7 +122,7 @@ def server_hostnames(config): + if (0 == osStat.returncode and 0 != len(out.strip())): + cached_server_hostnames = arrayFromCsvString(out) + logger.info("Read server hostname '" + cached_server_hostnames + "' using server:hostname_script") +- except Exception, err: ++ except Exception as err: + logger.info("Unable to execute hostname_script for server hostname. " + str(err)) + + if not cached_server_hostnames: +diff -uprN ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/main.py ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/main.py +--- ambari-release-2.7.6/ambari-agent/src/main/python/ambari_agent/main.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-agent/src/main/python/ambari_agent/main.py 2021-12-13 07:53:54.531306050 +0000 +@@ -193,7 +193,7 @@ def update_log_level(config): + logging.basicConfig(format=formatstr, level=logging.INFO, filename=AmbariConfig.AmbariConfig.getLogFile()) + logger.setLevel(logging.INFO) + logger.debug("Newloglevel=logging.INFO") +- except Exception, err: ++ except Exception as err: + logger.info("Default loglevel=DEBUG") + + +@@ -212,7 +212,7 @@ def resolve_ambari_config(): + else: + raise Exception("No config found at {0}, use default".format(configPath)) + +- except Exception, err: ++ except Exception as err: + logger.warn(err) + + def check_sudo(): +@@ -310,7 +310,7 @@ def stop_agent(): + time.sleep(GRACEFUL_STOP_TRIES_SLEEP) + logger.info("Agent not going to die gracefully, going to execute kill -9") + raise Exception("Agent is running") +- except Exception, err: ++ except Exception as err: + #raise + if pid == -1: + print ("Agent process is not running") +@@ -345,7 +345,7 @@ def reset_agent(options): + os.remove(os.path.join(root, name)) + for name in dirs: + os.rmdir(os.path.join(root, name)) +- except Exception, err: ++ except Exception as err: + print("A problem occurred while trying to reset the agent: " + str(err)) + sys.exit(1) + +diff -uprN ambari-release-2.7.6/ambari-common/src/main/unix/ambari-python-wrap ambari-release-2.7.6-test/ambari-common/src/main/unix/ambari-python-wrap +--- ambari-release-2.7.6/ambari-common/src/main/unix/ambari-python-wrap 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-common/src/main/unix/ambari-python-wrap 2021-12-13 07:53:54.531306050 +0000 +@@ -17,7 +17,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-export PYTHONPATH=/usr/lib/python2.6/site-packages:/usr/lib/python2.6/site-packages/ambari_commons:$PYTHONPATH ++export PYTHONPATH=/usr/lib/python3.8/site-packages:/usr/lib/python3.8/site-packages/ambari_commons:$PYTHONPATH + + # checking for default Python 2 + if [ -a /usr/bin/python2 ] && [ -z "$PYTHON" ]; then +diff -uprN ambari-release-2.7.6/ambari-infra/pom.xml ambari-release-2.7.6-test/ambari-infra/pom.xml +--- ambari-release-2.7.6/ambari-infra/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-infra/pom.xml 2021-12-13 07:53:54.531306050 +0000 +@@ -33,7 +33,7 @@ + ${deb.python.ver} + 3.0.0 + -Xmx1024m -Xms512m +- 3.4.6.2.3.0.0-2557 ++ 3.4.6 + false + 2.11.0 + +@@ -54,46 +54,6 @@ + https://issues.apache.org/jira/browse/AMBARI + + +- +- +- apache-hadoop +- hdp +- https://repo.hortonworks.com/content/groups/public/ +- +- +- oss.sonatype.org +- OSS Sonatype Staging +- https://oss.sonatype.org/content/groups/staging +- +- +- spring-milestones +- Spring Milestones +- https://repo.spring.io/milestone +- +- false +- +- +- +- ASF Staging +- https://repository.apache.org/content/groups/staging/ +- +- +- ASF Snapshots +- https://repository.apache.org/content/repositories/snapshots/ +- +- true +- +- +- false +- +- +- +- maven-restlet +- Public online Restlet repository +- https://maven.restlet.com +- +- +- + + ambari-infra-assembly + ambari-infra-solr-client +diff -uprN ambari-release-2.7.6/ambari-logsearch/ambari-logsearch-server/pom.xml ambari-release-2.7.6-test/ambari-logsearch/ambari-logsearch-server/pom.xml +--- ambari-release-2.7.6/ambari-logsearch/ambari-logsearch-server/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-logsearch/ambari-logsearch-server/pom.xml 2021-12-13 07:53:54.531306050 +0000 +@@ -124,7 +124,10 @@ + org.apache.maven.plugins + maven-antrun-plugin + 1.7 +- ++ ++ ${ambari.web.skip} ++ ++ + + package + +diff -uprN ambari-release-2.7.6/ambari-logsearch/ambari-logsearch-web/pom.xml ambari-release-2.7.6-test/ambari-logsearch/ambari-logsearch-web/pom.xml +--- ambari-release-2.7.6/ambari-logsearch/ambari-logsearch-web/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-logsearch/ambari-logsearch-web/pom.xml 2021-12-13 07:53:54.531306050 +0000 +@@ -38,9 +38,10 @@ + + com.github.eirslett + frontend-maven-plugin +- 1.6 +- +- ${node.version} ++ ${frontend-maven-plugin.version} ++ ++ ${ambari.web.skip} ++ ${node.version} + ${yarn.version} + ${project.build.directory}/webapp-build + false +@@ -57,6 +58,9 @@ + + install-node-and-yarn + ++ ++ ${ambari.web.skip} ++ + + + yarn install +@@ -65,7 +69,8 @@ + yarn + + +- install --ignore-engines --pure-lockfile ++ ${ambari.web.skip} ++ install --ignore-engines --pure-lockfile + + + +@@ -76,7 +81,8 @@ + + generate-resources + +- ++ ${ambari.web.skip} ++ + production + + ++ true ++ ++ ++ + +diff -uprN ambari-release-2.7.6/ambari-metrics/ambari-metrics-assembly/pom.xml ambari-release-2.7.6-test/ambari-metrics/ambari-metrics-assembly/pom.xml +--- ambari-release-2.7.6/ambari-metrics/ambari-metrics-assembly/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-metrics/ambari-metrics-assembly/pom.xml 2021-12-13 08:03:15.878729935 +0000 +@@ -39,7 +39,6 @@ + ${project.basedir}/../ambari-metrics-grafana + ${project.basedir}/../ambari-metrics-hadoop-sink + ${project.basedir}/../ambari-metrics-storm-sink +- ${project.basedir}/../ambari-metrics-storm-sink-legacy + ${project.basedir}/../ambari-metrics-flume-sink + ${project.basedir}/../ambari-metrics-kafka-sink + python >= 2.6 +@@ -53,7 +52,6 @@ + ${deb.python.ver},python-dev,gcc + ambari-metrics-hadoop-sink-with-common-${project.version}.jar + ambari-metrics-storm-sink-with-common-${project.version}.jar +- ambari-metrics-storm-sink-legacy-with-common-${project.version}.jar + ambari-metrics-flume-sink-with-common-${project.version}.jar + ambari-metrics-kafka-sink-with-common-${project.version}.jar + +@@ -485,14 +483,6 @@ + + + +- /usr/lib/storm/lib +- +- +- ${storm-sink-legacy.dir}/target/ambari-metrics-storm-sink-legacy-with-common-${project.version}.jar +- +- +- +- + /usr/lib/ambari-metrics-kafka-sink + + +@@ -1460,11 +1450,6 @@ + ${project.version} + + +- org.apache.ambari +- ambari-metrics-storm-sink-legacy +- ${project.version} +- +- + org.apache.ambari + ambari-metrics-kafka-sink + ${project.version} +diff -uprN ambari-release-2.7.6/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink-windows.xml ambari-release-2.7.6-test/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink-windows.xml +--- ambari-release-2.7.6/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink-windows.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink-windows.xml 2021-12-13 08:03:45.331118782 +0000 +@@ -62,10 +62,6 @@ + hadoop-sink + + +- ${storm-sink-legacy.dir}/target/ambari-metrics-storm-sink-legacy-with-common-${project.version}.jar +- hadoop-sink +- +- + ${kafka-sink.dir}/target/ambari-metrics-kafka-sink-with-common-${project.version}.jar + hadoop-sink + +diff -uprN ambari-release-2.7.6/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml ambari-release-2.7.6-test/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml +--- ambari-release-2.7.6/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml 2021-12-13 08:03:32.546950003 +0000 +@@ -66,11 +66,6 @@ + + + 644 +- ${storm-sink-legacy.dir}/target/ambari-metrics-storm-sink-legacy-with-common-${project.version}.jar +- hadoop-sink +- +- +- 644 + ${kafka-sink.dir}/target/ambari-metrics-kafka-sink-with-common-${project.version}.jar + hadoop-sink + +diff -uprN ambari-release-2.7.6/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml ambari-release-2.7.6-test/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml +--- ambari-release-2.7.6/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml 2021-12-13 07:53:54.531306050 +0000 +@@ -32,7 +32,7 @@ limitations under the License. + + + +- 0.10.0.2.3.0.0-2557 ++ 0.10.0 + + + +diff -uprN ambari-release-2.7.6/ambari-metrics/ambari-metrics-timelineservice/pom.xml ambari-release-2.7.6-test/ambari-metrics/ambari-metrics-timelineservice/pom.xml +--- ambari-release-2.7.6/ambari-metrics/ambari-metrics-timelineservice/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-metrics/ambari-metrics-timelineservice/pom.xml 2021-12-13 07:55:50.920847980 +0000 +@@ -322,7 +322,7 @@ + + org.apache.zookeeper + zookeeper +- 3.4.5.1.3.0.0-107 ++ 3.4.5 + + + jline +diff -uprN ambari-release-2.7.6/ambari-metrics/pom.xml ambari-release-2.7.6-test/ambari-metrics/pom.xml +--- ambari-release-2.7.6/ambari-metrics/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-metrics/pom.xml 2021-12-13 09:02:54.056764637 +0000 +@@ -28,7 +28,6 @@ + ambari-metrics-flume-sink + ambari-metrics-kafka-sink + ambari-metrics-storm-sink +- ambari-metrics-storm-sink-legacy + ambari-metrics-timelineservice + ambari-metrics-host-monitoring + ambari-metrics-grafana +@@ -53,10 +52,10 @@ + 1.6.2 + apache.snapshots.https + Apache Development Snapshot Repository +- https://repository.apache.org/content/repositories/snapshots ++ ~/.m2/repository + apache.staging.https + Apache Release Distribution Repository +- https://repository.apache.org/service/local/staging/deploy/maven2 ++ ~/.m2/repository + 2.10.0 + 2.10.0 + +@@ -72,18 +71,6 @@ + ${distMgmtSnapshotsUrl} + + +- +- +- apache-hadoop +- hdp +- https://repo.hortonworks.com/content/groups/public/ +- +- +- apache-snapshots +- snapshots +- https://repository.apache.org/content/repositories/snapshots +- +- + + + +diff -uprN ambari-release-2.7.6/ambari-project/pom.xml ambari-release-2.7.6-test/ambari-project/pom.xml +--- ambari-release-2.7.6/ambari-project/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-project/pom.xml 2021-12-13 07:53:54.531306050 +0000 +@@ -30,6 +30,8 @@ + + 5.5.2 + ${project.parent.basedir} ++ ${skipTests} ++ 1.10.0 + 1.6.3 + 9.4.12.v20180830 + 1.0.0 +@@ -84,6 +86,18 @@ + + + ++ ++ non-x86_64 ++ ++ ++ !amd64 ++ ++ ++ ++ ++ true ++ ++ + + + +diff -uprN ambari-release-2.7.6/ambari-server/src/main/python/ambari_server/resourceFilesKeeper.py ambari-release-2.7.6-test/ambari-server/src/main/python/ambari_server/resourceFilesKeeper.py +--- ambari-release-2.7.6/ambari-server/src/main/python/ambari_server/resourceFilesKeeper.py 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-server/src/main/python/ambari_server/resourceFilesKeeper.py 2021-12-13 07:53:54.531306050 +0000 +@@ -145,7 +145,7 @@ class ResourceFilesKeeper(): + """ + try: + return self._list_metainfo_dirs(root_dir) +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not list stacks: {0}".format(str(err))) + + def list_common_services(self, root_dir): +@@ -154,7 +154,7 @@ class ResourceFilesKeeper(): + """ + try: + return self._list_metainfo_dirs(root_dir) +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not list common services: {0}".format(str(err))) + + def list_extensions(self, root_dir): +@@ -163,7 +163,7 @@ class ResourceFilesKeeper(): + """ + try: + return self._list_metainfo_dirs(root_dir) +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not list extensions: {0}".format(str(err))) + + def update_directory_archive(self, directory): +@@ -217,7 +217,7 @@ class ResourceFilesKeeper(): + break + sha1.update(data) + return sha1.hexdigest() +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not calculate directory " + "hash: {0}".format(str(err))) + +@@ -232,7 +232,7 @@ class ResourceFilesKeeper(): + try: + with open(hash_file) as fh: + return fh.readline().strip() +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not read file {0} : {1}".format(hash_file, + str(err))) + else: +@@ -249,7 +249,7 @@ class ResourceFilesKeeper(): + with open(hash_file, "w") as fh: + fh.write(new_hash) + os.chmod(hash_file, 0o644) +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not write to file {0} : {1}".format(hash_file, + str(err))) + +@@ -279,7 +279,7 @@ class ResourceFilesKeeper(): + zf.write(absname, arcname) + zf.close() + os.chmod(zip_file_path, 0o755) +- except Exception, err: ++ except Exception as err: + raise KeeperException("Can not create zip archive of " + "directory {0} : {1}".format(directory, str(err))) + +@@ -296,7 +296,7 @@ class ResourceFilesKeeper(): + if self.DEBUG: + sys.stderr.write("{0}\n".format(text)) + if not self.DEBUG and self.verbose: +- print text ++ print(text) + + + def main(argv=None): +diff -uprN ambari-release-2.7.6/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProviderTest.java ambari-release-2.7.6-test/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProviderTest.java +--- ambari-release-2.7.6/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProviderTest.java 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProviderTest.java 2021-12-13 07:53:54.531306050 +0000 +@@ -531,7 +531,7 @@ public class RootServiceComponentConfigu + expect(configuration.isMasterKeyPersisted()).andReturn(false).once(); + expect(configuration.getMasterKeyStoreLocation()).andReturn(masterKeyStoreLocation).once(); + CredentialProvider credentialProvider = PowerMock.createMock(CredentialProvider.class); +- PowerMock.expectNew(CredentialProvider.class, null, null, masterKeyLocation, false, masterKeyStoreLocation, null).andReturn(credentialProvider); ++ PowerMock.expectNew(CredentialProvider.class, null, null, masterKeyLocation, false, masterKeyStoreLocation).andReturn(credentialProvider); + credentialProvider.addAliasToCredentialStore("currentPasswd", "newPasswd"); + PowerMock.expectLastCall().once(); + PowerMock.replay(credentialProvider, CredentialProvider.class); +@@ -631,4 +631,4 @@ public class RootServiceComponentConfigu + } + }); + } +-} +\ No newline at end of file ++} +diff -uprN ambari-release-2.7.6/ambari-server/src/test/java/org/apache/ambari/server/utils/PasswordUtilsTest.java ambari-release-2.7.6-test/ambari-server/src/test/java/org/apache/ambari/server/utils/PasswordUtilsTest.java +--- ambari-release-2.7.6/ambari-server/src/test/java/org/apache/ambari/server/utils/PasswordUtilsTest.java 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-server/src/test/java/org/apache/ambari/server/utils/PasswordUtilsTest.java 2021-12-13 07:53:54.531306050 +0000 +@@ -124,7 +124,7 @@ public class PasswordUtilsTest extends E + expect(configuration.getMasterKeyLocation()).andReturn(masterKeyLocation).once(); + expect(configuration.isMasterKeyPersisted()).andReturn(false).once(); + expect(configuration.getMasterKeyStoreLocation()).andReturn(masterKeyStoreLocation).once(); +- PowerMock.expectNew(CredentialProvider.class, null, null, masterKeyLocation, false, masterKeyStoreLocation, null).andReturn(credentialProvider); ++ PowerMock.expectNew(CredentialProvider.class, null, null, masterKeyLocation, false, masterKeyStoreLocation).andReturn(credentialProvider); + } + + private Injector createInjector() { +diff -uprN ambari-release-2.7.6/ambari-web/pom.xml ambari-release-2.7.6-test/ambari-web/pom.xml +--- ambari-release-2.7.6/ambari-web/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/ambari-web/pom.xml 2021-12-13 07:53:54.531306050 +0000 +@@ -90,9 +90,10 @@ + + com.github.eirslett + frontend-maven-plugin +- 1.4 +- +- v4.5.0 ++ ${frontend-maven-plugin.version} ++ ++ ${ambari.web.skip} ++ v4.5.0 + v0.23.2 + ${basedir} + false +@@ -108,7 +109,10 @@ + generate-sources + + install-node-and-yarn +- ++ ++ ++ ${ambari.web.skip} ++ + + + yarn install +@@ -117,7 +121,8 @@ + yarn + + +- install --ignore-engines --pure-lockfile ++ ${ambari.web.skip} ++ install --ignore-engines --pure-lockfile + + + +@@ -134,7 +139,8 @@ + exec + + +- ${executable.rmdir} ++ ${ambari.web.skip} ++ ${executable.rmdir} + ${basedir} + ${args.rm.clean} public ${nodemodules.dir} + +@@ -151,7 +157,8 @@ + exec + + +- ${executable.mkdir} ++ ${ambari.web.skip} ++ ${executable.mkdir} + ${basedir} + ${args.mkdir} public + +@@ -163,7 +170,8 @@ + exec + + +- ${basedir} ++ ${ambari.web.skip} ++ ${basedir} + ${basedir}/node/${node.executable} + + node_modules/brunch/bin/brunch +@@ -178,7 +186,8 @@ + exec + + +- ++ ${ambari.web.skip} ++ + ${executable.shell} + ${basedir} + ${args.shell} ${basedir}${dirsep}set-ambari-version.${fileextension.shell} ${ambariVersion} +@@ -217,8 +226,8 @@ + exec + + +- ${skipTests} +- ${executable.npm} ++ ${ambari.web.skip} ++ ${executable.npm} + ${basedir} + ${args.npm} test + +@@ -237,7 +246,8 @@ + run + + +- ++ ${ambari.web.skip} ++ + + + +diff -uprN ambari-release-2.7.6/pom.xml ambari-release-2.7.6-test/pom.xml +--- ambari-release-2.7.6/pom.xml 2021-11-11 12:07:58.000000000 +0000 ++++ ambari-release-2.7.6-test/pom.xml 2021-12-13 09:02:01.116077116 +0000 +@@ -56,94 +56,13 @@ + UTF-8 + apache.snapshots.https + Apache Development Snapshot Repository +- https://repository.apache.org/content/repositories/snapshots ++ ~/.m2/repository + apache.staging.https + Apache Release Distribution Repository +- https://repository.apache.org/service/local/staging/deploy/maven2 ++ ~/.m2/repository + package + 2.6.2 + +- +- +- maven2-repository.dev.java.net +- Java.net Repository for Maven +- https://download.java.net/maven/2/ +- default +- +- +- maven2-glassfish-repository.dev.java.net +- Java.net Repository for Maven +- https://download.java.net/maven/glassfish/ +- +- +- maven2-repository.atlassian +- Atlassian Maven Repository +- https://maven.atlassian.com/repository/public +- default +- +- +- ${distMgmtSnapshotsId} +- ${distMgmtSnapshotsName} +- ${distMgmtSnapshotsUrl} +- default +- +- +- +- +- +- ${distMgmtStagingId} +- ${distMgmtStagingName} +- ${distMgmtStagingUrl} +- +- +- ${distMgmtSnapshotsId} +- ${distMgmtSnapshotsName} +- ${distMgmtSnapshotsUrl} +- +- +- +- +- +- oss.sonatype.org +- OSS Sonatype Staging +- https://oss.sonatype.org/content/groups/staging +- +- +- spring-milestones +- Spring Milestones +- https://repo.spring.io/milestone +- +- false +- +- +- +- ASF Staging +- https://repository.apache.org/content/groups/staging/ +- +- +- ASF Snapshots +- https://repository.apache.org/content/repositories/snapshots/ +- +- true +- +- +- false +- +- +- +- +- private-nexus +- private-nexus +- https://nexus-private.hortonworks.com/nexus/content/groups/public/ +- +- true +- +- +- true +- +- +- +- + + + diff --git a/perl-DBIx-Safe.spec b/perl-DBIx-Safe.spec deleted file mode 100644 index 343c727a8336803f9d4a7a063f2a383531df3c97..0000000000000000000000000000000000000000 --- a/perl-DBIx-Safe.spec +++ /dev/null @@ -1,87 +0,0 @@ -%global _empty_manifest_terminate_build 0 -Name: perl-DBIx-Safe -Version: 1.2.5 -Release: 1 -Summary: Safer access to your database through a DBI database handle -License: BSD -Group: Development/Libraries -URL: https://metacpan.org/release/DBIx-Safe/ -Source0: https://cpan.metacpan.org/authors/id/T/TU/TURNSTEP/DBIx-Safe-%{version}.tar.gz -BuildArch: noarch -BuildRequires: perl-generators -BuildRequires: perl(DBD::Pg) >= 1.49 -BuildRequires: perl(DBI) >= 1.49 -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Module::Signature) >= 0.50 -BuildRequires: perl(Test::Dynamic) >= 1.3.1 -BuildRequires: perl(Test::Harness) >= 2.03 -BuildRequires: perl(Test::More) >= 0.61 -Requires: perl(DBD::Pg) >= 1.49 -Requires: perl(DBI) >= 1.49 -Requires: perl(Test::Dynamic) >= 1.3.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -%description -The purpose of this module is to give controlled, limited access to an -application, rather than simply passing it a raw database handle through -DBI. DBIx::Safe acts as a wrapper to the database, by only allowing through -the commands you tell it to. It filters all things related to the database -handle - methods and attributes. -%package help -Summary : Safer access to your database through a DBI database handle -Provides: perl-DBIx-Safe-doc -%description help -The purpose of this module is to give controlled, limited access to an -application, rather than simply passing it a raw database handle through -DBI. DBIx::Safe acts as a wrapper to the database, by only allowing through -the commands you tell it to. It filters all things related to the database -handle - methods and attributes. -%prep -%setup -q -n DBIx-Safe-%{version} -%build -export PERL_MM_OPT="" -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} - -%install -export PERL_MM_OPT="" -rm -rf $RPM_BUILD_ROOT - -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; - -%{_fixperms} $RPM_BUILD_ROOT/* - -pushd %{buildroot} -touch filelist.lst -if [ -d usr/bin ];then - find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst -fi -if [ -d usr/sbin ];then - find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst -fi -if [ -d usr/lib64 ];then - find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst -fi -if [ -d usr/lib ];then - find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst -fi -popd -mv %{buildroot}/filelist.lst . -%check -make test - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f filelist.lst -%defattr(-,root,root,-) -%doc Changes LICENSE README Safe.pm.html TODO -%{perl_vendorlib}/* -%files help -%{_mandir}/* - -%changelog -* Mon Mar 08 2021 Perl_Bot 1.2.5-1 -- Specfile autogenerated by Perl_Bot diff --git a/perl-DBIx-Safe.yaml b/perl-DBIx-Safe.yaml deleted file mode 100644 index eafb73fdbbb46f7dcd71dade468c9de2dc758744..0000000000000000000000000000000000000000 --- a/perl-DBIx-Safe.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: metacpan -src_repo: DBIx-Safe -tag_prefix: "^" -separator: "." diff --git a/release-2.7.6.tar.gz b/release-2.7.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..54954dd8187589d4b71522942d50e074bc53defb Binary files /dev/null and b/release-2.7.6.tar.gz differ