From a1825af32bce23164cb8699410a48edfd0be0ad2 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Sat, 17 Aug 2019 18:25:23 +0900
Subject: [PATCH] fix #2211 remove fess-ds
---
deps.xml | 80 +------------------
.../fess/mylasta/direction/FessConfig.java | 9 +--
src/main/resources/fess_config.properties | 3 +-
3 files changed, 9 insertions(+), 83 deletions(-)
diff --git a/deps.xml b/deps.xml
index f7be6bea6..ab564d323 100644
--- a/deps.xml
+++ b/deps.xml
@@ -43,93 +43,21 @@
</patternset>
<cutdirsmapper dirs="2" />
</unzip>
- <!-- fess-ds-atlassian -->
- <antcall target="install.plugin.jar">
- <param name="repo.url" value="${maven.release.repo.url}" />
- <param name="jar.groupId" value="org/codelibs/fess" />
- <param name="jar.artifactId" value="fess-ds-atlassian" />
- <param name="jar.version" value="13.2.0" />
- <param name="file.version" value="13.2.0" />
- </antcall>
- <!-- fess-ds-box -->
- <antcall target="install.plugin.jar">
- <param name="repo.url" value="${maven.release.repo.url}" />
- <param name="jar.groupId" value="org/codelibs/fess" />
- <param name="jar.artifactId" value="fess-ds-box" />
- <param name="jar.version" value="13.2.0" />
- <param name="file.version" value="13.2.0" />
- </antcall>
<!-- fess-ds-csv -->
<antcall target="install.plugin.jar">
<param name="repo.url" value="${maven.release.repo.url}" />
<param name="jar.groupId" value="org/codelibs/fess" />
<param name="jar.artifactId" value="fess-ds-csv" />
- <param name="jar.version" value="13.2.0" />
- <param name="file.version" value="13.2.0" />
+ <param name="jar.version" value="13.3.0" />
+ <param name="file.version" value="13.3.0" />
</antcall>
<!-- fess-ds-db -->
<antcall target="install.plugin.jar">
<param name="repo.url" value="${maven.release.repo.url}" />
<param name="jar.groupId" value="org/codelibs/fess" />
<param name="jar.artifactId" value="fess-ds-db" />
- <param name="jar.version" value="13.2.0" />
- <param name="file.version" value="13.2.0" />
- </antcall>
- <!-- fess-ds-dropbox -->
- <antcall target="install.plugin.jar">
- <param name="repo.url" value="${maven.release.repo.url}" />
- <param name="jar.groupId" value="org/codelibs/fess" />
- <param name="jar.artifactId" value="fess-ds-dropbox" />
- <param name="jar.version" value="13.2.0" />
- <param name="file.version" value="13.2.0" />
- </antcall>
- <!-- fess-ds-elasticsearch -->
- <antcall target="install.plugin.jar">
- <param name="repo.url" value="${maven.release.repo.url}" />
- <param name="jar.groupId" value="org/codelibs/fess" />
- <param name="jar.artifactId" value="fess-ds-elasticsearch" />
- <param name="jar.version" value="13.2.0" />
- <param name="file.version" value="13.2.0" />
- </antcall>
- <!-- fess-ds-gitbucket -->
- <antcall target="install.plugin.jar">
- <param name="repo.url" value="${maven.release.repo.url}" />
- <param name="jar.groupId" value="org/codelibs/fess" />
- <param name="jar.artifactId" value="fess-ds-gitbucket" />
- <param name="jar.version" value="13.2.0" />
- <param name="file.version" value="13.2.0" />
- </antcall>
- <!-- fess-ds-gsuite -->
- <antcall target="install.plugin.jar">
- <param name="repo.url" value="${maven.release.repo.url}" />
- <param name="jar.groupId" value="org/codelibs/fess" />
- <param name="jar.artifactId" value="fess-ds-gsuite" />
- <param name="jar.version" value="13.2.0" />
- <param name="file.version" value="13.2.0" />
- </antcall>
- <!-- fess-ds-json -->
- <antcall target="install.plugin.jar">
- <param name="repo.url" value="${maven.release.repo.url}" />
- <param name="jar.groupId" value="org/codelibs/fess" />
- <param name="jar.artifactId" value="fess-ds-json" />
- <param name="jar.version" value="13.2.0" />
- <param name="file.version" value="13.2.0" />
- </antcall>
- <!-- fess-ds-office365 -->
- <antcall target="install.plugin.jar">
- <param name="repo.url" value="${maven.release.repo.url}" />
- <param name="jar.groupId" value="org/codelibs/fess" />
- <param name="jar.artifactId" value="fess-ds-office365" />
- <param name="jar.version" value="13.2.0" />
- <param name="file.version" value="13.2.0" />
- </antcall>
- <!-- fess-ds-slack -->
- <antcall target="install.plugin.jar">
- <param name="repo.url" value="${maven.release.repo.url}" />
- <param name="jar.groupId" value="org/codelibs/fess" />
- <param name="jar.artifactId" value="fess-ds-slack" />
- <param name="jar.version" value="13.2.0" />
- <param name="file.version" value="13.2.0" />
+ <param name="jar.version" value="13.3.0" />
+ <param name="file.version" value="13.3.0" />
</antcall>
</target>
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
index e479e3de1..319a8e35f 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -1430,7 +1430,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. homeDirectory */
String LDAP_ATTR_HOME_DIRECTORY = "ldap.attr.homeDirectory";
- /** The key of the configuration. e.g. https://repo.maven.apache.org/maven2/org/codelibs/fess/,https://oss.sonatype.org/content/repositories/snapshots/org/codelibs/fess/ */
+ /** The key of the configuration. e.g. https://repo.maven.apache.org/maven2/org/codelibs/fess/ */
String PLUGIN_REPOSITORIES = "plugin.repositories";
/** The key of the configuration. e.g. */
@@ -5939,8 +5939,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'plugin.repositories'. <br>
- * The value is, e.g. https://repo.maven.apache.org/maven2/org/codelibs/fess/,https://oss.sonatype.org/content/repositories/snapshots/org/codelibs/fess/ <br>
- * comment: ------
+ * The value is, e.g. https://repo.maven.apache.org/maven2/org/codelibs/fess/ <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getPluginRepositories();
@@ -8775,9 +8774,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.LDAP_ATTR_UID_NUMBER, "uidNumber");
defaultMap.put(FessConfig.LDAP_ATTR_GID_NUMBER, "gidNumber");
defaultMap.put(FessConfig.LDAP_ATTR_HOME_DIRECTORY, "homeDirectory");
- defaultMap
- .put(FessConfig.PLUGIN_REPOSITORIES,
- "https://repo.maven.apache.org/maven2/org/codelibs/fess/,https://oss.sonatype.org/content/repositories/snapshots/org/codelibs/fess/");
+ defaultMap.put(FessConfig.PLUGIN_REPOSITORIES, "https://repo.maven.apache.org/maven2/org/codelibs/fess/");
defaultMap.put(FessConfig.PLUGIN_VERSION_FILTER, "");
defaultMap.put(FessConfig.lasta_di_SMART_DEPLOY_MODE, "hot");
defaultMap.put(FessConfig.DEVELOPMENT_HERE, "true");
diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties
index bd4ab05ed..cb8795cb3 100644
--- a/src/main/resources/fess_config.properties
+++ b/src/main/resources/fess_config.properties
@@ -705,5 +705,6 @@ ldap.attr.homeDirectory=homeDirectory
# ----------------------------------------------------------
# Scheduler
# ------
-plugin.repositories=https://repo.maven.apache.org/maven2/org/codelibs/fess/,https://oss.sonatype.org/content/repositories/snapshots/org/codelibs/fess/
+#plugin.repositories=https://repo.maven.apache.org/maven2/org/codelibs/fess/,https://oss.sonatype.org/content/repositories/snapshots/org/codelibs/fess/
+plugin.repositories=https://repo.maven.apache.org/maven2/org/codelibs/fess/
plugin.version.filter=
--
GitLab