From 8805248dd64dad1364fe22cce6ed93adae905ff5 Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Tue, 14 Dec 2021 17:39:54 +0800
Subject: [PATCH] fix cypher-shell pom

(cherry picked from commit ed7c37d8c2651c8f55182c514b77ff5df0ae32da)
---
 fix-cypher-shell-pom.patch | 34 ++++++++++++++++++++++++++++++++++
 neo4j.spec                 |  7 ++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 fix-cypher-shell-pom.patch

diff --git a/fix-cypher-shell-pom.patch b/fix-cypher-shell-pom.patch
new file mode 100644
index 0000000..41655d6
--- /dev/null
+++ b/fix-cypher-shell-pom.patch
@@ -0,0 +1,34 @@
+diff -Nur neo4j-4.3.0/community/cypher-shell/cypher-shell/pom.xml neo4j-4.3.0_bak/community/cypher-shell/cypher-shell/pom.xml
+--- neo4j-4.3.0/community/cypher-shell/cypher-shell/pom.xml	2021-06-07 19:15:33.000000000 +0800
++++ neo4j-4.3.0_bak/community/cypher-shell/cypher-shell/pom.xml	2021-12-10 11:15:38.555197124 +0800
+@@ -200,12 +200,6 @@
+             <artifactId>mockito-core</artifactId>
+             <scope>test</scope>
+         </dependency>
+-        <dependency>
+-            <groupId>com.github.stefanbirkner</groupId>
+-            <artifactId>system-rules</artifactId>
+-            <version>1.19.0</version>
+-            <scope>test</scope>
+-        </dependency>
+ 
+     </dependencies>
+ 
+@@ -282,8 +276,15 @@
+                     </execution>
+                 </executions>
+             </plugin>
++            <plugin>
++                <groupId>org.apache.maven.plugins</groupId>
++                <artifactId>maven-compiler-plugin</artifactId>
++                <configuration>
++                	<skip>true</skip>
++                </configuration>
++            </plugin>
+         </plugins>
+     </build>
+ 
+ 
+-</project>
+\ No newline at end of file
++</project>
diff --git a/neo4j.spec b/neo4j.spec
index 4463a55..a4ce6fe 100644
--- a/neo4j.spec
+++ b/neo4j.spec
@@ -1,11 +1,12 @@
 %global debug_package %{nil}
 Name:                neo4j
 Version:             4.3.0
-Release:             1
+Release:             2
 Summary:             Graphs for Everyone
 License:             GPLv3
 URL:                 https://neo4j.com/
 Source0:             https://github.com/neo4j/neo4j/archive/%{version}.tar.gz
+Patch0:              fix-cypher-shell-pom.patch
 BuildRequires:       java-11-openjdk-devel maven gradle-local maven-local
 Requires:            java-11-openjdk-devel
 BuildArch:           noarch
@@ -16,6 +17,7 @@ a friendly query language and ACID transactions.
 
 %prep
 %setup -qn %{name}-%{version}
+%patch0 -p1
 
 %build
 export LC_ALL=en_US.UTF-8
@@ -119,5 +121,8 @@ popd
 %{_datadir}/maven-metadata/%{name}.xml
 
 %changelog
+* Tue Dec 14 2021 wangkai <wangkai385@huawei.com> - 4.3.0-2
+- fix cypher-shell pom
+
 * Wed Jul 14 2021 liyanan <liyanan32@huawei.com> - 4.3.0-1
 - package init
-- 
Gitee