Skip to content

Commit d35b769

Browse files
authored
Merge pull request #54 from ligangty/master
Update license header
2 parents eccfc15 + c3286ce commit d35b769

36 files changed

+37
-69
lines changed

.github/workflows/merge-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
# Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

.github/workflows/pr-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
# Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

pom.xml

+2-34
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright (C) 2015 Red Hat, Inc. ([email protected])
3+
Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@
4141
<properties>
4242
<pmd.skip>true</pmd.skip>
4343
<projectOwner>Red Hat, Inc.</projectOwner>
44+
<projectEmail>https://github.com/Commonjava/jhttpc</projectEmail>
4445
<javaVersion>1.8</javaVersion>
4546
<httpcoreVersion>4.4.15</httpcoreVersion>
4647
<httpclientVersion>4.5.13</httpclientVersion>
@@ -370,39 +371,6 @@ javax.net.debug=ssl:handshake:verbose
370371
</build>
371372

372373
<profiles>
373-
<profile>
374-
<id>ci</id>
375-
376-
<!-- <properties>
377-
<dockerNetworkMode>custom</dockerNetworkMode>
378-
<dockerNetwork>ci-network</dockerNetwork>
379-
380-
<selfsigned-host>${docker.container.selfsigned.net.ci-network.ip}</selfsigned-host>
381-
<rootsigned-host>${docker.container.rootsigned.net.ci-network.ip}</rootsigned-host>
382-
<intersigned-host>${docker.container.intersigned.net.ci-network.ip}</intersigned-host>
383-
<selfsigned-http-port>80</selfsigned-http-port>
384-
<selfsigned-https-port>443</selfsigned-https-port>
385-
<rootsigned-http-port>80</rootsigned-http-port>
386-
<rootsigned-https-port>443</rootsigned-https-port>
387-
<intersigned-http-port>80</intersigned-http-port>
388-
<intersigned-https-port>443</intersigned-https-port>
389-
</properties>
390-
391-
<build>
392-
<plugins>
393-
<plugin>
394-
<groupId>io.fabric8</groupId>
395-
<artifactId>docker-maven-plugin</artifactId>
396-
</plugin>
397-
<plugin>
398-
<artifactId>maven-antrun-plugin</artifactId>
399-
</plugin>
400-
<plugin>
401-
<artifactId>maven-failsafe-plugin</artifactId>
402-
</plugin>
403-
</plugins>
404-
</build>
405-
--> </profile>
406374
<profile>
407375
<id>local-its</id>
408376
<build>

src/main/java/org/commonjava/util/jhttpc/HttpFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/HttpFactoryIfc.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/INTERNAL/conn/CloseBlockingConnectionManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/INTERNAL/conn/ConnectionManagerCache.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/INTERNAL/conn/ConnectionManagerTracker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/INTERNAL/conn/SiteConnectionConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/INTERNAL/conn/TrackedHttpClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/INTERNAL/util/BouncyCastleUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/INTERNAL/util/CertEnumerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/INTERNAL/util/HttpUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/INTERNAL/util/MonolithicKeyStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/INTERNAL/util/SSLUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/JHttpCException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/auth/AttributePasswordManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/auth/BasicAuthenticator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/auth/ClientAuthenticator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/auth/MemoryPasswordManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/auth/OAuth20BearerTokenAuthenticator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/auth/PasswordKey.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/auth/PasswordManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/auth/PasswordType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/lifecycle/ShutdownEnabled.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/model/SiteConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/model/SiteConfigBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/model/SiteTrustType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/commonjava/util/jhttpc/util/UrlUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/java/org/commonjava/util/jhttpc/it/AbstractIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/java/org/commonjava/util/jhttpc/it/AbstractSSLTestsIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/java/org/commonjava/util/jhttpc/it/inter/IntermediateSignedIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/java/org/commonjava/util/jhttpc/it/root/RootSignedIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/java/org/commonjava/util/jhttpc/it/self/SelfSignedIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/java/org/commonjava/util/jhttpc/unit/HttpFactoryTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/java/org/commonjava/util/jhttpc/unit/ResourceCleanupLoadTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2015 Red Hat, Inc. ([email protected])
2+
* Copyright (C) 2015 Red Hat, Inc. (https://github.com/Commonjava/jhttpc)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)