cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [4/4] cxf git commit: Fixing commit
Date Wed, 17 Dec 2014 16:48:03 GMT
Fixing commit


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/01e3fff0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/01e3fff0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/01e3fff0

Branch: refs/heads/3.0.x-fixes
Commit: 01e3fff058dc7374a103487dfc011110798db30f
Parents: bb4a50e
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Dec 17 16:47:51 2014 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Dec 17 16:47:51 2014 +0000

----------------------------------------------------------------------
 rt/transports/http/pom.xml                      | 38 --------------------
 .../https/CertificateHostnameVerifier.java      |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/01e3fff0/rt/transports/http/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index 038a47d..455ca2f 100644
--- a/rt/transports/http/pom.xml
+++ b/rt/transports/http/pom.xml
@@ -151,43 +151,6 @@
                     </extensions>
                 </configuration>
             </plugin>
-<<<<<<< HEAD
-=======
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>versions</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>cleanVersions</goal>
-                        </goals>
-                        <configuration>
-                            <versions>
-                                <cxf.osgi.version.clean>${project.version}</cxf.osgi.version.clean>
-                            </versions>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${cxf.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Import-Package>
-                            ${cxf.osgi.import},
-                            *
-                        </Import-Package>
-                        <Export-Package>
-                            ${cxf.osgi.export}
-                        </Export-Package>
-                        <Export-Service>
-                            ${cxf.export.service}
-                        </Export-Service>
-                        <Bundle-Activator>${cxf.bundle.activator}</Bundle-Activator>
-                    </instructions>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>com.googlecode.maven-download-plugin</groupId>
                 <artifactId>download-maven-plugin</artifactId>
@@ -207,7 +170,6 @@
                     </execution>
                 </executions>
              </plugin>
->>>>>>> 9043011... [CXF-6143] - SSL/TLS hostname verification does not
strictly follow HTTPS RFC2818
         </plugins>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/01e3fff0/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java
index d9f543b..4238c18 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java
@@ -73,7 +73,7 @@ import javax.security.auth.x500.X500Principal;
  * HttpClient "contrib" repository.
  *
  */
-
+@Deprecated
 public interface CertificateHostnameVerifier extends javax.net.ssl.HostnameVerifier {
 
 


Mime
View raw message