From 28f6a776064da572dfe2144890cc1056ed99535b Mon Sep 17 00:00:00 2001
From: hht8 <huanghaitao12138@163.com>
Date: Tue, 27 Oct 2020 20:28:44 +0800
Subject: [PATCH] Delete simple-json dep

---
 Disable-testcomplie.patch | 34 ++++++++++++++++++++++++++++++++++
 HikariCP.spec             | 11 +++++++----
 2 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 Disable-testcomplie.patch

diff --git a/Disable-testcomplie.patch b/Disable-testcomplie.patch
new file mode 100644
index 0000000..9d5dd65
--- /dev/null
+++ b/Disable-testcomplie.patch
@@ -0,0 +1,34 @@
+From d8d46d93c40284fe6f40242e8fa50a0e6e3b6433 Mon Sep 17 00:00:00 2001
+From: hht8 <huanghaitao12138@163.com>
+Date: Tue, 27 Oct 2020 17:08:24 +0800
+Subject: [PATCH] 2
+
+---
+ pom.xml | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index 2fde544..02154ab 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -305,7 +305,16 @@
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+-               <extensions>true</extensions>
++	       <extensions>true</extensions>
++	       <executions>
++		  <execution>
++		      <id>default-testCompile</id>
++		      <phase>test-compile</phase>
++		      <configuration>
++			  <skip>true</skip>
++		      </configuration>
++	          </execution>
++	       </executions>
+                <configuration>
+                   <source>1.7</source>
+                   <target>1.7</target>
+-- 
+2.23.0
+
diff --git a/HikariCP.spec b/HikariCP.spec
index 6dc5a99..ed4a2e5 100644
--- a/HikariCP.spec
+++ b/HikariCP.spec
@@ -1,11 +1,11 @@
 Name:          HikariCP
 Version:       2.4.3
-Release:       3
+Release:       4
 Summary:       JDBC Connection Pool
 License:       ASL 2.0
 URL:           https://github.com/brettwooldridge/HikariCP
 Source0:       https://github.com/brettwooldridge/HikariCP/archive/%{name}-%{version}.tar.gz
-
+Patch0:        Disable-testcomplie.patch
 BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
 BuildRequires: maven-local mvn(com.sun:tools) mvn(io.dropwizard.metrics:metrics-core)
 BuildRequires: mvn(io.dropwizard.metrics:metrics-healthchecks) mvn(javax.inject:javax.inject)
@@ -14,7 +14,7 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) mvn(org.apache.felix:or
 BuildRequires: mvn(org.apache.logging.log4j:log4j-slf4j-impl) mvn(org.apache.logging.log4j:log4j-api)
 BuildRequires: mvn(org.apache.logging.log4j:log4j-core) mvn(org.codehaus.mojo:exec-maven-plugin)
 BuildRequires: mvn(org.hibernate:hibernate-core) mvn(org.javassist:javassist) mvn(org.slf4j:slf4j-api)
-BuildRequires: mvn(org.mockito:mockito-all) mvn(simple-jndi:simple-jndi) mvn(org.slf4j:slf4j-simple)
+BuildRequires: mvn(org.mockito:mockito-all) mvn(org.slf4j:slf4j-simple)
 
 BuildArch:     noarch
 
@@ -41,6 +41,7 @@ done
 
 %pom_remove_dep org.ops4j.pax.exam:
 %pom_remove_dep org.ops4j.pax.url:
+%pom_remove_dep simple-jndi:simple-jndi
 find src/test/java/com/zaxxer/hikari/osgi  -print -delete
 
 %pom_add_dep junit:junit:4.12:test
@@ -49,7 +50,6 @@ find src/test/java/com/zaxxer/hikari/osgi  -print -delete
 %mvn_alias : com.zaxxer:%{name}-java6
 
 %build
-
 %mvn_build
 
 %install
@@ -62,5 +62,8 @@ find src/test/java/com/zaxxer/hikari/osgi  -print -delete
 %files help -f .mfiles-javadoc
 
 %changelog
+* Tue Oct 27 2020 huanghaitao <huanghaitao8@huawei.com> - 2.4.3-4
+- Remove simple-jndi dep
+
 * Fri Dec 20 2019 wanjiankang <wanjiankang@huawei.com> - 2.4.3-3
 - initial rpm