Merge pull request #70 from FAIRDataTeam/release/1.1.0

Release 1.1.0

Author: vknaisl

.mvn/maven.config

@@ -0,0 +1,2 @@
+-Drevision=1.1.0
+-Dchangelist=.develop

.travis.yml

@@ -14,77 +14,66 @@ stages:
   - tag
 
 env:
-  - IMAGE="fairdata/fairdatapoint" \
-    IMAGE_TAG="$IMAGE:$TRAVIS_COMMIT" \
-    IMAGE_TAG_BRANCH="$IMAGE:"`echo $TRAVIS_BRANCH | sed 's#/#-#g'` \
+  - PRIVATE_IMAGE="$PRIVATE_DOCKER_REGISTRY/fairdatapoint" \
+    IMAGE="fairdata/fairdatapoint" \
+    IMAGE_TAG="$PRIVATE_IMAGE:$TRAVIS_COMMIT" \
+    IMAGE_TAG_BRANCH="$PRIVATE_IMAGE:"`echo $TRAVIS_BRANCH | sed 's#/#-#g'` \
     IMAGE_TAG_DEVELOP="$IMAGE:develop" \
     IMAGE_TAG_LATEST="$IMAGE:latest"
 
 before_install:
-  # 1. Log to public Docker Hub
+  # 1. Log in to public Docker Hub
   - docker login -u "$PUBLIC_DOCKER_USER" -p "$PUBLIC_DOCKER_PASSWORD"
+  # 2. Log in to private Docker Registry
+  - docker login -u "$PRIVATE_DOCKER_USER" -p "$PRIVATE_DOCKER_PASSWORD" "$PRIVATE_DOCKER_REGISTRY"
 
 jobs:
   include:
     - stage: build
       install:
-        # 1. Install fairmetadata4j
-        - git clone --depth 1 -b $TRAVIS_BRANCH https://github.com/DTL-FAIRData/fairmetadata4j ./fairmetadata4j || git clone --depth 1 -b develop https://github.com/DTL-FAIRData/fairmetadata4j ./fairmetadata4j
-        - cd  ./fairmetadata4j
-        - mvn --quiet --fail-fast install
-        - cd ..
-        # 2. Install Spring Rdf Migration
-        - git clone https://github.com/FAIRDataTeam/spring-rdf-migration.git
-        - cd spring-rdf-migration
-        - mvn --quiet --fail-fast -DskipTests install
-        - cd ..
-        # 3. Install Spring Security ACL Mongo
-        - git clone https://github.com/FAIRDataTeam/spring-security-acl-mongodb
-        - cd spring-security-acl-mongodb
-        - mvn --quiet --fail-fast -DskipTests install
-        - cd ..
-        # 4. Init and check testing Mongo Database
+        # 1. Init and check testing Mongo Database
         - mongo fdp-test --eval 'db.collection.find()'
       script:
-        # 5. Build FAIR Data Point
-        - mvn org.jacoco:jacoco-maven-plugin:prepare-agent test
+        # 2. Build FAIR Data Point
+        - mvn --quiet org.jacoco:jacoco-maven-plugin:prepare-agent test
         - mvn --quiet --fail-fast -DskipTests package
         - docker pull $IMAGE_TAG_DEVELOP
         - docker build --cache-from $IMAGE_TAG_DEVELOP -t $IMAGE_TAG .
         - docker push $IMAGE_TAG
       after_success:
-        - mvn org.jacoco:jacoco-maven-plugin:report coveralls:report
+        - mvn --quiet org.jacoco:jacoco-maven-plugin:report coveralls:report
 
     - stage: tag
       if: (branch = develop) AND (NOT (type IN (pull_request)))
-      install: false
+      install: skip
       script:
         - docker pull $IMAGE_TAG
         - docker image tag $IMAGE_TAG $IMAGE_TAG_DEVELOP
         - docker push $IMAGE_TAG_DEVELOP
 
     - stage: tag
       if: (branch = master) AND (NOT (type IN (pull_request)))
-      install: false
+      install: skip
       script:
         - docker pull $IMAGE_TAG
         - docker image tag $IMAGE_TAG $IMAGE_TAG_LATEST
         - docker push $IMAGE_TAG_LATEST
 
     - stage: tag
       if: (type = push) AND (NOT ((branch =~ ^release) OR (branch =~ ^v\d+\.\d+\.\d+)))
