feat: release v1.7.0

Author: jvanmalder

.gitignore

@@ -10,6 +10,10 @@ build/tmp
 build/publications
 app/build
 app/bin
+base/build
+base/bin
+r-module/build
+r-module/bin
 docker/proxy/logs
 repo/build
 repo/bin
@@ -27,3 +31,7 @@ src/integration-test/resources/itestServer
 src/integration-test/resources/itestSourceFiles
 src/integration-test/resources/itestPdf
 /build/
+repo/target
+app/target
+base/target
+r-module/target

Jenkinsfile

@@ -73,6 +73,10 @@ pipeline {
                         reportDir: 'repo/build/reports/tests/test', reportFiles: 'index.html',
                         reportName: 'Repo Test Report',
                         allowMissing: true, alwaysLinkToLastBuild: true, keepAll: true])
+                    publishHTML([
+                        reportDir: 'r-module/build/reports/tests/test', reportFiles: 'index.html',
+                        reportName: 'R Module Test Report',
+                        allowMissing: true, alwaysLinkToLastBuild: true, keepAll: true])
                     publishHTML([
                         reportDir: 'build/reports', reportFiles: 'dependency-check-report.html',
                         reportName: 'OWASP Dependency Analysis Report',

Makefile

@@ -2,6 +2,8 @@ app:
 	rm -rf ./build/
 	rm -rf ./app/build/
 	rm -rf ./repo/build/
+	rm -rf ./base/build/
+	rm -rf ./r-module/build/
 	./gradlew build -x test -x integrationTest testClasses -x dependencyCheckAggregate #temporary change
 	cp -f ./app/build/libs/rdepot-app*application.war ./docker/app/rdepot.war
 	cp -f ./app/build/libs/rdepot-app*application.war ./src/integration-test/resources/docker/app/rdepot.war

app/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
     dependencies {
         classpath "org.springframework.boot:spring-boot-gradle-plugin:2.5.12"
-        classpath("io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE")
+        classpath("io.spring.gradle:dependency-management-plugin:1.0.14.RELEASE")
     }
 }
 
@@ -53,6 +53,9 @@ test {
 
 dependencies {
 	Map<String, String> dependencies = globalConf.commonDependencies
+	
+	implementation project(':rdepot-r-module')
+	testImplementation project(':rdepot-r-module')
 	implementation dependencies.jsonSimple
 	implementation dependencies.sbStarterWeb
 	implementation dependencies.sbDevTools
@@ -90,41 +93,17 @@ dependencies {
     implementation dependencies.hateoas
     implementation dependencies.jakartaJsonApi
     implementation dependencies.apacheJohnzon
-    implementation dependencies.jakartaJsonProvider
     implementation dependencies.jacksonJSR353
 
     implementation dependencies.commonsCollections4	
     implementation dependencies.apacheCommons
-    
     implementation dependencies.liquibaseCore    
-
-	testImplementation dependencies.sbStarterTest
+	implementation dependencies.reflections	
+	implementation dependencies.mail
 
-	testImplementation dependencies.secTest
-	testImplementation dependencies.jerseyHk2
-	testImplementation dependencies.httpComponents
-	testImplementation dependencies.httpComponentsTest	
-	testImplementation dependencies.junit5Engine
-	testImplementation dependencies.junit5Api
-	testImplementation dependencies.junit5Params
-	testImplementation dependencies.junitVintage
 
 }
 
-sourceSets {
-	test {	
-        java {
-            include '**/eu/openanalytics/rdepot/test/unit/*'
-            include '**/eu/openanalytics/rdepot/test/unit/api/v2/*'
-            include '**/eu/openanalytics/rdepot/test/fixture/*'
-            include '**/eu/openanalytics/rdepot/test/unit/answer/*'
-        	include '**/eu/openanalytics/rdepot/test/unit/time/*'
-        	include '**/eu/openanalytics/rdepot/test/config/*'
-        	include '**/eu/openanalytics/rdepot/test/context/*'
-        }
-	}
-}
-
 publishing {
     publications {
         warFile(MavenPublication) {

app/src/main/java/eu/openanalytics/rdepot/Application.java

@@ -32,18 +32,11 @@
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.web.context.WebApplicationContext;
 
-/**
- * @author jonas
- *
- */
 @SpringBootApplication
 @EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})
 @EnableConfigurationProperties(KeycloakSpringBootProperties.class)
 public class Application extends SpringBootServletInitializer {	
-	
-	/**
-	 * @param args
-	 */
+
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
 	}