From d47fb80009f22146780d78e6908ce115ed46f5b9 Mon Sep 17 00:00:00 2001
From: dimitrispie <dpierrakos@gmail.com>
Date: Mon, 27 Mar 2023 12:35:23 +0300
Subject: [PATCH] Fixes

Add javadocs, sources plugins
---
 dump.rdb                            | Bin 92 -> 92 bytes
 pom.xml                             | 149 ++++++++++++++++------------
 src/main/resources/log4j.properties |   6 +-
 3 files changed, 89 insertions(+), 66 deletions(-)
 mode change 100755 => 100644 dump.rdb

diff --git a/dump.rdb b/dump.rdb
old mode 100755
new mode 100644
index a209d38a23c4d9e491f574fc62fac2ce690827ad..a25f17cc1b6bddb1eb43819a8d50114717e53dd3
GIT binary patch
delta 34
qcma!vnP4Ee>)!6<UmT^ysVTa-skw&^gimx7=D6J{`Am0{Ejs`UJ`Sq@

delta 34
qcma!vnP4C&aLPaF7e{GvYKm@dYVM&4!V?{ZIW+bxkG)#6EF1vizYV+q

diff --git a/pom.xml b/pom.xml
index eaf1c9a..418cf11 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,48 +6,48 @@
     <groupId>eu.dnetlib</groupId>
     <artifactId>openaire-usage-stats-api-r5</artifactId>
     <version>3.0.0-SNAPSHOT</version>
-   <!-- <packaging>war</packaging>-->
+    <!-- <packaging>war</packaging>-->
     <parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.0.RELEASE</version>
     </parent>
 
     <dependencies>
         <dependency>
-    <groupId>org.springframework.retry</groupId>
-    <artifactId>spring-retry</artifactId>
-    <version>1.2.0.RELEASE</version>
-    <type>jar</type>
-</dependency>
-<dependency>
-    <groupId>org.springframework</groupId>
-    <artifactId>spring-aspects</artifactId>
-    <version>5.2.9.RELEASE</version>
-</dependency>                
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+            <version>1.2.0.RELEASE</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <version>5.2.9.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-jdbc</artifactId>
             <version>0.13.1</version>
-    <exclusions>
-        <exclusion>
-            <groupId>org.eclipse.jetty.aggregate</groupId>
-            <artifactId>*</artifactId>
-        </exclusion>
-     <exclusion>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-     </exclusion>
-     <exclusion>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>servlet-api</artifactId>
-     </exclusion>
-    </exclusions>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.aggregate</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>eu.dnetlib</groupId>
             <artifactId>openaire-usage-stats-sushilite-r5</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.0</version>
         </dependency>
 
         <dependency>
@@ -123,10 +123,10 @@
             <version>1.7</version>
         </dependency>
 
-<dependency>
-    <groupId>com.cloudera.impala</groupId>
-    <artifactId>jdbc</artifactId>
-    <version>2.5.31</version>
+        <dependency>
+            <groupId>com.cloudera.impala</groupId>
+            <artifactId>jdbc</artifactId>
+            <version>2.5.31</version>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>
@@ -151,31 +151,30 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>libthrift</artifactId>
             <version>0.5.0.0</version>
-         <exclusions>
-          <exclusion>
-           <groupId>javax.servlet</groupId>
-           <artifactId>servlet-api</artifactId>
-          </exclusion>
-         </exclusions>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
         </dependency>
-<dependency>
-       <groupId>javax.servlet</groupId>
-       <artifactId>javax.servlet-api</artifactId>
-       <version>3.1.0</version>
-    </dependency>
-<dependency>
-    <groupId>javax.xml.bind</groupId>
-    <artifactId>jaxb-api</artifactId>
-    <version>2.3.0</version>
-</dependency>
     </dependencies>
 
- <properties>
+    <properties>
         <java.version>1.8</java.version>
         <tomcat.version>8.5.57</tomcat.version>
     </properties>
 
-
     <build>
         <plugins>
             <plugin>
@@ -188,23 +187,49 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <finalName>usagestats_r5</finalName>
     </build>
 
-<!--    <repositories>
-        <repository>
-            <id>spring-releases</id>
-            <url>https://repo.spring.io/libs-release</url>
-        </repository>
-    </repositories>
-
-        <pluginRepositories>
-            <pluginRepository>
+    <!--    <repositories>
+            <repository>
                 <id>spring-releases</id>
                 <url>https://repo.spring.io/libs-release</url>
-            </pluginRepository>
-        </pluginRepositories>
-    -->
+            </repository>
+        </repositories>
+
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>spring-releases</id>
+                    <url>https://repo.spring.io/libs-release</url>
+                </pluginRepository>
+            </pluginRepositories>
+        -->
     <name>openaire-usage-stats-api-r5</name>
 </project>
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index b38208b..828644c 100755
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -10,7 +10,7 @@ log4j.additivity.org.springframework = false
 log4j.appender.R=org.apache.log4j.RollingFileAppender
 #log4j.appender.R.File=/var/log/dnet/usageStatsAPI/usageStatsAPI_R5.log
 #log4j.appender.R.File=/home/dimitris.pierrakos/Sushilite_R5/usageStatsAPI_R5.log
-#log4j.appender.R.File=/Users/dpie/OneDrive/Research/Projects/OpenAIRE Usage Statistics Service/Code/code-repo.d4science.org/Sushilite-R5/usageStatsAPI_R5.log
+#log4j.appender.R.File=/Users/dpie/Onedrive/Github/Sushilite-R5/usageStatsAPI_R5.log
 log4j.appender.R.File=/srv/springboot/9880/usageStatsAPI_R5.log
 loglog4j.appender.R.MaxFileSize=10MB
 log4j.appender.R.MaxBackupIndex=10
@@ -18,10 +18,8 @@ log4j.appender.R.layout=org.apache.log4j.PatternLayout
 log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n
 log4j.appender.S=org.apache.log4j.RollingFileAppender
 #log4j.appender.S.File=/var/log/dnet/usageStatsAPI/usageStatsAPI_R5-spring.log
-#log4j.appender.S.File=/home/dimitris.pierrakos/Sushilite_R5/usageStatsAPI_R5-spring.log
-#log4j.appender.S.File=/Users/dpie/OneDrive/Research/Projects/OpenAIRE Usage Statistics Service/Code/code-repo.d4science.org/Sushilite-R5/usageStatsAPI_R5-spring.log
+#log4j.appender.S.File=/Users/dpie/Onedrive/Github/Sushilite-R5/usageStatsAPI_R5-spring.log
 log4j.appender.S.File=/srv/springboot/9880/usageStatsAPI_R5-spring.log
-#log4j.appender.S.File=/home/dpie/Desktop/usageStatsAPI_R5-spring.log
 log4j.appender.S.MaxFileSize=10MB
 log4j.appender.S.MaxBackupIndex=10
 log4j.appender.S.layout=org.apache.log4j.PatternLayout