-      install: false
+      install: skip
       script:
         - docker pull $IMAGE_TAG
         - docker image tag $IMAGE_TAG $IMAGE_TAG_BRANCH
         - docker push $IMAGE_TAG_BRANCH
 
     - stage: tag
       if: (tag =~ ^v\d+\.\d+\.\d+$)
-      install: false
+      install: skip
       env:
+        - PRIVATE_IMAGE="$PRIVATE_DOCKER_REGISTRY/fairdatapoint"
         - IMAGE="fairdata/fairdatapoint"
-        - IMAGE_TAG="$IMAGE:$TRAVIS_COMMIT"
+        - IMAGE_TAG="$PRIVATE_IMAGE:$TRAVIS_COMMIT"
         - IMAGE_TAG_MAJOR="$IMAGE:"`echo $TRAVIS_TAG | sed -E "s/v(.*)\..*\..*/\1/g"`
         - IMAGE_TAG_MINOR="$IMAGE:"`echo $TRAVIS_TAG | sed -E "s/v(.*)\..*/\1/g"`
         - IMAGE_TAG_PATCH="$IMAGE:"`echo $TRAVIS_TAG | sed -E "s/v//g"`
@@ -99,10 +88,11 @@ jobs:
 
     - stage: tag
       if: (tag =~ ^v\d+\.\d+\.\d+-rc\.\d+$)
-      install: false
+      install: skip
       env:
+        - PRIVATE_IMAGE="$PRIVATE_DOCKER_REGISTRY/fairdatapoint"
         - IMAGE="fairdata/fairdatapoint"
-        - IMAGE_TAG="$IMAGE:$TRAVIS_COMMIT"
+        - IMAGE_TAG="$PRIVATE_IMAGE:$TRAVIS_COMMIT"
         - IMAGE_TAG_RC="$IMAGE:"`echo $TRAVIS_TAG | sed -E "s/v//g"`
       script:
         - docker pull $IMAGE_TAG

Dockerfile

@@ -26,6 +26,6 @@ FROM openjdk:11-jdk-slim
 WORKDIR /fdp
 
 ADD target/fdp-spring-boot.jar /fdp/app.jar
-ADD target/classes/application-production.yml /fdp/application-production.yml
+ADD target/classes/application-production.yml /fdp/application.yml
 
-ENTRYPOINT java -jar app.jar --spring.profiles.active=production --spring.config.location=classpath:/application.yml,file:/fdp/application-production.yml
+ENTRYPOINT java -jar app.jar --spring.profiles.active=production --spring.config.location=classpath:/application.yml,classpath:/application-production.yml,file:/fdp/application.yml

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>nl.dtls</groupId>
     <artifactId>fairdatapoint</artifactId>
-    <version>1.0.0</version>
+    <version>${revision}${changelist}</version>
     <packaging>jar</packaging>
 
     <name>FairDataPoint</name>
@@ -51,12 +51,12 @@
         <maven.compiler.target>11</maven.compiler.target>
 
         <!-- Project related -->
-        <fairmetadata.version>1.0.0</fairmetadata.version>
-        <spring.rdf.migration.version>1.0.0</spring.rdf.migration.version>
+        <fairmetadata.version>${revision}${changelist}</fairmetadata.version>
+        <spring.rdf.migration.version>1.0.0.RELEASE</spring.rdf.migration.version>
+        <spring.security.acl.mongo.version>5.1.5.RELEASE</spring.security.acl.mongo.version>
 
         <!-- Spring -->
         <spring.boot.handlebars.version>0.3.0</spring.boot.handlebars.version>
-        <spring.security.acl.mongo.version>5.1.5-SNAPSHOT</spring.security.acl.mongo.version>
 
         <!-- Core -->
         <mongobee.version>0.13</mongobee.version>
@@ -79,15 +79,24 @@
         <plugin.jacoco.version>0.7.6.201602180812</plugin.jacoco.version>
         <plugin.coveralls.version>4.3.0</plugin.coveralls.version>
         <plugin.javax_xml_bind.version>2.3.1</plugin.javax_xml_bind.version>
+        <plugin.git_commit_id.version>2.2.4</plugin.git_commit_id.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>nexus-releases</id>
+            <name>Nexus Releases</name>
+            <url>https://toolshed.fair-dtls.surf-hosted.nl/repository/maven-releases/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
 
         <!-- ////////////////// -->
         <!--   Project related  -->
         <!-- ////////////////// -->
         <dependency>
