Skip to content

Commit 70e074d

Browse files
committed
Fix hdfs test fixture handling for now
1 parent f20839b commit 70e074d

File tree

1 file changed

+32
-25
lines changed

1 file changed

+32
-25
lines changed

test/fixtures/hdfs-fixture/build.gradle

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ dependencies {
137137
[group: "org.slf4j", module: "slf4j-api"],
138138
]
139139

140-
// hdfs2("org.apache.hadoop:hadoop-hdfs:2.8.5")
140+
// port this to a component metadata rule for minicluster 2 and 3
141141
hdfs2("commons-io:commons-io:2.16.1")
142142
hdfs2("com.google.protobuf:protobuf-java:3.25.5")
143143
hdfs2("org.apache.htrace:htrace-core4:4.0.1-incubating")
@@ -160,30 +160,37 @@ dependencies {
160160
hdfs2("org.apache.hadoop:hadoop-hdfs:2.8.5:tests")
161161
hdfs2("org.apache.hadoop:hadoop-annotations:2.8.5")
162162
hdfs2("org.apache.hadoop:hadoop-hdfs-client:2.8.5")
163-
hdfs2("org.apache.hadoop:hadoop-minicluster:2.8.5") {
164-
commonExcludes.each { exclude it }
165-
exclude group: "org.apache.commons", module: "commons-math3"
166-
exclude group: "xmlenc", module: "xmlenc"
167-
exclude group: "net.java.dev.jets3t", module: "jets3t"
168-
exclude group: "org.apache.directory.server", module: "apacheds-i18n"
169-
exclude group: "xerces", module: "xercesImpl"
170-
}
171-
172-
hdfs3("org.apache.hadoop:hadoop-minicluster:3.3.1") {
173-
commonExcludes.each { exclude it }
174-
exclude group: "dnsjava", module: "dnsjava"
175-
exclude group: "com.google.inject.extensions", module: "guice-servlet"
176-
exclude group: "com.google.inject", module: "guice"
177-
exclude group: "com.microsoft.sqlserver", module: "mssql-jdbc"
178-
exclude group: "com.sun.jersey.contribs", module: "jersey-guice"
179-
exclude group: "com.zaxxer", module: "HikariCP-java7"
180-
exclude group: "com.sun.jersey", module: "jersey-server"
181-
exclude group: "org.bouncycastle", module: "bcpkix-jdk15on"
182-
exclude group: "org.bouncycastle", module: "bcprov-jdk15on"
183-
exclude group: "org.ehcache", module: "ehcache"
184-
exclude group: "org.apache.geronimo.specs", module: "geronimo-jcache_1.0_spec"
185-
exclude group: "org.xerial.snappy", module: "snappy-java"
186-
}
163+
hdfs2("org.apache.hadoop:hadoop-minicluster:2.8.5")
164+
165+
hdfs3("org.apache.hadoop:hadoop-minicluster:3.3.1")
166+
hdfs3("org.apache.hadoop:hadoop-common:3.3.1")
167+
hdfs3("org.apache.hadoop:hadoop-common:3.3.1:tests")
168+
hdfs3("org.apache.hadoop:hadoop-hdfs:3.3.1")
169+
hdfs3("org.apache.hadoop:hadoop-hdfs:3.3.1:tests")
170+
hdfs3("org.apache.hadoop:hadoop-hdfs-client:3.3.1")
171+
hdfs3("org.apache.hadoop:hadoop-yarn-api:3.3.1")
172+
hdfs3("org.apache.hadoop:hadoop-auth:3.3.1")
173+
hdfs3("org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1")
174+
hdfs3("org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1")
175+
hdfs3("org.apache.htrace:htrace-core4:4.1.0-incubating")
176+
hdfs3("commons-collections:commons-collections:3.2.2")
177+
hdfs3("commons-io:commons-io:2.8.0")
178+
hdfs3("org.apache.commons:commons-configuration2:2.1.1")
179+
hdfs3("org.apache.commons:commons-lang3:3.7")
180+
hdfs3("org.apache.commons:commons-text:1.4")
181+
hdfs3("com.fasterxml.woodstox:woodstox-core:6.7.0")
182+
hdfs3("org.codehaus.woodstox:stax2-api:4.2.2")
183+
hdfs3("org.eclipse.jetty:jetty-servlet:9.4.40.v20210413")
184+
hdfs3("org.eclipse.jetty:jetty-server:9.4.40.v20210413")
185+
hdfs3("org.eclipse.jetty:jetty-util:9.4.40.v20210413")
186+
hdfs3("org.eclipse.jetty:jetty-webapp:9.4.40.v20210413")
187+
hdfs3("org.eclipse.jetty:jetty-http:9.4.40.v20210413")
188+
hdfs3("org.eclipse.jetty:jetty-security:9.4.40.v20210413")
189+
hdfs3("org.eclipse.jetty:jetty-io:9.4.40.v20210413")
190+
hdfs3("javax.servlet:javax.servlet-api:3.1.0")
191+
hdfs3("com.sun.jersey:jersey-servlet:1.19")
192+
// "org.apache.hadoop:hadoop-hdfs:3.3.1")
193+
// "org.apache.hadoop:hadoop-yarn-api:3.3.1\n")
187194
}
188195

189196
tasks.named("shadowJar").configure {

0 commit comments

Comments
 (0)