Merge branch 'release/v1.7.1-1'

cloudogu · Mar 31, 2023 · a734bde · a734bde
2 parents 0a54260 + d8d59da
commit a734bde
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.7.1-1] - 2023-03-31
+### Fixed
+- [#209] Fix execution of tests in build process
+
 ## [v1.7.0-1] - 2023-03-31
 ### Fixed
 - [#207] Eliminate CVEs by upgrading various packages:

diff --git a/Dockerfile b/Dockerfile
@@ -18,8 +18,8 @@ RUN set -x \
 
 FROM registry.cloudogu.com/official/java:17.0.6-1
 LABEL NAME="official/smeagol" \
-      VERSION="1.7.0-1" \
-      maintainer="Sebastian Sdorra <sebastian.sdorra@cloudogu.com>"
+      VERSION="1.7.1-1" \
+      maintainer="hello@cloudogu.com"
 
 ENV SERVICE_TAGS=webapp \
     SMEAGOL_HOME=/var/lib/smeagol

diff --git a/dogu.json b/dogu.json
@@ -1,6 +1,6 @@
 {
   "Name": "official/smeagol",
-  "Version": "1.7.0-1",
+  "Version": "1.7.1-1",
   "DisplayName": "Smeagol",
   "Description": "Store your technical documentation with in your git repositories",
   "Category": "Development Apps",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "smeagol",
-  "version": "1.7.0-1",
+  "version": "1.7.1-1",
   "private": true,
   "dependencies": {
     "ces-theme": "https://github.com/cloudogu/ces-theme.git#39ad0799afc9e3f4a888192c6cd27b16f7161a84",

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.cloudogu.wiki</groupId>
     <artifactId>smeagol</artifactId>
-    <version>1.7.0-1</version>
+    <version>1.7.1-1</version>
     <name>smeagol</name>
     <packaging>war</packaging>
 
@@ -93,6 +93,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-engine</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- git client -->
@@ -315,13 +325,11 @@
 
         <pluginManagement>
             <plugins>
-
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.4</version>
+                    <version>0.8.8</version>
                 </plugin>
-
             </plugins>
         </pluginManagement>
 

diff --git a/src/test/java/com/cloudogu/smeagol/repository/infrastructure/RepositoryControllerTest.java b/src/test/java/com/cloudogu/smeagol/repository/infrastructure/RepositoryControllerTest.java
@@ -17,7 +17,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -91,10 +90,10 @@ public void findById() throws Exception {
                 .andExpect(jsonPath("$.id", is("4xQfahsId3")))
                 .andExpect(jsonPath("$.name", is("hitchhiker/heartOfGold")))
                 .andExpect(jsonPath("$._links.self.href", is("http://localhost/api/v1/repositories/4xQfahsId3")))
-                .andExpect(jsonPath("$._embedded.branches.[0].name", is("develop")))
-                .andExpect(jsonPath("$._embedded.branches.[0]._links.self.href", is("http://localhost/api/v1/repositories/4xQfahsId3/branches/develop")))
-                .andExpect(jsonPath("$._embedded.branches.[1].name", is("master")))
-                .andExpect(jsonPath("$._embedded.branches.[1]._links.self.href", is("http://localhost/api/v1/repositories/4xQfahsId3/branches/master")));
+                .andExpect(jsonPath("$._embedded.branches._embedded.branchResourceList[0].name", is("develop")))
+                .andExpect(jsonPath("$._embedded.branches._embedded.branchResourceList[0]._links.self.href", is("http://localhost/api/v1/repositories/4xQfahsId3/branches/develop")))
+                .andExpect(jsonPath("$._embedded.branches._embedded.branchResourceList[1].name", is("master")))
+                .andExpect(jsonPath("$._embedded.branches._embedded.branchResourceList[1]._links.self.href", is("http://localhost/api/v1/repositories/4xQfahsId3/branches/master")));
     }
 
     @Test

diff --git a/src/test/java/com/cloudogu/smeagol/wiki/infrastructure/ScmGitDirectoryRepositoryTest.java b/src/test/java/com/cloudogu/smeagol/wiki/infrastructure/ScmGitDirectoryRepositoryTest.java
@@ -7,8 +7,10 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.io.File;
 import java.io.IOException;
@@ -18,6 +20,7 @@
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.when;
 
+@RunWith(MockitoJUnitRunner.class)
 public class ScmGitDirectoryRepositoryTest {
 
     @Rule

diff --git a/src/test/java/com/cloudogu/smeagol/wiki/infrastructure/TimeBasedPullChangesStrategyTest.java b/src/test/java/com/cloudogu/smeagol/wiki/infrastructure/TimeBasedPullChangesStrategyTest.java
@@ -1,7 +1,7 @@
 package com.cloudogu.smeagol.wiki.infrastructure;
 
 import com.cloudogu.smeagol.wiki.domain.WikiId;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import static com.cloudogu.smeagol.wiki.DomainTestData.WIKI_ID_42;
 import static org.assertj.core.api.Assertions.assertThat;