diff --git a/Modify-JAVA_OPTS-to-fix-startup-failure.patch b/Modify-JAVA_OPTS-to-fix-startup-failure.patch deleted file mode 100644 index 02986ea409316b37651c6746025dac3ffed9f8eb..0000000000000000000000000000000000000000 --- a/Modify-JAVA_OPTS-to-fix-startup-failure.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4d8355622e5eed7dd8b90246bf50e937c0b43923 Mon Sep 17 00:00:00 2001 -From: hht8 -Date: Mon, 19 Jul 2021 11:35:38 +0800 -Subject: [PATCH] Modified the stack size in JAVA_OPTS and remove two useless options - ---- - deployer/src/main/bin/startup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deployer/src/main/bin/startup.sh b/deployer/src/main/bin/startup.sh -index 7624349..61daed8 100644 ---- a/deployer/src/main/bin/startup.sh -+++ b/deployer/src/main/bin/startup.sh -@@ -81,7 +81,7 @@ esac - - str=`file -L $JAVA | grep 64-bit` - if [ -n "$str" ]; then -- JAVA_OPTS="-server -Xms2048m -Xmx3072m -Xmn1024m -XX:SurvivorRatio=2 -XX:PermSize=96m -XX:MaxPermSize=256m -Xss256k -XX:-UseAdaptiveSizePolicy -XX:MaxTenuringThreshold=15 -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:+HeapDumpOnOutOfMemoryError" -+ JAVA_OPTS="-server -Xms2048m -Xmx3072m -Xmn1024m -XX:SurvivorRatio=2 -XX:PermSize=96m -XX:MaxPermSize=256m -Xss512k -XX:-UseAdaptiveSizePolicy -XX:MaxTenuringThreshold=15 -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:+HeapDumpOnOutOfMemoryError" - else - JAVA_OPTS="-server -Xms1024m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:MaxPermSize=128m " - fi --- -2.30.0 - diff --git a/canal-1.1.5.tar.gz b/canal-1.1.5.tar.gz deleted file mode 100644 index d403f3fca4ed64da78abc2ab82d0f0087a1c8f4f..0000000000000000000000000000000000000000 Binary files a/canal-1.1.5.tar.gz and /dev/null differ diff --git a/canal-1.1.7.tar.gz b/canal-1.1.7.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5bbbe12eebaf6708d762e9560d9cfd623164e0c2 Binary files /dev/null and b/canal-1.1.7.tar.gz differ diff --git a/canal.spec b/canal.spec index 40448ee61abfbb84649e9a921cc5baffa4fb6206..504adbc8862f3852d620f12447f71b623e314c8d 100644 --- a/canal.spec +++ b/canal.spec @@ -1,11 +1,10 @@ Name: canal -Version: 1.1.5 +Version: 1.1.7 Release: 1 Summary: MySQL Binlog Incremental Subscription & Consuming Components License: ASL 2.0 URL: https://github.com/alibaba/canal -Source0: https://github.com/alibaba/canal/archive/refs/tags/canal-1.1.5.tar.gz -Patch0: Modify-JAVA_OPTS-to-fix-startup-failure.patch +Source0: https://github.com/alibaba/canal/archive/refs/tags/canal-1.1.7.tar.gz BuildRequires: maven java Requires: java BuildArch: noarch @@ -17,13 +16,19 @@ Summary: Javadoc for %{name} %description javadoc This package contains javadoc for %{name}. + +%package adapter +Summary: Adapter for %{name} +%description adapter +This package contains the adapter components for %{name}. + %prep %autosetup -n canal-canal-%{version} -p1 find -name "*.jar" -delete find -name "*.class" -delete %build -mvn package +mvn package -Dmaven.test.failure.ignore=true %install install -d %{buildroot}%{_datadir}/canal @@ -31,6 +36,12 @@ cp -r deployer/target/canal/bin %{buildroot}%{_datadir}/canal cp -r deployer/target/canal/conf %{buildroot}%{_datadir}/canal cp -r deployer/target/canal/lib %{buildroot}%{_datadir}/canal cp -r deployer/target/canal/logs %{buildroot}%{_datadir}/canal + + +# Adapter files +install -d %{buildroot}%{_datadir}/canal-adapter +cp -r client-adapter/launcher/target/canal-adapter/* %{buildroot}%{_datadir}/canal-adapter + install -d %{buildroot}%{_javadir} find . -name "*.jar" | cp --parents `xargs` %{buildroot}%{_javadir} install -d %{buildroot}%{_datadir}/canal/javadoc @@ -45,6 +56,12 @@ find . -name "*.xml" | cp --parents `xargs` %{buildroot}%{_datadir}/canal/javado %doc README.md %{_datadir}/canal/javadoc +%files adapter +%{_datadir}/canal-adapter + %changelog +* Wed Jun 19 2024 luxuexian - 1.1.7-1 +- update to 1.1.7, add canal-adapter subpackage + * Mon Jul 19 2021 huanghaitao - 1.1.5-1 - package init