From e666a1f300c4208debff36308aa7c8bd90eecc68 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Sat, 23 Jan 2021 17:33:05 +0900
Subject: [PATCH] #2517 move params to antrun
---
plugin.xml | 15 +++++++--------
pom.xml | 2 ++
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/plugin.xml b/plugin.xml
index 179c5fe62..04c583c46 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,9 +5,8 @@
<!-- Maven Repository -->
<property name="maven.snapshot.repo.url" value="https://oss.sonatype.org/content/repositories/snapshots" />
- <!-- property name="maven.release.repo.url" value="https://oss.sonatype.org/content/repositories/releases" / -->
- <!-- WORKAROUND -->
- <property name="maven.release.repo.url" value="https://maven.codelibs.org" />
+ <property name="maven.release.repo.url" value="https://oss.sonatype.org/content/repositories/releases" />
+ <property name="use.fesen" value="" />
<target name="install.plugins">
<mkdir dir="${target.dir}" />
@@ -16,7 +15,7 @@
<!-- analysis-extension -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
+ <param name="plugin.groupId" value="org/codelibs${use.fesen}" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="analysis-extension" />
<param name="plugin.version" value="7.10.0" />
@@ -25,7 +24,7 @@
<!-- analysis-fess -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
+ <param name="plugin.groupId" value="org/codelibs${use.fesen}" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="analysis-fess" />
<param name="plugin.version" value="7.10.0" />
@@ -34,7 +33,7 @@
<!-- configsync -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
+ <param name="plugin.groupId" value="org/codelibs${use.fesen}" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="configsync" />
<param name="plugin.version" value="7.10.0" />
@@ -43,7 +42,7 @@
<!-- dataformat -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
+ <param name="plugin.groupId" value="org/codelibs${use.fesen}" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="dataformat" />
<param name="plugin.version" value="7.10.0" />
@@ -52,7 +51,7 @@
<!-- minhash -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
+ <param name="plugin.groupId" value="org/codelibs${use.fesen}" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="minhash" />
<param name="plugin.version" value="7.10.0" />
diff --git a/pom.xml b/pom.xml
index 3f2673eb1..63ebc15cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,6 +303,8 @@
<ant antfile="${basedir}/dbflute.xml" target="download.dbflute" />
<ant antfile="${basedir}/plugin.xml" target="install.plugins">
<property name="with.fess" value="true" />
+ <property name="maven.release.repo.url" value="https://maven.codelibs.org" />
+ <property name="use.fesen" value="/fesen/relocated" />
</ant>
<ant antfile="deps.xml" target="install.jars" />
<echo message="fess.version=${project.version}" file="${basedir}/src/main/webapp/WEB-INF/project.properties" />
--
GitLab