Merge pull request #2160 from openturing/0.3.9

0.3.9
openturing · Oct 2, 2024 · f1e822c · f1e822c
2 parents 8dafd01 + 174f30e
commit f1e822c
Show file tree

Hide file tree

Showing 27 changed files with 558 additions and 181 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -39,6 +39,9 @@ updates:
       interval: "weekly"
     target-branch: "0.3.9"
     open-pull-requests-limit: 15
+    ignore:
+      - dependency-name: "typescript"
+      - dependency-name: "styled-components"
     groups:
       react:
         applies-to: version-updates

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -66,4 +66,5 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           javadoc-branch: javadoc
           java-version: 21
-          target-folder: docs
+          target-folder: docs/0.3.9/javadoc
+          javadoc-source-folder: target/reports/apidocs
diff --git a/README.adoc b/README.adoc
@@ -11,7 +11,7 @@ image:https://img.shields.io/github/license/openturing/turing.svg?style=for-the-
 image:https://img.shields.io/github/last-commit/openturing/turing.svg?style=for-the-badge&logo=java)[GitHub last commit]
 image:https://img.shields.io/github/actions/workflow/status/openturing/turing/build.yml?branch=0.3.9&style=for-the-badge&logo=GitHub[link="https://github.com/openturing/turing/actions/workflows/build.yml"]
 image:https://img.shields.io/badge/Sonar-Code%20Quality-brightgreen?style=for-the-badge&logo=SonarCloud[link="https://sonarcloud.io/organizations/viglet-turing/projects"]
-image:https://img.shields.io/badge/Javadoc-Release%20{viglet-version}-orange?style=for-the-badge&logo=OpenJDK[link="https://openturing.github.io/turing/javadoc/"]
+image:https://img.shields.io/badge/Javadoc-Release%20{viglet-version}-brightgreen?style=for-the-badge&logo=OpenJDK[link="https://openturing.github.io/turing/{viglet-version}/javadoc/"]
 
 == Preface
 

diff --git a/pom.xml b/pom.xml
@@ -23,24 +23,51 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.10.0</version>
                 <configuration>
                     <!-- Default configuration for all reports -->
                     <noqualifier>all</noqualifier>
-                    <destDir>javadoc</destDir>
                 </configuration>
                 <executions>
                     <execution>
                         <id>aggregate</id>
                         <goals>
                             <goal>aggregate</goal>
                         </goals>
-                        <configuration>
-                            <destDir>javadoc</destDir>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>4.9.10</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <generateGitPropertiesFile>false</generateGitPropertiesFile>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <!--suppress UnresolvedMavenProperty -->
+                            <Implementation-Version>${project.version}-${git.commit.id.abbrev} (${git.commit.time})
+                            </Implementation-Version>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -214,12 +241,12 @@
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-core</artifactId>
-                <version>2.24.0</version>
+                <version>2.24.1</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>2.17.2</version>
+                <version>2.18.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents.client5</groupId>

