Skip to content

Commit f6bb16f

Browse files
sumangala17sumangala17
committed
fix merge conflicts, correct import
2 parents 99cf2bd + 965e387 commit f6bb16f

File tree

1,026 files changed

+13408
-4576
lines changed

Some content is hidden

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

1,026 files changed

+13408
-4576
lines changed

‎LICENSE-binary‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ commons-codec:commons-codec:1.11
250250
commons-collections:commons-collections:3.2.2
251251
commons-daemon:commons-daemon:1.0.13
252252
commons-io:commons-io:2.8.0
253-
commons-lang:commons-lang:2.6
254253
commons-logging:commons-logging:1.1.3
255254
commons-net:commons-net:3.6
256255
de.ruedigermoeller:fst:2.50
@@ -290,7 +289,7 @@ org.apache.commons:commons-compress:1.21
290289
org.apache.commons:commons-configuration2:2.1.1
291290
org.apache.commons:commons-csv:1.0
292291
org.apache.commons:commons-digester:1.8.1
293-
org.apache.commons:commons-lang3:3.7
292+
org.apache.commons:commons-lang3:3.12.0
294293
org.apache.commons:commons-math3:3.1.1
295294
org.apache.commons:commons-text:1.4
296295
org.apache.commons:commons-validator:1.6

‎dev-support/Jenkinsfile‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
def getGithubAndJiraCreds() {
18+
def getGithubCreds() {
1919
return [usernamePassword(credentialsId: 'apache-hadoop-at-github.com',
2020
passwordVariable: 'GITHUB_TOKEN',
21-
usernameVariable: 'GITHUB_USER'),
22-
usernamePassword(credentialsId: 'hadoopqa-at-asf-jira',
23-
passwordVariable: 'JIRA_PASSWORD',
24-
usernameVariable: 'JIRA_USER')]
21+
usernameVariable: 'GITHUB_USER')]
2522
}
2623

2724
// Publish JUnit results only if there are XML files under surefire-reports
@@ -130,7 +127,7 @@ pipeline {
130127
}
131128

