Fix the build for the Apple M1 CPU (#1865)

* fix dependencies for Apple M1. * Define node and npm versions in parent pom Co-authored-by: Stephan Köninger <stephan.koeninger@codecentric.de>
codecentric · Nov 26, 2021 · 38a73b9 · 38a73b9
1 parent 0670a25
commit 38a73b9
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -42,6 +42,7 @@
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
         <awaitility.version>4.1.0</awaitility.version>
         <testcontainers.version>1.16.0</testcontainers.version>
+        <jetty.version>9.4.44.v20210927</jetty.version>
 
         <!-- plugin versions -->
         <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
@@ -69,6 +70,8 @@
         <checkstyle.version>9.0</checkstyle.version>
         <spring-javaformat-checkstyle.version>0.0.28</spring-javaformat-checkstyle.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
+        <node.version>v15.14.0</node.version>
+        <npm.version>7.20.3</npm.version>
     </properties>
     <modules>
         <module>spring-boot-admin-server</module>

diff --git a/spring-boot-admin-build/pom.xml b/spring-boot-admin-build/pom.xml
@@ -42,6 +42,11 @@
                 <artifactId>wiremock-jre8-standalone</artifactId>
                 <version>${wiremock.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.tomakehurst</groupId>
+                <artifactId>wiremock-jre8</artifactId>
+                <version>${wiremock.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.hazelcast</groupId>
                 <artifactId>hazelcast</artifactId>

diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-custom-ui/pom.xml b/spring-boot-admin-samples/spring-boot-admin-sample-custom-ui/pom.xml
@@ -41,8 +41,8 @@
                             <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v15.6.0</nodeVersion>
-                            <npmVersion>7.4.0</npmVersion>
+                            <nodeVersion>${node.version}</nodeVersion>
+                            <npmVersion>${npm.version}</npmVersion>
                         </configuration>
                     </execution>
                     <execution>

diff --git a/...ng-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/resources/application.yml b/...ng-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/resources/application.yml
@@ -53,7 +53,6 @@ spring:
 ---
 # see readme of spring-boot-admin-server-ui
 spring:
-  profiles: dev
   boot:
     admin:
       ui:
@@ -63,6 +62,9 @@ spring:
         resource-locations: file:../../spring-boot-admin-server-ui/target/dist/
         cache-templates: false
         extension-resource-locations: file:../spring-boot-admin-sample-custom-ui/target/dist/
+  config:
+    activate:
+      on-profile: dev
 
 ---
 
@@ -78,13 +80,17 @@ spring:
 
 ---
 spring:
-  profiles: insecure
+  config:
+    activate:
+      on-profile: insecure
 
 info.tags.security: insecure
 
 ---
 spring:
-  profiles: secure
+  config:
+    activate:
+      on-profile: secure
   security:
     user:
       name: "user"

diff --git a/spring-boot-admin-server-ui/package-lock.json b/spring-boot-admin-server-ui/package-lock.json
diff --git a/spring-boot-admin-server-ui/pom.xml b/spring-boot-admin-server-ui/pom.xml
@@ -80,8 +80,8 @@
                             <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v15.14.0</nodeVersion>
-                            <npmVersion>7.20.3</npmVersion>
+                            <nodeVersion>${node.version}</nodeVersion>
+                            <npmVersion>${npm.version}</npmVersion>
                         </configuration>
                     </execution>
                     <execution>

diff --git a/spring-boot-admin-server/pom.xml b/spring-boot-admin-server/pom.xml
@@ -129,7 +129,19 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8-standalone</artifactId>
+            <artifactId>wiremock-jre8</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-alpn-server</artifactId>
+            <version>${jetty.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-alpn-openjdk8-server</artifactId>
+            <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/.../java/de/codecentric/boot/admin/server/services/endpoints/ProbeEndpointsStrategyTest.java b/.../java/de/codecentric/boot/admin/server/services/endpoints/ProbeEndpointsStrategyTest.java
@@ -21,13 +21,13 @@
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.Options;
 import com.github.tomakehurst.wiremock.http.Fault;
+import org.eclipse.jetty.http.HttpStatus;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
-import wiremock.org.eclipse.jetty.http.HttpStatus;
 
 import de.codecentric.boot.admin.server.domain.entities.Instance;
 import de.codecentric.boot.admin.server.domain.values.Endpoints;