Merge branch 'develop'

Norconex · Aug 29, 2016 · fe7f609 · fe7f609
2 parents 130cea5 + 65b5210
commit fe7f609
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 17 deletions.
diff --git a/norconex-committer-cloudsearch/pom.xml b/norconex-committer-cloudsearch/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.norconex.collectors</groupId>
   <artifactId>norconex-committer-cloudsearch</artifactId>
-  <version>1.0.1</version>
+  <version>1.1.0</version>
   <name>Norconex Committer CloudSearch</name>
   <description>Amazon CloudSaerch implementation of Norconex Committer.</description>
 
@@ -55,7 +55,7 @@
     <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk-cloudsearch</artifactId>
-        <version>1.10.69</version>
+        <version>1.11.29</version>
     </dependency>
     <dependency>
         <groupId>org.json</groupId>
@@ -65,7 +65,7 @@
     <dependency>
         <groupId>com.norconex.collectors</groupId>
         <artifactId>norconex-committer-core</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.5</version>
     </dependency>
   </dependencies>
 
@@ -74,13 +74,28 @@
       <dependency>
         <groupId>com.norconex.commons</groupId>
         <artifactId>norconex-commons-lang</artifactId>
-        <version>1.9.1</version>
+        <version>1.12.0</version>
       </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.6</version>
+      </dependency>      
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
         <version>4.5.2</version>
-      </dependency>    
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>4.4.5</version>
+      </dependency>      
+      <dependency>
+        <groupId>joda-time</groupId>
+        <artifactId>joda-time</artifactId>
+        <version>2.9.4</version>
+      </dependency>      
     </dependencies>
   </dependencyManagement>
 
@@ -163,6 +178,7 @@
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
+          <encoding>UTF-8</encoding>
         </configuration>
       </plugin> 
       <plugin>
@@ -210,8 +226,14 @@
         <configuration>
           <overview>${basedir}/src/main/javadoc/overview.html</overview>
           <show>protected</show>
-          <detectLinks>true</detectLinks>
+          <nodeprecated>false</nodeprecated>
           <source>1.7</source>
+          <detectLinks>false</detectLinks>
+          <links>
+            <link>https://www.norconex.com/product/commons-lang/apidocs/</link>
+            <link>https://www.norconex.com/collectors/committer-core/latest/apidocs/</link>
+            <link>https://commons.apache.org/proper/commons-configuration/javadocs/v1.10/apidocs/</link>
+          </links>
         </configuration>
         <executions>
           <execution>
@@ -246,6 +268,14 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.6</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
         <executions>
           <execution>
             <goals>
@@ -327,6 +357,7 @@
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <version>2.7</version>
         <configuration>
+          <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
         </configuration>
         <reportSets>
@@ -345,7 +376,7 @@
           <header><![CDATA[
             <style>div.aboutLanguage .siteLink {font-size: 2em;}</style>
             <span class="siteLink">
-              <a target="_top" href="http://www.norconex.com/product/committer-cloudsearch">Norconex CloudSearch Committer</a>
+              <a target="_top" href="https://www.norconex.com/product/committer-cloudsearch">Norconex CloudSearch Committer</a>
             </span>
             ]]>
           </header>
@@ -363,11 +394,18 @@
             </script>
             <a style="font-size: 1.4em;" target="_top" href="https://github.com/norconex/committer-cloudsearch/issues">Submit an Issue</a>
             &nbsp;&nbsp;|&nbsp;&nbsp; 
-            <a style="font-size: 1.4em;" target="_top" href="http://www.norconex.com">www.norconex.com</a>
+            <a style="font-size: 1.4em;" target="_top" href="https://www.norconex.com">www.norconex.com</a>
             ]]>
           </footer>          
           <show>protected</show>