diff --git a/turing-aem/aem-app/src/main/resources/banner.txt b/turing-aem/aem-app/src/main/resources/banner.txt
@@ -0,0 +1,9 @@
+${AnsiColor.BRIGHT_BLUE}   _____         _               _   ___ __  __
+${AnsiColor.BRIGHT_BLUE}  |_   _|  _ _ _(_)_ _  __ _    /_\ | __|  \/  |
+${AnsiColor.BRIGHT_BLUE}    | || || | '_| | ' \/ _` |  / _ \| _|| |\/| |
+${AnsiColor.BRIGHT_BLUE}    |_| \_,_|_| |_|_||_\__, | /_/ \_\___|_|  |_| ${AnsiColor.BRIGHT_WHITE}${application.version}
+${AnsiColor.BRIGHT_BLUE}                       |___/
+
+${AnsiColor.BRIGHT_WHITE}:: Copyright © 2016-2024 Viglet Turing Web Crawler
+
+${AnsiColor.BRIGHT_WHITE}:: Built with Spring Boot :: ${spring-boot.version}
diff --git a/...-aem/aem-cli-indexer/src/main/java/com/viglet/turing/connector/aem/TurAemIndexerTool.java b/...-aem/aem-cli-indexer/src/main/java/com/viglet/turing/connector/aem/TurAemIndexerTool.java
@@ -114,7 +114,10 @@ public class TurAemIndexerTool {
     private AtomicInteger processed = new AtomicInteger(0);
     private AtomicInteger currentPage = new AtomicInteger(0);
 
+
     public static void main(String... argv) {
+        jCommander.getConsole().println("Viglet Turing AEM Indexer Tool. " +
+                TurAemIndexerTool.class.getPackage().getImplementationVersion() );
         TurAemIndexerTool turAEMIndexerTool = new TurAemIndexerTool();
         jCommander.addObject(turAEMIndexerTool);
         try {
@@ -127,7 +130,7 @@ public static void main(String... argv) {
                 jCommander.usage();
                 return;
             }
-            jCommander.getConsole().println("Viglet Turing AEM Indexer Tool.");
+
             turAEMIndexerTool.run();
         } catch (ParameterException e) {
             log.info("Error: {}", e.getLocalizedMessage());

diff --git a/turing-aem/aem-cli-sample/pom.xml b/turing-aem/aem-cli-sample/pom.xml
@@ -13,7 +13,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
-    <jackson.version>2.17.2</jackson.version>
+    <jackson.version>2.18.0</jackson.version>
   </properties>
 
   <dependencies>

diff --git a/turing-aem/aem-commons/pom.xml b/turing-aem/aem-commons/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.17.2</version>
+            <version>2.18.0</version>
         </dependency>
         <dependency>
             <groupId>com.viglet.turing</groupId>

diff --git a/turing-app/pom.xml b/turing-app/pom.xml
@@ -34,22 +34,22 @@
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-core</artifactId>
-            <version>9.11.1</version>
+            <version>9.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-queryparser</artifactId>
-            <version>9.11.1</version>
+            <version>9.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-analysis-common</artifactId>
-            <version>9.11.1</version>
+            <version>9.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-queries</artifactId>
-            <version>9.11.1</version>
+            <version>9.12.0</version>
         </dependency>
         <dependency>
             <groupId>co.elastic.clients</groupId>
@@ -273,7 +273,7 @@
         <dependency>
             <groupId>org.languagetool</groupId>
             <artifactId>language-en</artifactId>
-            <version>6.4</version>
+            <version>6.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.lucene</groupId>
@@ -284,7 +284,7 @@
         <dependency>
             <groupId>org.languagetool</groupId>
             <artifactId>language-pt</artifactId>
-            <version>6.4</version>
+            <version>6.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.lucene</groupId>
@@ -390,37 +390,6 @@
                     <workingDirectory>../turing-ui</workingDirectory>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.9.10</version>
-                <executions>
-                    <execution>
-                        <id>get-the-git-infos</id>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                        <phase>initialize</phase>
-                    </execution>
-                </executions>
-                <configuration>
-                    <generateGitPropertiesFile>false</generateGitPropertiesFile>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <!--suppress UnresolvedMavenProperty -->
-                            <Implementation-Version>${project.version}-${git.commit.id.abbrev} (${git.commit.time})
-                            </Implementation-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -429,7 +398,6 @@
                     <skip>false</skip>
                     <executable>true</executable>
                 </configuration>
-
                 <executions>
                     <execution>
                         <goals>

diff --git a/turing-app/src/main/java/com/viglet/turing/se/TurSEStopWord.java b/turing-app/src/main/java/com/viglet/turing/se/TurSEStopWord.java
@@ -57,7 +57,7 @@ public TurSEStopWord(ResourceLoader resourceloader) {
     private static final String STOP_WORD_CLASS_FILTER = "solr.StopFilterFactory";
     private static final String WORDS_ATTRIBUTE = "words";
     private static final String DEFAULT_STOP_WORD_FILE = "classpath:/solr/conf/lang/stopwords.txt";
-    private static final String APPLICATION_OCTET_STREAM_UTF8 = "application/octet-stream;charset:utf-8";
+    private static final String APPLICATION_OCTET_STREAM_UTF8 = "application/octet-stream;charset=utf-8";
     private static final String ADMIN_FILE_URL = "%s/admin/file?contentType=%s&file=%s";
 
     public List<String> getStopWords(TurSolrInstance turSolrInstance) {