You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2021/03/09 21:15:03 UTC
[jspwiki] 02/07: Implemented par of the suggestion of JSPWIKI-1146
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 0cd9d3b15417e5af1f01d3587f03bc932b607a61
Author: AF090536 <jf...@allfunds.com>
AuthorDate: Mon Feb 22 12:21:11 2021 +0100
Implemented par of the suggestion of JSPWIKI-1146
---
LICENSE | 1 +
.../cloudformation/index-and-datasource.yaml | 16 ++++++++++++++++
jspwiki-kendra-searchprovider/pom.xml | 1 -
pom.xml | 7 +++++++
4 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/LICENSE b/LICENSE
index 30f2474..4414c0e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -249,6 +249,7 @@ tika-parsers-1.25.jar LICENSE
xml-apis-1.4.01 LICENSE
xmlrpc-2.0.1.jar LICENSE
xpp3-1.1.3.4-RC3 ./jspwiki-war/src/main/config/doc/LICENSE.cc-cod
+aws-java-sdk-kendra-1.11.954.jar LICENSE
TEST LIBRARY LICENSE FILE
=============================================================================================================
diff --git a/jspwiki-kendra-searchprovider/cloudformation/index-and-datasource.yaml b/jspwiki-kendra-searchprovider/cloudformation/index-and-datasource.yaml
index 9bc0f02..7715cad 100644
--- a/jspwiki-kendra-searchprovider/cloudformation/index-and-datasource.yaml
+++ b/jspwiki-kendra-searchprovider/cloudformation/index-and-datasource.yaml
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
AWSTemplateFormatVersion: '2010-09-09'
Transform: AWS::Serverless-2016-10-31
Description: >
diff --git a/jspwiki-kendra-searchprovider/pom.xml b/jspwiki-kendra-searchprovider/pom.xml
index f6d295a..7fbfa6c 100644
--- a/jspwiki-kendra-searchprovider/pom.xml
+++ b/jspwiki-kendra-searchprovider/pom.xml
@@ -97,7 +97,6 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-kendra</artifactId>
- <version>1.11.954</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index cbe1326..6fef854 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
<akismet-java.version>1.02</akismet-java.version>
<awaitility.version>4.0.3</awaitility.version>
+ <aws-java-sdk-kendra.version>1.11.954</aws-java-sdk-kendra.version>
<commons-collections.version>4.4</commons-collections.version>
<commons-fileupload.version>1.4</commons-fileupload.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
@@ -141,6 +142,12 @@
<dependencies> <!-- ordered alphabetically by scope:groupId:artifactId -->
<!-- compile dependencies -->
<dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-kendra</artifactId>
+ <version>${aws-java-sdk-kendra.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.codeborne</groupId>
<artifactId>selenide</artifactId>
<version>${selenide.version}</version>