-          <detectLinks>true</detectLinks>
+          <nodeprecated>false</nodeprecated>
+          <source>1.7</source>
+          <detectLinks>false</detectLinks>          
+          <links>
+            <link>https://www.norconex.com/product/commons-lang/apidocs/</link>
+            <link>https://www.norconex.com/collectors/committer-core/latest/apidocs/</link>
+            <link>https://commons.apache.org/proper/commons-configuration/javadocs/v1.10/apidocs/</link>
+          </links>          
         </configuration>
         <reportSets>
           <reportSet>
@@ -386,7 +424,7 @@
   <url>http://norconex.com/product/committer-cloudsearch/</url>
   <organization>
     <name>Norconex Inc.</name>
-    <url>http://www.norconex.com</url>
+    <url>https://www.norconex.com</url>
   </organization>
   <scm>
     <url>https://github.com/Norconex/committer-cloudsearch</url>
@@ -404,7 +442,7 @@
         <name>Pascal Essiembre</name>
         <email>[email protected]</email>
         <organization>Norconex Inc.</organization>
-        <organizationUrl>http://www.norconex.com</organizationUrl>
+        <organizationUrl>https://www.norconex.com</organizationUrl>
         <roles>
           <role>project leader</role>
           <role>developer</role>
@@ -416,7 +454,7 @@
         <name>El Hebri Khiari</name>
         <email>[email protected]</email>
         <organization>Norconex Inc.</organization>
-        <organizationUrl>http://www.norconex.com</organizationUrl>
+        <organizationUrl>https://www.norconex.com</organizationUrl>
         <roles>
           <role>developer</role>
         </roles>

diff --git a/norconex-committer-cloudsearch/src/changes/changes.xml b/norconex-committer-cloudsearch/src/changes/changes.xml
@@ -7,6 +7,21 @@
   </properties>
   <body>
 
+    <release version="1.1.0" date="2016-08-29" description="Feature release">
+      <action dev="essiembre" type="add">
+        Now ships with new install script that automates copying of dependent 
+        libraries, taking into account possible version conflicts.
+      </action>
+      <action dev="essiembre" type="update">
+        Dependency updates: Norconex Committer Core 2.0.5,  
+        Norconex Commons Lang 1.12.0, Apache HttpCore 4.4.5, Joda Time 2.9.4,
+        Apache Commons Lang 2.6, AWS CloudSearch SDK 1.11.29.
+      </action>
+      <action dev="essiembre" type="fix">
+        Remove invalid warning about target id which cannot be changed.
+      </action>
+    </release>
+
     <release version="1.0.1" date="2016-08-19" description="Bugfix release">
       <action dev="essiembre" type="update">
         Dependency update: Norconex Commons Lang 1.9.1.

diff --git a/norconex-committer-cloudsearch/src/main/assembly/NOTICE.txt b/norconex-committer-cloudsearch/src/main/assembly/NOTICE.txt
@@ -8,7 +8,7 @@ For any inquiries about Norconex CloudSearch Committer, please contact
 Norconex Inc. at [email protected].
 
 This product website and documentation is located at:
-http://www.norconex.com/collectors/committer-cloudsearch/
+https://www.norconex.com/collectors/committer-cloudsearch/
 
 Norconex licenses:
 ==================

diff --git a/norconex-committer-cloudsearch/src/main/assembly/dist.xml b/norconex-committer-cloudsearch/src/main/assembly/dist.xml
@@ -23,6 +23,13 @@
   <includeSiteDirectory>false</includeSiteDirectory>
 
   <fileSets>
+    <fileSet>
+      <directory>${basedir}/src/main/scripts</directory>
+      <includes>
+        <include>**</include>
+      </includes>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
     <fileSet>
       <directory>${basedir}/src/main/assembly/</directory>
       <includes>

diff --git a/...er-cloudsearch/src/main/java/com/norconex/committer/cloudsearch/CloudSearchCommitter.java b/...er-cloudsearch/src/main/java/com/norconex/committer/cloudsearch/CloudSearchCommitter.java
@@ -57,7 +57,7 @@
  * CloudSearch. For enhanced security, it is best to use one of the methods
  * described in {@link DefaultAWSCredentialsProviderChain} for setting them
  * (environment variables, system properties, profile file, etc). 