-            <groupId>nl.dtl</groupId>
+            <groupId>nl.dtls</groupId>
             <artifactId>fairmetadata4j</artifactId>
             <version>${fairmetadata.version}</version>
         </dependency>
@@ -130,6 +139,10 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-acl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-acl-mongodb</artifactId>
@@ -322,8 +335,30 @@
                             <mainClass>nl.dtls.fairdatapoint.Application</mainClass>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>build-info</id>
+                        <goals>
+                            <goal>build-info</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>${plugin.git_commit_id.version}</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <verbose>false</verbose>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/nl/dtls/fairdatapoint/api/controller/configuration/ConfigurationController.java

@@ -0,0 +1,47 @@
+/**
+ * The MIT License
+ * Copyright © 2017 DTL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package nl.dtls.fairdatapoint.api.controller.configuration;
+
+import nl.dtls.fairdatapoint.api.dto.configuration.ConfigurationDTO;
+import nl.dtls.fairdatapoint.service.configuration.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/configuration")
+public class ConfigurationController {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @RequestMapping(method = RequestMethod.GET)
+    public ResponseEntity<ConfigurationDTO> getDashboard() {
+        ConfigurationDTO dto = configurationService.getConfiguration();
+        return new ResponseEntity<>(dto, HttpStatus.OK);
+    }
+
+}

src/main/java/nl/dtls/fairdatapoint/api/controller/dashboard/DashboardController.java

@@ -22,7 +22,7 @@
  */
 package nl.dtls.fairdatapoint.api.controller.dashboard;
 
-import nl.dtl.fairmetadata4j.model.FDPMetadata;
+import nl.dtls.fairmetadata4j.model.FDPMetadata;
 import nl.dtls.fairdatapoint.api.controller.metadata.MetadataController;
 import nl.dtls.fairdatapoint.api.dto.dashboard.DashboardCatalogDTO;
 import nl.dtls.fairdatapoint.service.dashboard.DashboardService;

src/main/java/nl/dtls/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java

@@ -27,8 +27,8 @@
  */
 package nl.dtls.fairdatapoint.api.controller.exception;
 
-import nl.dtl.fairmetadata4j.io.MetadataException;
-import nl.dtl.fairmetadata4j.io.MetadataParserException;
+import nl.dtls.fairmetadata4j.io.MetadataException;
+import nl.dtls.fairmetadata4j.io.MetadataParserException;
 import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
 import nl.dtls.fairdatapoint.entity.exception.ForbiddenException;
 import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;

src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/MetadataController.java

@@ -27,7 +27,7 @@
  */
 package nl.dtls.fairdatapoint.api.controller.metadata;
 
-import nl.dtl.fairmetadata4j.model.*;
+import nl.dtls.fairmetadata4j.model.*;
 import nl.dtls.fairdatapoint.api.dto.metadata.*;
 import nl.dtls.fairdatapoint.service.metadata.common.MetadataService;
 import org.eclipse.rdf4j.model.IRI;

src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/catalog/CatalogController.java

@@ -23,9 +23,9 @@
 package nl.dtls.fairdatapoint.api.controller.metadata.catalog;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import nl.dtl.fairmetadata4j.model.CatalogMetadata;
-import nl.dtl.fairmetadata4j.model.DatasetMetadata;
-import nl.dtl.fairmetadata4j.model.FDPMetadata;
+import nl.dtls.fairmetadata4j.model.CatalogMetadata;
+import nl.dtls.fairmetadata4j.model.DatasetMetadata;
+import nl.dtls.fairmetadata4j.model.FDPMetadata;
 import nl.dtls.fairdatapoint.api.controller.metadata.MetadataController;
 import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
 import nl.dtls.fairdatapoint.api.dto.metadata.CatalogMetadataChangeDTO;

src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/catalog/CatalogMemberController.java

@@ -22,7 +22,7 @@
  */
 package nl.dtls.fairdatapoint.api.controller.metadata.catalog;
 
-import nl.dtl.fairmetadata4j.model.CatalogMetadata;
+import nl.dtls.fairmetadata4j.model.CatalogMetadata;
 import nl.dtls.fairdatapoint.api.controller.metadata.MetadataController;
 import nl.dtls.fairdatapoint.api.dto.member.MemberCreateDTO;
 import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;