132129
steps {
133-
withCredentials(getGithubAndJiraCreds()) {
130+
withCredentials(getGithubCreds()) {
134131
sh '''#!/usr/bin/env bash
135132
136133
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
@@ -176,7 +173,7 @@ pipeline {
176173
}
177174

178175
steps {
179-
withCredentials(getGithubAndJiraCreds()) {
176+
withCredentials(getGithubCreds()) {
180177
sh '''#!/usr/bin/env bash
181178
182179
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
@@ -222,7 +219,7 @@ pipeline {
222219
}
223220

224221
steps {
225-
withCredentials(getGithubAndJiraCreds()) {
222+
withCredentials(getGithubCreds()) {
226223
sh '''#!/usr/bin/env bash
227224
228225
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
@@ -265,7 +262,7 @@ pipeline {
265262
}
266263

267264
steps {
268-
withCredentials(getGithubAndJiraCreds()) {
265+
withCredentials(getGithubCreds()) {
269266
sh '''#!/usr/bin/env bash
270267
271268
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"

‎dev-support/jenkins.sh‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,6 @@ function run_ci() {
149149
# enable writing back to Github
150150
YETUS_ARGS+=("--github-token=${GITHUB_TOKEN}")
151151

152-
# enable writing back to ASF JIRA
153-
YETUS_ARGS+=("--jira-password=${JIRA_PASSWORD}")
154-
YETUS_ARGS+=("--jira-user=${JIRA_USER}")
155-
156152
# auto-kill any surefire stragglers during unit test runs
157153
YETUS_ARGS+=("--reapermode=kill")
158154

@@ -173,7 +169,7 @@ function run_ci() {
173169
YETUS_ARGS+=("--build-url-artifacts=artifact/out")
174170

175171
# plugins to enable
176-
YETUS_ARGS+=("--plugins=all")
172+
YETUS_ARGS+=("--plugins=all,-jira")
177173

178174
# don't let these tests cause -1s because we aren't really paying that
179175
# much attention to them

‎hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,8 @@
122122
<!-- Checks for imports -->
123123
<!-- See http://checkstyle.sf.net/config_import.html -->
124124
<module name="IllegalImport">
125-
<property name="regexp" value="true"/>
126-
<property name="illegalPkgs" value="sun, com\.google\.common"/>
127-
<property name="illegalClasses" value="^org\.apache\.hadoop\.thirdparty\.com\.google\.common\.io\.BaseEncoding, ^org\.apache\.hadoop\.thirdparty\.com\.google\.common\.base\.(Optional|Function|Predicate|Supplier), ^org\.apache\.hadoop\.thirdparty\.com\.google\.common\.collect\.(ImmutableListMultimap)"/>
125+
<property name="regexp" value="true"/>
126+
<property name="illegalPkgs" value="sun"/>
128127
</module>
129128
<module name="RedundantImport"/>
130129
<module name="UnusedImports"/>

‎hadoop-client-modules/hadoop-client-api/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@
179179
<exclude>com/sun/security/**/*</exclude>
180180
<exclude>com/sun/jndi/**/*</exclude>
181181
<exclude>com/sun/management/**/*</exclude>
182+
<exclude>com/ibm/security/*</exclude>
183+
<exclude>com/ibm/security/**/*</exclude>
182184
</excludes>
183185
</relocation>
184186
<relocation>

‎hadoop-client-modules/hadoop-client-minicluster/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -919,6 +919,8 @@
919919
<exclude>com/sun/security/**/*</exclude>
920920
<exclude>com/sun/jndi/**/*</exclude>
921921
<exclude>com/sun/management/**/*</exclude>
922+
<exclude>com/ibm/security/*</exclude>
923+
<exclude>com/ibm/security/**/*</exclude>
922924
</excludes>
923925
</relocation>
924926
<relocation>

‎hadoop-client-modules/hadoop-client-runtime/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@
288288
<exclude>com/sun/security/**/*</exclude>
289289
<exclude>com/sun/jndi/**/*</exclude>
290290
<exclude>com/sun/management/**/*</exclude>
291+
<exclude>com/ibm/security/*</exclude>
292+
<exclude>com/ibm/security/**/*</exclude>
291293
</excludes>
292294
</relocation>
293295
<relocation>

‎hadoop-cloud-storage-project/hadoop-cos/pom.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -96,38 +96,6 @@
9696
</execution>
9797
</executions>
9898
</plugin>
99-
<plugin>
100-
<groupId>org.apache.maven.plugins</groupId>
101-
<artifactId>maven-enforcer-plugin</artifactId>
102-
<dependencies>
103-
<dependency>
104-
<groupId>de.skuzzle.enforcer</groupId>
105-
<artifactId>restrict-imports-enforcer-rule</artifactId>
106-
<version>${restrict-imports.enforcer.version}</version>
107-
</dependency>
108-
</dependencies>
109-
<executions>
110-
<execution>
111-
<id>banned-illegal-imports</id>
112-
<phase>process-sources</phase>
113-
<goals>
114-
<goal>enforce</goal>
115-
</goals>
116-
<configuration>
117-
<rules>
118-
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
119-
<includeTestCode>true</includeTestCode>
120-
<reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
121-
<bannedImports>
122-
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
123-
<bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
124-
</bannedImports>
125-
</restrictImports>
126-
</rules>
127-
</configuration>
128-
</execution>
129-
</executions>
130-
</plugin>
13199
</plugins>
132100
</build>
133101

‎hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -92,38 +92,6 @@
9292
</execution>
9393
</executions>
9494
</plugin>
95-
<plugin>
96-
<groupId>org.apache.maven.plugins</groupId>
97-
<artifactId>maven-enforcer-plugin</artifactId>
98-
<dependencies>
99-
<dependency>
100-
<groupId>de.skuzzle.enforcer</groupId>
101-
<artifactId>restrict-imports-enforcer-rule</artifactId>
102-
<version>${restrict-imports.enforcer.version}</version>
103-
</dependency>
104-
</dependencies>
105-
<executions>
106-
<execution>
107-
<id>banned-illegal-imports</id>
108-
<phase>process-sources</phase>
109-
<goals>
110-
<goal>enforce</goal>
111-
</goals>
112-
<configuration>
113-
<rules>
114-
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
115-
<includeTestCode>true</includeTestCode>
116-
<reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
117-
<bannedImports>
118-
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
119-
<bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
120-
</bannedImports>
121-
</restrictImports>
122-
</rules>
123-
</configuration>
124-
</execution>
125-
</executions>
126-
</plugin>
12795
</plugins>
12896
</build>
12997
<dependencies>

‎hadoop-common-project/hadoop-auth/pom.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -248,38 +248,6 @@
248248
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
249249
</configuration>
250250
</plugin>
251-
<plugin>
252-
<groupId>org.apache.maven.plugins</groupId>
253-
<artifactId>maven-enforcer-plugin</artifactId>
254-
<dependencies>
255-
<dependency>
256-
<groupId>de.skuzzle.enforcer</groupId>
257-
<artifactId>restrict-imports-enforcer-rule</artifactId>
258-
<version>${restrict-imports.enforcer.version}</version>
259-
</dependency>
260-
</dependencies>
261-
<executions>
262-
<execution>
263-
<id>banned-illegal-imports</id>
264-
<phase>process-sources</phase>
265-
<goals>
266-
<goal>enforce</goal>
267-
</goals>
268-
<configuration>
269-
<rules>
270-
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
271-
<includeTestCode>true</includeTestCode>
272-
<reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
273-
<bannedImports>
274-
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
275-
<bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
276-
</bannedImports>
277-
</restrictImports>
278-
</rules>
279-
</configuration>
280-
</execution>
281-
</executions>
282-
</plugin>
283251
</plugins>
284252
</build>
285253

0 commit comments

Comments
 (0)