Skip to content

Commit 4fd696a

Browse files
nikita15pnikita15p
authored
Merge branch 'apache:master' into fix-HBASE-27991 
2 parents 835ef6a + 2fb2ae1 commit 4fd696a

File tree

85 files changed

+1426
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1426
-130
lines changed

‎dev-support/flaky-tests/python-requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
#
1818
requests==2.31.0
1919
future==0.18.3
20-
gitpython==3.1.30
20+
gitpython==3.1.32
2121
rbtools==4.0
2222
jinja2==3.1.2

‎dev-support/git-jira-release-audit/requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
# limitations under the License.
1717
#
1818
blessed==1.17.0
19-
certifi==2022.12.07
19+
certifi==2023.7.22
2020
cffi==1.13.2
2121
chardet==3.0.4
22-
cryptography==41.0.0
22+
cryptography==41.0.3
2323
defusedxml==0.6.0
2424
enlighten==1.4.0
2525
gitdb2==2.0.6
26-
GitPython==3.1.30
26+
GitPython==3.1.32
2727
idna==2.8
2828
jira==2.0.0
2929
oauthlib==3.1.0

‎hbase-annotations/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
33
<!--
44
/**
55
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@
2424
<groupId>org.apache.hbase</groupId>
2525
<artifactId>hbase</artifactId>
2626
<version>${revision}</version>
27-
<relativePath>..</relativePath>
27+
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

3030
<artifactId>hbase-annotations</artifactId>

‎hbase-archetypes/hbase-archetype-builder/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
33
<!--
44
/**
55
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@
2525
<groupId>org.apache.hbase</groupId>
2626
<artifactId>hbase-archetypes</artifactId>
2727
<version>${revision}</version>
28-
<relativePath>..</relativePath>
28+
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

3131
<artifactId>hbase-archetype-builder</artifactId>

‎hbase-archetypes/hbase-client-project/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
33
<!--
44
/**
55
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@
2424
<groupId>org.apache.hbase</groupId>
2525
<artifactId>hbase-archetypes</artifactId>
2626
<version>${revision}</version>
27-
<relativePath>..</relativePath>
27+
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929
<artifactId>hbase-client-project</artifactId>
3030
<packaging>jar</packaging>

‎hbase-archetypes/hbase-shaded-client-project/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
33
<!--
44
/**
55
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@
2424
<groupId>org.apache.hbase</groupId>
2525
<artifactId>hbase-archetypes</artifactId>
2626
<version>${revision}</version>
27-
<relativePath>..</relativePath>
27+
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929
<artifactId>hbase-shaded-client-project</artifactId>
3030
<packaging>jar</packaging>

‎hbase-archetypes/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
33
<!--
44
/**
55
* Licensed to the Apache Software Foundation (ASF) under one

‎hbase-assembly/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
33
<!--
44
/**
55
* Licensed to the Apache Software Foundation (ASF) under one

‎hbase-asyncfs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
33
<!--
44
/**
55
* Licensed to the Apache Software Foundation (ASF) under one

‎hbase-backup/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
33
<!--
44
/**
55
* Licensed to the Apache Software Foundation (ASF) under one

0 commit comments

Comments
 (0)