- * Do not explicitely set "accessKey" and "secretKey" on this class relying on
+ * Do not explicitly set "accessKey" and "secretKey" on this class relying on
  * safer methods.
  * 
  * <h3>XML configuration usage:</h3>
@@ -211,7 +211,7 @@ public void setSecretKey(String secretKey) {
      */
     @Override
     public void setTargetReferenceField(String targetReferenceField) {
-        if (StringUtils.isNotBlank(targetReferenceField)) {
+        if (!TEMP_TARGET_ID_FIELD.equals(targetReferenceField)) {
             LOG.warn("Target reference field is always \"id\" "
                     + "and cannot be changed.");
         }

diff --git a/norconex-committer-cloudsearch/src/main/javadoc/overview.html b/norconex-committer-cloudsearch/src/main/javadoc/overview.html
@@ -2,9 +2,9 @@
 
 <div style="text-align: center; font-weight: bold;">
 &nbsp;&nbsp;&nbsp;&nbsp;
-<a target="_top" href="http://www.norconex.com/collectors/committer-cloudsearch/">Web Site</a>
+<a target="_top" href="https://www.norconex.com/collectors/committer-cloudsearch/">Web Site</a>
 &nbsp;&nbsp;|&nbsp;&nbsp; 
-<a target="_top" href="http://www.norconex.com/collectors/committer-cloudsearch/support">Support</a>
+<a target="_top" href="https://www.norconex.com/collectors/committer-cloudsearch/support">Support</a>
 &nbsp;&nbsp;|&nbsp;&nbsp; 
 <a target="_top" href="https://github.com/norconex/committer-cloudsearch/issues">Issues</a>
 </div>

diff --git a/norconex-committer-cloudsearch/src/main/scripts/install.bat b/norconex-committer-cloudsearch/src/main/scripts/install.bat
@@ -0,0 +1,24 @@
+@echo off
+cd %~dp0
+
+echo.
+echo PLEASE READ CAREFULLY
+echo.
+echo To install this component and its dependencies into another product, 
+echo please specify the target product directory where libraries (.jar files)
+echo can be found.
+echo.
+echo This is often a "lib" directory. For example, to install this component  
+echo into the Norconex HTTP Collector, specify the full path to the Collector
+echo "lib" directory, which may look somewhat like this:
+echo. 
+echo    C:\MyProject\norconex-collector-http-x.x.x\lib
+echo.
+echo If .jar duplicates are found, you will be asked how you wish to deal with
+echo them. It is recommended to try keep most recent versions upon encountering
+echo version conflicts. When in doubt, simply choose the default option.
+echo.
+
+java -Dfile.encoding=UTF8 -cp "./lib/*" com.norconex.commons.lang.jar.JarCopier ./lib
+
+pause
diff --git a/norconex-committer-cloudsearch/src/main/scripts/install.sh b/norconex-committer-cloudsearch/src/main/scripts/install.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+cd $(dirname $0)
+
+echo ""
+echo "PLEASE READ CAREFULLY"
+echo ""
+echo "To install this component and its dependencies into another product,"
+echo "please specify the target product directory where libraries (.jar files)"
+echo "can be found."
+echo ""
+echo "This is often a "lib" directory. For example, to install this component"
+echo "into the Norconex HTTP Collector, specify the full path to the Collector"
+echo "\"lib\" directory, which may look somewhat like this:"
+echo ""
+echo "   /myProject/norconex-collector-http-x.x.x/lib"
+echo ""
+echo "If .jar duplicates are found, you will be asked how you wish to deal with"
+echo "them. It is recommended to try keep most recent versions upon encountering"
+echo "version conflicts. When in doubt, simply choose the default option."
+echo ""
+
+java -Dfile.encoding=UTF8 -cp "./lib/*" com.norconex.commons.lang.jar.JarCopier "./lib"