Merge pull request #47 from clarin-eric/3.0.0-rc1

3.0.0 rc1

.gitignore

@@ -1,34 +1,4 @@
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
 /target/
-
-# Intellij files
-*iml
-.idea/
-
-# for running in docker locally
-docker/
-copy.sh
-/.classpath
 /.project
+/.classpath
+/.settings/

crawler-conf.yaml

@@ -41,7 +41,7 @@ config:
     - http.method.head
 
   http.agent.name: "${ENV-HTTP_AGENT_NAME}"
-  http.agent.version: "${version}"
+  http.agent.version: 3.0.0
 #  http.agent.description: "${ENV-HTTP_AGENT_DESCRIPTION}"
   http.agent.url: "${ENV-HTTP_AGENT_URL}"
 #  http.agent.email: "${ENV-HTTP_AGENT_EMAIL}"
@@ -112,7 +112,7 @@ config:
   #your SPRING configuration properties go here
   SPRING:
     spring.datasource.url: "${ENV-DATABASE_URI}"
-    spring.datasource.username: "${ENV-DATABASE_USERNAME}"
+    spring.datasource.username: "${ENV-DATABASE_USER}"
     spring.datasource.password: "${ENV-DATABASE_PASSWORD}"
     spring.datasource.driver-class-name: org.mariadb.jdbc.Driver
     spring.jpa.show-sql: false

pom.xml

@@ -2,14 +2,14 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>eu.clarin.cmdi</groupId>
    <artifactId>linkchecker</artifactId>
-   <version>3.0.0-SNAPSHOT</version>
+   <version>3.0.0</version>
    <packaging>jar</packaging>
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <storm.version>2.4.0</storm.version>
       <stormcrawler.version>2.4</stormcrawler.version>
       <lombok.version>1.18.24</lombok.version>
-      <linkchecker-persistence.version>0.0.2-SNAPSHOT</linkchecker-persistence.version>
+      <linkchecker-persistence.version>0.0.2</linkchecker-persistence.version>
    </properties>
    <distributionManagement>
       <snapshotRepository>
@@ -28,8 +28,8 @@
             <artifactId>maven-compiler-plugin</artifactId>
             <version>3.2</version>
             <configuration>
-               <source>11</source>
-               <target>11</target>
+               <source>17</source>
+               <target>17</target>
             </configuration>
          </plugin>
          <plugin>
@@ -192,6 +192,11 @@
       		</exclusion>
       	</exclusions>
       </dependency>
+      <dependency>
+      	<groupId>org.mariadb.jdbc</groupId>
+      	<artifactId>mariadb-java-client</artifactId>
+      	<version>3.1.2</version>
+      </dependency>
    </dependencies>
    <repositories>
       <repository>

src/main/java/eu/clarin/linkchecker/config/ApplicationConfig.java

@@ -6,9 +6,9 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
-@ComponentScan(basePackages = {"eu.clarin.cmdi.cpa"})
-@EnableJpaRepositories("eu.clarin.cmdi.cpa.repository")
-@EntityScan("eu.clarin.cmdi.cpa.model")
+@ComponentScan(basePackages = {"eu.clarin.linkchecker.persistence"})
+@EnableJpaRepositories("eu.clarin.linkchecker.persistence.repository")
+@EntityScan("eu.clarin.linkchecker.persistence.model")
 @EnableAutoConfiguration
 @Configuration
 public class ApplicationConfig {