Skip to content

Commit 51f4757

Browse files
authored
Merge pull request #7 from LeeoTheCoder/fix-leveldbjni
Fix leveldbjni 不支持arm64
2 parents c11e501 + a7e4503 commit 51f4757

File tree

10 files changed

+22
-9
lines changed
  • hadoop-hdfs-project/hadoop-hdfs
  • hadoop-mapreduce-project
  • hadoop-project
  • hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server
    • hadoop-yarn-server-applicationhistoryservice
    • hadoop-yarn-server-common
    • hadoop-yarn-server-nodemanager
    • hadoop-yarn-server-resourcemanager

10 files changed

+22
-9
lines changed

hadoop-hdfs-project/hadoop-hdfs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
202202
<scope>test</scope>
203203
</dependency>
204204
<dependency>
205-
<groupId>org.fusesource.leveldbjni</groupId>
205+
<groupId>${leveldbjni.group}</groupId>
206206
<artifactId>leveldbjni-all</artifactId>
207207
<version>1.8</version>
208208
</dependency>

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<scope>test</scope>
6565
</dependency>
6666
<dependency>
67-
<groupId>org.fusesource.leveldbjni</groupId>
67+
<groupId>${leveldbjni.group}</groupId>
6868
<artifactId>leveldbjni-all</artifactId>
6969
</dependency>
7070
</dependencies>

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<artifactId>hadoop-mapreduce-client-common</artifactId>
4747
</dependency>
4848
<dependency>
49-
<groupId>org.fusesource.leveldbjni</groupId>
49+
<groupId>${leveldbjni.group}</groupId>
5050
<artifactId>leveldbjni-all</artifactId>
5151
</dependency>
5252
</dependencies>

hadoop-mapreduce-project/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<scope>compile</scope>
146146
</dependency>
147147
<dependency>
148-
<groupId>org.fusesource.leveldbjni</groupId>
148+
<groupId>${leveldbjni.group}</groupId>
149149
<artifactId>leveldbjni-all</artifactId>
150150
</dependency>
151151

hadoop-project/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@
904904
</dependency>
905905

906906
<dependency>
907-
<groupId>org.fusesource.leveldbjni</groupId>
907+
<groupId>${leveldbjni.group}</groupId>
908908
<artifactId>leveldbjni-all</artifactId>
909909
<version>1.8</version>
910910
</dependency>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
</dependency>
157157

158158
<dependency>
159-
<groupId>org.fusesource.leveldbjni</groupId>
159+
<groupId>${leveldbjni.group}</groupId>
160160
<artifactId>leveldbjni-all</artifactId>
161161
</dependency>
162162

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</exclusions>
9898
</dependency>
9999
<dependency>
100-
<groupId>org.fusesource.leveldbjni</groupId>
100+
<groupId>${leveldbjni.group}</groupId>
101101
<artifactId>leveldbjni-all</artifactId>
102102
</dependency>
103103
</dependencies>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
<artifactId>hadoop-yarn-server-common</artifactId>
162162
</dependency>
163163
<dependency>
164-
<groupId>org.fusesource.leveldbjni</groupId>
164+
<groupId>${leveldbjni.group}</groupId>
165165
<artifactId>leveldbjni-all</artifactId>
166166
</dependency>
167167
</dependencies>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
<artifactId>zookeeper</artifactId>
180180
</dependency>
181181
<dependency>
182-
<groupId>org.fusesource.leveldbjni</groupId>
182+
<groupId>${leveldbjni.group}</groupId>
183183
<artifactId>leveldbjni-all</artifactId>
184184
</dependency>
185185
<dependency>

pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
102102
<wagon-ssh.version>1.0</wagon-ssh.version>
103103
<maven-clover2-plugin.version>3.3.0</maven-clover2-plugin.version>
104104
<maven-bundle-plugin.version>2.5.0</maven-bundle-plugin.version>
105+
<leveldbjni.group>org.fusesource.leveldbjni</leveldbjni.group>
105106
</properties>
106107

107108
<modules>
@@ -508,5 +509,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
508509
</plugins>
509510
</build>
510511
</profile>
512+
<profile>
513+
<id>aarch64</id>
514+
<properties>
515+
<leveldbjni.group>org.openlabtesting.leveldbjni</leveldbjni.group>
516+
</properties>
517+
<activation>
518+
<os>
519+
<family>linux</family>
520+
<arch>aarch64</arch>
521+
</os>
522+
</activation>
523+
</profile>
511524
</profiles>
512525
</project>

0 commit comments

Comments
 (0)