Skip to content

Commit 11318ee

Browse files
authored
HDDS-12188. Move server-only upgrade classes from hdds-common to hdds-server-framework (apache#7903)
1 parent 2598941 commit 11318ee

26 files changed

+63
-2
lines changed

hadoop-hdds/container-service/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,12 @@
213213
<type>test-jar</type>
214214
<scope>test</scope>
215215
</dependency>
216+
<dependency>
217+
<groupId>org.apache.ozone</groupId>
218+
<artifactId>hdds-server-framework</artifactId>
219+
<type>test-jar</type>
220+
<scope>test</scope>
221+
</dependency>
216222
<dependency>
217223
<groupId>org.apache.ozone</groupId>
218224
<artifactId>hdds-test-utils</artifactId>

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/freon/package-info.java hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/upgrade/package-info.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
*/
1717

1818
/**
19-
* Freon related helper classes used for load testing.
19+
* This package contains SCM Upgrade related classes.
2020
*/
21-
package org.apache.hadoop.hdds.freon;
21+
package org.apache.hadoop.hdds.upgrade;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
/**
19+
* This package contains classes for the Ozone upgrade and layout version
20+
* management.
21+
*/
22+
package org.apache.hadoop.ozone.upgrade;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
/**
19+
* Ozone related test helper classes and tests of common utils.
20+
*/
21+
package org.apache.hadoop.ozone;

hadoop-hdds/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,12 @@
145145
<artifactId>hdds-server-framework</artifactId>
146146
<version>${hdds.version}</version>
147147
</dependency>
148+
<dependency>
149+
<groupId>org.apache.ozone</groupId>
150+
<artifactId>hdds-server-framework</artifactId>
151+
<version>${hdds.version}</version>
152+
<type>test-jar</type>
153+
</dependency>
148154
<dependency>
149155
<groupId>org.apache.ozone</groupId>
150156
<artifactId>hdds-server-scm</artifactId>

hadoop-hdds/server-scm/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,12 @@
210210
<type>test-jar</type>
211211
<scope>test</scope>
212212
</dependency>
213+
<dependency>
214+
<groupId>org.apache.ozone</groupId>
215+
<artifactId>hdds-server-framework</artifactId>
216+
<type>test-jar</type>
217+
<scope>test</scope>
218+
</dependency>
213219
<dependency>
214220
<groupId>org.apache.ozone</groupId>
215221
<artifactId>hdds-test-utils</artifactId>

0 commit comments

Comments
 (0)