From fab0b03a28cce54b51ff506b0dd1a07fdbd1b2f6 Mon Sep 17 00:00:00 2001 From: mgajda Date: Thu, 2 Dec 2021 13:44:03 -0500 Subject: [PATCH 01/21] Add HubSpot specific build files --- .blazar-enabled | 0 .blazar.yaml | 9 +++++++++ .build-jdk8 | 0 3 files changed, 9 insertions(+) create mode 100644 .blazar-enabled create mode 100644 .blazar.yaml create mode 100644 .build-jdk8 diff --git a/.blazar-enabled b/.blazar-enabled new file mode 100644 index 000000000..e69de29bb diff --git a/.blazar.yaml b/.blazar.yaml new file mode 100644 index 000000000..618a1403a --- /dev/null +++ b/.blazar.yaml @@ -0,0 +1,9 @@ +env: + SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT + MAVEN_ARGS: -DskipTests + +buildpack: + host: git.hubteam.com + organization: HubSpot + repository: Blazar-Buildpack-Java + branch: v2 diff --git a/.build-jdk8 b/.build-jdk8 new file mode 100644 index 000000000..e69de29bb From a3eb395b8025d512f354b5ebfe951205eb001a66 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 09:38:21 -0500 Subject: [PATCH 02/21] Add hubspot specific versions to pom.xml --- pom.xml | 157 ++++---------------------------------------------------- 1 file changed, 10 insertions(+), 147 deletions(-) diff --git a/pom.xml b/pom.xml index 220d43587..1e318b5cb 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,14 @@ 3.0.1 1.6.8 2.7 + 2.8.2 + + + 1.6 + 3.0.0 + 3.1.2 + 3.2.4 + 3.0.0-M1 java-control-plane @@ -102,158 +110,13 @@ - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - - - validate - validate - - buildscripts/checkstyle.xml - true - UTF-8 - true - true - warning - - - check - - - - - - - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - false - true - accessibility,html,reference,syntax - true - false - - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - attach-sources-no-fork - package - - jar-no-fork - - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - jacoco-prepare-ut-agent - - prepare-agent - - - - jacoco-prepare-it-agent - - prepare-agent-integration - - - + maven-deploy-plugin + ${maven.deploy.plugin.version} - - - - ci - - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - true - v@{project.version} - - - - - org.codehaus.mojo - versions-maven-plugin - ${versions-maven-plugin.version} - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - sonatype-nexus-staging - https://oss.sonatype.org/ - true - 20 - - - - - - - signing - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - sign-artifacts - verify - - sign - - - - - - - - From 5fe8a6861ff56a5a1515bbffc3d2c3cf3bdcc7d4 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 09:53:13 -0500 Subject: [PATCH 03/21] More memory --- .blazar.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.blazar.yaml b/.blazar.yaml index 618a1403a..29f16c31e 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,9 +1,14 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests + MAVEN_TEST_HEAP: 1g buildpack: host: git.hubteam.com organization: HubSpot repository: Blazar-Buildpack-Java branch: v2 + + +buildResources: + memoryMb: 1024 From e6db016d05263cca0cbbe01d172edbfb05cafd45 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 10:01:31 -0500 Subject: [PATCH 04/21] More memory --- .blazar.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.blazar.yaml b/.blazar.yaml index 29f16c31e..b03be9816 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,7 +1,7 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests - MAVEN_TEST_HEAP: 1g + MAVEN_TEST_HEAP: 2g buildpack: host: git.hubteam.com @@ -11,4 +11,4 @@ buildpack: buildResources: - memoryMb: 1024 + memoryMb: 3072 From 4f627b87639b70f18f24897802f25fec023295af Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 10:14:26 -0500 Subject: [PATCH 05/21] More memory --- .blazar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.blazar.yaml b/.blazar.yaml index b03be9816..fc9260dad 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -11,4 +11,4 @@ buildpack: buildResources: - memoryMb: 3072 + memoryMb: 5120 From ab1ed4f0f9de8f49f1d6dd8d7389096b563fab59 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 10:22:13 -0500 Subject: [PATCH 06/21] Try new mem arg --- .blazar.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.blazar.yaml b/.blazar.yaml index fc9260dad..38ce2a2d0 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,6 +1,7 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests + MAVEN_OPTS: -Xmx4g MAVEN_TEST_HEAP: 2g buildpack: From 97b9eb1993cce6e8c7e267a1c9bba83196ee3c41 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 10:29:00 -0500 Subject: [PATCH 07/21] More mem --- .blazar.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.blazar.yaml b/.blazar.yaml index 38ce2a2d0..1e0e5b4cc 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,8 +1,8 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests - MAVEN_OPTS: -Xmx4g - MAVEN_TEST_HEAP: 2g + MAVEN_OPTS: -Xmx5g + MAVEN_TEST_HEAP: 5g buildpack: host: git.hubteam.com From 6f73585d08993338ef0dc3f8ab7d4172cbfe34a3 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 10:29:37 -0500 Subject: [PATCH 08/21] More mem --- .blazar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.blazar.yaml b/.blazar.yaml index 1e0e5b4cc..bf9fd2fd5 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -12,4 +12,4 @@ buildpack: buildResources: - memoryMb: 5120 + memoryMb: 8192 From b45cb9fc8835088dc89008100e3ae5d5ca8eb2bc Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 10:29:46 -0500 Subject: [PATCH 09/21] More mem --- .blazar.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.blazar.yaml b/.blazar.yaml index bf9fd2fd5..d0dcc0082 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,8 +1,8 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests - MAVEN_OPTS: -Xmx5g - MAVEN_TEST_HEAP: 5g + MAVEN_OPTS: -Xmx8g + MAVEN_TEST_HEAP: 8g buildpack: host: git.hubteam.com From 60e20fb00a32b3a865f6dead2df41b950e52088e Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 11:11:55 -0500 Subject: [PATCH 10/21] Skips ITs --- .blazar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.blazar.yaml b/.blazar.yaml index d0dcc0082..4d0e6fe82 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,6 +1,6 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT - MAVEN_ARGS: -DskipTests + MAVEN_ARGS: -DskipTests -DskipITs MAVEN_OPTS: -Xmx8g MAVEN_TEST_HEAP: 8g From 109ad62720122f5beaee5b762eb012bcbc6f0c36 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 11:30:27 -0500 Subject: [PATCH 11/21] Non-additive maven opts --- .blazar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.blazar.yaml b/.blazar.yaml index 4d0e6fe82..2b4e257ef 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,7 +1,7 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests -DskipITs - MAVEN_OPTS: -Xmx8g + MAVEN_OPTS: -Xmx8192m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true MAVEN_TEST_HEAP: 8g buildpack: From 605e20071f32a25537a17afdc1784a0021a16637 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 12:24:30 -0500 Subject: [PATCH 12/21] Bump container mem --- .blazar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.blazar.yaml b/.blazar.yaml index 2b4e257ef..b92dc890f 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -12,4 +12,4 @@ buildpack: buildResources: - memoryMb: 8192 + memoryMb: 18408 From 6c51c112c27f3e77dfa7df9c29716d6d636a5972 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 12:24:47 -0500 Subject: [PATCH 13/21] Less test heap --- .blazar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.blazar.yaml b/.blazar.yaml index b92dc890f..3780b0ba1 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -2,7 +2,7 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests -DskipITs MAVEN_OPTS: -Xmx8192m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true - MAVEN_TEST_HEAP: 8g + MAVEN_TEST_HEAP: 4g buildpack: host: git.hubteam.com From cd0aecaf3d680ae7d4458fd428ba021fdfc7dd66 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 12:37:53 -0500 Subject: [PATCH 14/21] Throw more mem --- .blazar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.blazar.yaml b/.blazar.yaml index 3780b0ba1..db8e70d59 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,7 +1,7 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests -DskipITs - MAVEN_OPTS: -Xmx8192m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true + MAVEN_OPTS: -Xmx13408m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true MAVEN_TEST_HEAP: 4g buildpack: From a159eae59097f662f2674586dd4f646ff0a26c40 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 14:54:20 -0500 Subject: [PATCH 15/21] MaxPermSize --- .blazar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.blazar.yaml b/.blazar.yaml index db8e70d59..8c1700c1d 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,7 +1,7 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests -DskipITs - MAVEN_OPTS: -Xmx13408m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true + MAVEN_OPTS: -Xmx13408m -XX:MaxPermSize=10000m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true MAVEN_TEST_HEAP: 4g buildpack: From 1d76c3149862f72a7cc2a4134ca4bcf750a35ee1 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 15:06:12 -0500 Subject: [PATCH 16/21] Even more mem --- .blazar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.blazar.yaml b/.blazar.yaml index 8c1700c1d..ad11c2676 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,7 +1,7 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests -DskipITs - MAVEN_OPTS: -Xmx13408m -XX:MaxPermSize=10000m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true + MAVEN_OPTS: -Xmx18408m -XX:MaxPermSize=18408m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true MAVEN_TEST_HEAP: 4g buildpack: From 017c0e9459e49e02ae6041b2567819640bc30001 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 15:16:51 -0500 Subject: [PATCH 17/21] More cpu? --- .blazar.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.blazar.yaml b/.blazar.yaml index ad11c2676..5281fa0b5 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -13,3 +13,4 @@ buildpack: buildResources: memoryMb: 18408 + cpus: 4 From c3a00bfefea974998e6382cb804dcd1af38fd780 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 15:25:10 -0500 Subject: [PATCH 18/21] Max resources --- .blazar.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.blazar.yaml b/.blazar.yaml index 5281fa0b5..63c081b12 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,7 +1,7 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests -DskipITs - MAVEN_OPTS: -Xmx18408m -XX:MaxPermSize=18408m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true + MAVEN_OPTS: -Xmx32768m -XX:MaxPermSize=32768m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true MAVEN_TEST_HEAP: 4g buildpack: @@ -12,5 +12,5 @@ buildpack: buildResources: - memoryMb: 18408 + memoryMb: 32768 cpus: 4 From 75c3b1e24e1aa5af3544c805316b33a5274e24e3 Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 15:26:51 -0500 Subject: [PATCH 19/21] Put blazar yaml in right place --- .blazar.yaml | 7 ------- api/.blazar.yaml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 api/.blazar.yaml diff --git a/.blazar.yaml b/.blazar.yaml index 63c081b12..050515922 100644 --- a/.blazar.yaml +++ b/.blazar.yaml @@ -1,16 +1,9 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT MAVEN_ARGS: -DskipTests -DskipITs - MAVEN_OPTS: -Xmx32768m -XX:MaxPermSize=32768m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true - MAVEN_TEST_HEAP: 4g buildpack: host: git.hubteam.com organization: HubSpot repository: Blazar-Buildpack-Java branch: v2 - - -buildResources: - memoryMb: 32768 - cpus: 4 diff --git a/api/.blazar.yaml b/api/.blazar.yaml new file mode 100644 index 000000000..cbae2a292 --- /dev/null +++ b/api/.blazar.yaml @@ -0,0 +1,15 @@ +env: + SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT + MAVEN_ARGS: -DskipTests -DskipITs + MAVEN_OPTS: -Xmx4096m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true + MAVEN_TEST_HEAP: 4g + +buildpack: + host: git.hubteam.com + organization: HubSpot + repository: Blazar-Buildpack-Java + branch: v2 + + +buildResources: + memoryMb: 4096 From 8117dee7d4088e286e9734f0aec098c25dfd23bd Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 15:32:02 -0500 Subject: [PATCH 20/21] Skips server tests --- server/.blazar.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 server/.blazar.yaml diff --git a/server/.blazar.yaml b/server/.blazar.yaml new file mode 100644 index 000000000..050515922 --- /dev/null +++ b/server/.blazar.yaml @@ -0,0 +1,9 @@ +env: + SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT + MAVEN_ARGS: -DskipTests -DskipITs + +buildpack: + host: git.hubteam.com + organization: HubSpot + repository: Blazar-Buildpack-Java + branch: v2 From 46652370727b0fb26ac090e34eed0b00194895dd Mon Sep 17 00:00:00 2001 From: mgajda Date: Fri, 3 Dec 2021 15:34:15 -0500 Subject: [PATCH 21/21] Don't skip tests, only skip ITs --- api/.blazar.yaml | 2 +- server/.blazar.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/.blazar.yaml b/api/.blazar.yaml index cbae2a292..b958e00c6 100644 --- a/api/.blazar.yaml +++ b/api/.blazar.yaml @@ -1,6 +1,6 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT - MAVEN_ARGS: -DskipTests -DskipITs + MAVEN_ARGS: -DskipITs MAVEN_OPTS: -Xmx4096m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djansi.force=true MAVEN_TEST_HEAP: 4g diff --git a/server/.blazar.yaml b/server/.blazar.yaml index 050515922..bde6b6e10 100644 --- a/server/.blazar.yaml +++ b/server/.blazar.yaml @@ -1,6 +1,6 @@ env: SET_VERSION_OVERRIDE: 1.0-$GIT_BRANCH-SNAPSHOT - MAVEN_ARGS: -DskipTests -DskipITs + MAVEN_ARGS: -DskipITs buildpack: host: git.hubteam.com