update to version 2.1.1

0001-remove-unsupported-dependency.patch

@@ -0,0 +1,64 @@
+From 0ae3bc60f28f34fcad4300730832b227ec80180c Mon Sep 17 00:00:00 2001
+From: wang--ge <wang__ge@126.com>
+Date: Tue, 16 Jan 2024 11:45:58 +0800
+Subject: [PATCH] remove unsupported dependency
+
+---
+ .xmvn-reactor | 34 ----------------------------------
+ 1 file changed, 34 deletions(-)
+
+diff --git a/.xmvn-reactor b/.xmvn-reactor
+index 37b45ac..748d549 100644
+--- a/.xmvn-reactor
++++ b/.xmvn-reactor
+@@ -26,23 +26,6 @@
+           <artifactId>slf4j-api</artifactId>
+           <requestedVersion>1.7.36</requestedVersion>
+         </dependency>
+-        <dependency>
+-          <groupId>io.netty</groupId>
+-          <artifactId>netty-handler</artifactId>
+-          <requestedVersion>4.1.75.Final</requestedVersion>
+-        </dependency>
+-        <dependency>
+-          <groupId>io.netty</groupId>
+-          <artifactId>netty-transport-native-epoll</artifactId>
+-          <classifier>linux-x86_64</classifier>
+-          <requestedVersion>4.1.75.Final</requestedVersion>
+-        </dependency>
+-        <dependency>
+-          <groupId>io.netty</groupId>
+-          <artifactId>netty-transport-native-kqueue</artifactId>
+-          <classifier>osx-x86_64</classifier>
+-          <requestedVersion>4.1.75.Final</requestedVersion>
+-        </dependency>
+       </dependencies>
+     </artifact>
+     <artifact>
+@@ -61,23 +44,6 @@
+           <artifactId>slf4j-api</artifactId>
+           <requestedVersion>1.7.36</requestedVersion>
+         </dependency>
+-        <dependency>
+-          <groupId>io.netty</groupId>
+-          <artifactId>netty-handler</artifactId>
+-          <requestedVersion>4.1.75.Final</requestedVersion>
+-        </dependency>
+-        <dependency>
+-          <groupId>io.netty</groupId>
+-          <artifactId>netty-transport-native-epoll</artifactId>
+-          <classifier>linux-x86_64</classifier>
+-          <requestedVersion>4.1.75.Final</requestedVersion>
+-        </dependency>
+-        <dependency>
+-          <groupId>io.netty</groupId>
+-          <artifactId>netty-transport-native-kqueue</artifactId>
+-          <classifier>osx-x86_64</classifier>
+-          <requestedVersion>4.1.75.Final</requestedVersion>
+-        </dependency>
+       </dependencies>
+     </artifact>
+     <artifact>
+-- 
+2.33.0
+

ldaptive.spec

@@ -1,12 +1,11 @@
 Name:                ldaptive
-Version:             1.1.0
+Version:             2.1.1
 Release:             1
 Summary:             LDAP library for Java
 License:             ASL 2.0 or LGPLv3
 URL:                 http://www.ldaptive.org/
-Source0:             https://github.com/vt-middleware/ldaptive/archive/v%{version}/ldaptive-%{version}.tar.gz
+Source0:             https://github.com/vt-middleware/%{name}/archive/v2.1.1/%{name}-%{version}.tar.gz
-#patch0  https://github.com/vt-middleware/ldaptive/commit/44a0d8222f27eef7b848316ef136dc539f53c51f.patch
+Source1:             0001-remove-unsupported-dependency.patch
-Patch0:              44a0d8222f27eef7b848316ef136dc539f53c51f.patch
 BuildRequires:       maven-local mvn(com.googlecode.json-simple:json-simple)
 BuildRequires:       mvn(com.sun.codemodel:codemodel) mvn(commons-cli:commons-cli)
 BuildRequires:       mvn(javax.servlet:javax.servlet-api) mvn(net.sf.ehcache:ehcache-core)
@@ -15,6 +14,14 @@ BuildRequires:       mvn(org.apache.maven.plugins:maven-checkstyle-plugin) mvn(o
 BuildRequires:       mvn(org.springframework:spring-beans) mvn(org.springframework:spring-context)
 BuildRequires:       mvn(org.springframework:spring-core) mvn(org.springframework:spring-expression)
 BuildRequires:       mvn(org.testng:testng)
+BuildRequires:       mvn(com.google.code.gson:gson)
+BuildRequires:       mvn(org.eclipse.aether:aether-connector-basic)
+BuildRequires:       mvn(org.eclipse.aether:aether-transport-wagon)
+BuildRequires:       mvn(org.apache.maven.wagon:wagon-http)
+BuildRequires:       mvn(org.apache.maven.wagon:wagon-provider-api)
+BuildRequires:       java-11-openjdk-devel
+Requires:            java-11-openjdk	
+Requires:            javapackages-tools
 BuildArch:           noarch
 %description
 Ldaptive is a simple, extensible Java API for interacting with LDAP servers.
@@ -50,17 +57,19 @@ Templating functionality for aggregating LDAP searches.
 %setup -q -n ldaptive-%{version}
 find . -name "*.class" -print -delete
 find . -name "*.jar" -print -delete
-%patch0 -p1
-rm -f core/src/main/java/org/ldaptive/io/Base64.java
 %pom_remove_plugin -r :maven-javadoc-plugin
 %pom_remove_plugin -r :maven-source-plugin
-%pom_disable_module webapp
+%pom_remove_plugin -r :maven-enforcer-plugin
+%pom_remove_plugin -r :maven-checkstyle-plugin
+%pom_remove_plugin -r :japicmp-maven-plugin
+%pom_remove_plugin -r :versions-maven-plugin
 cp -p distribution/LICENSE* .
 cp -p distribution/NOTICE .
-%pom_change_dep -r :ehcache :ehcache-core
 
 %build
-%mvn_build -sf
+export JAVA_HOME=%{_jvmdir}/java-11-openjdk
+%mvn_build -sfb
+patch -p1 < %{SOURCE1}
 
 %install
 %mvn_install
@@ -82,5 +91,8 @@ cp -p distribution/NOTICE .
 %files templates -f .mfiles-ldaptive-templates
 
 %changelog
+* Tue Jan 16 2024 Ge Wang <wang__ge@126.com> - 2.1.1-1
+- Update to version 2.1.1
+
 * Tue Aug 25 2020 Jeffery.Gao <gaojianxing@huawei.com> - 1.1.0-1
 - Package init