From 94b2e91c3afc8bc019c4eb34ae3c246c3e3f1dc4 Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Tue, 2 Jul 2019 10:41:32 -0400
Subject: [PATCH 1/2] Fix hibernate DTD urls

Looks like old urls redirect to https with broken cert now
---
 .../hibernate/core-3.3/src/test/resources/hibernate.cfg.xml     | 2 +-
 .../hibernate/core-4.0/src/test/resources/hibernate.cfg.xml     | 2 +-
 .../hibernate/core-4.3/src/test/resources/hibernate.cfg.xml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dd-java-agent/instrumentation/hibernate/core-3.3/src/test/resources/hibernate.cfg.xml b/dd-java-agent/instrumentation/hibernate/core-3.3/src/test/resources/hibernate.cfg.xml
index 2f423e052b..39d96decbd 100644
--- a/dd-java-agent/instrumentation/hibernate/core-3.3/src/test/resources/hibernate.cfg.xml
+++ b/dd-java-agent/instrumentation/hibernate/core-3.3/src/test/resources/hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE hibernate-configuration PUBLIC
   "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+  "https://hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 
 <hibernate-configuration>
 
diff --git a/dd-java-agent/instrumentation/hibernate/core-4.0/src/test/resources/hibernate.cfg.xml b/dd-java-agent/instrumentation/hibernate/core-4.0/src/test/resources/hibernate.cfg.xml
index fe5e5de6b1..511c3e8288 100644
--- a/dd-java-agent/instrumentation/hibernate/core-4.0/src/test/resources/hibernate.cfg.xml
+++ b/dd-java-agent/instrumentation/hibernate/core-4.0/src/test/resources/hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE hibernate-configuration PUBLIC
   "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+  "https://hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 
 <hibernate-configuration>
 
diff --git a/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/resources/hibernate.cfg.xml b/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/resources/hibernate.cfg.xml
index 3fb8f505cb..dc2c557770 100644
--- a/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/resources/hibernate.cfg.xml
+++ b/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/resources/hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE hibernate-configuration PUBLIC
   "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+  "https://hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 
 <hibernate-configuration>
 

From ffe4aabf8fe7171cd375e0837b73c197da814106 Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Tue, 2 Jul 2019 10:41:55 -0400
Subject: [PATCH 2/2] Specify version of hibernate-annotation

Using '+' pushes version of hibernate-core up as well and we do not
want thay.
---
 .../instrumentation/hibernate/core-3.3/core-3.3.gradle        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dd-java-agent/instrumentation/hibernate/core-3.3/core-3.3.gradle b/dd-java-agent/instrumentation/hibernate/core-3.3/core-3.3.gradle
index 805585960d..fe742ef3f0 100644
--- a/dd-java-agent/instrumentation/hibernate/core-3.3/core-3.3.gradle
+++ b/dd-java-agent/instrumentation/hibernate/core-3.3/core-3.3.gradle
@@ -48,8 +48,8 @@ dependencies {
   testCompile project(':dd-java-agent:instrumentation:hibernate:core-4.0')
   testCompile project(':dd-java-agent:instrumentation:hibernate:core-4.3')
 
-  testCompile group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.GA'
-  testCompile group: 'org.hibernate', name: 'hibernate-annotations', version: '+'
+  testCompile group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.SP1'
+  testCompile group: 'org.hibernate', name: 'hibernate-annotations', version: '3.4.0.GA'
   testCompile group: 'javassist', name: 'javassist', version: '+'
   testCompile group: 'com.h2database', name: 'h2', version: '1.4.197'
   testCompile "javax.xml.bind:jaxb-api:2.2.11"