fetch heap & nonHeap memory metrics together

spring-projects · vudayani · Nov 7, 2022 · Nov 7, 2022 · Nov 8, 2022 · Nov 8, 2022
commit ad703fae0b8eab60a675ee9887aaa053cd33064e
diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
@@ -98,14 +98,14 @@ resources:
     paths:
     - concourse/tasks
     private_key: ((rsa_id))
-- name: s3-headless-maven-out
-  type: s3
-  source:
-    bucket: ((s3_bucket))
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
-    region_name: ((s3_region))
-    regexp: sts4/snapshots/headless-maven-out-(.*).tar.gz
+# - name: s3-headless-maven-out
+#   type: s3
+#   source:
+#     bucket: ((s3_bucket))
+#     access_key_id: ((s3_accesskey))
+#     secret_access_key: ((s3_secretkey))
+#     region_name: ((s3_region))
+#     regexp: sts4/snapshots/headless-maven-out-(.*).tar.gz
 - name: s3-concourse-vsix-snapshot
   type: s3
   source:
@@ -167,14 +167,14 @@ resources:
     secret_access_key: ((s3_secretkey))
     #region_name: ((s3_region))
     regexp: release/STS4/vscode/vscode-spring-boot-(.*).vsix
-- name: s3-manifest-yaml-fatjar-snapshot
-  type: s3
-  source:
-    bucket: ((s3_bucket))
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
-    region_name: ((s3_region))
-    regexp: sts4/fatjars/snapshots/manifest-yaml-language-server-(.*).jar
+# - name: s3-manifest-yaml-fatjar-snapshot
+#   type: s3
+#   source:
+#     bucket: ((s3_bucket))
+#     access_key_id: ((s3_accesskey))
+#     secret_access_key: ((s3_secretkey))
+#     region_name: ((s3_region))
+#     regexp: sts4/fatjars/snapshots/manifest-yaml-language-server-(.*).jar
 # - name: s3-manifest-yaml-fatjar--rc
 #   type: s3
 #   source:
@@ -183,14 +183,14 @@ resources:
 #     secret_access_key: ((s3_prod_secretkey))
 #     region_name: ((s3_prod_region))
 #     regexp: release/STS4/fatjars/manifest-yaml-language-server-(.*).jar
-- name: s3-concourse-fatjar-snapshot
-  type: s3
-  source:
-    bucket: ((s3_bucket))
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
-    region_name: ((s3_region))
-    regexp: sts4/fatjars/snapshots/concourse-language-server-(.*).jar
+# - name: s3-concourse-fatjar-snapshot
+#   type: s3
+#   source:
+#     bucket: ((s3_bucket))
+#     access_key_id: ((s3_accesskey))
+#     secret_access_key: ((s3_secretkey))
+#     region_name: ((s3_region))
+#     regexp: sts4/fatjars/snapshots/concourse-language-server-(.*).jar
 # - name: s3-concourse-fatjar--rc
 #   type: s3
 #   source:
@@ -199,14 +199,14 @@ resources:
 #     secret_access_key: ((s3_prod_secretkey))
 #     region_name: ((s3_prod_region))
 #     regexp: release/STS4/fatjars/concourse-language-server-(.*).jar
-- name: s3-bosh-fatjar-snapshot
-  type: s3
-  source:
-    bucket: ((s3_bucket))
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
-    region_name: ((s3_region))
-    regexp: sts4/fatjars/snapshots/bosh-language-server-(.*).jar
+# - name: s3-bosh-fatjar-snapshot
+#   type: s3
+#   source:
+#     bucket: ((s3_bucket))
+#     access_key_id: ((s3_accesskey))
+#     secret_access_key: ((s3_secretkey))
+#     region_name: ((s3_region))
+#     regexp: sts4/fatjars/snapshots/bosh-language-server-(.*).jar
 # - name: s3-bosh-fatjar--rc
 #   type: s3
 #   source:
@@ -215,14 +215,14 @@ resources:
 #     secret_access_key: ((s3_prod_secretkey))
 #     region_name: ((s3_prod_region))
 #     regexp: release/STS4/fatjars/bosh-language-server-(.*).jar
-- name: s3-spring-boot-fatjar-snapshot
-  type: s3
-  source:
-    bucket: ((s3_bucket))
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
-    region_name: ((s3_region))
-    regexp: sts4/fatjars/snapshots/spring-boot-language-server-(.*).jar
+# - name: s3-spring-boot-fatjar-snapshot
+#   type: s3
+#   source:
+#     bucket: ((s3_bucket))
+#     access_key_id: ((s3_accesskey))
+#     secret_access_key: ((s3_secretkey))
+#     region_name: ((s3_region))
+#     regexp: sts4/fatjars/snapshots/spring-boot-language-server-(.*).jar
 # - name: s3-spring-boot-fatjar--rc
 #   type: s3
 #   source:
@@ -269,13 +269,13 @@ resources:
     secret_access_key: ((s3_secretkey))
     region_name: ((s3_region))
     initial_version: 0.0.5-RC.6
-- name: artifactory
-  type: artifactory-resource
-  source:
-    uri: "https://repo.spring.io"
-    username: ((artifactory_user))
-    password: ((artifactory_password))
-    build_name: spring-tools-4
+# - name: artifactory
+#   type: artifactory-resource
+#   source:
+#     uri: "https://repo.spring.io"
+#     username: ((artifactory_user))
+#     password: ((artifactory_password))
+#     build_name: spring-tools-4
 ########################################################################################
 jobs:
 # - name: boot-dev-pack-ovsx-publish
@@ -924,51 +924,51 @@ jobs:
   - put: vscode-snapshot-website
     params:
       path: website
-- name: build-fatjars
-  plan:
-  - in_parallel:
-    - get: sts4
-      trigger: true
-    - get: maven-cache
-  - task: build-fatjars
-    file: sts4/concourse/tasks/fatjars-language-servers.yml
-    attempts: 3
-    on_failure:
-      put: slack-notification
-      params:
-        text: |
-          Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!
-    on_success:
-      in_parallel:
-      - put: s3-headless-maven-out
-        params:
-          file: out/headless-maven-out-*.tar.gz
-      - put: s3-manifest-yaml-fatjar-snapshot
-        params:
-          file: out/manifest-yaml-language-server-*.jar
-          acl: public-read
-      - put: s3-concourse-fatjar-snapshot
-        params:
-          file: out/concourse-language-server-*.jar
-          acl: public-read
-      - put: s3-bosh-fatjar-snapshot
-        params:
-          file: out/bosh-language-server-*.jar
-          acl: public-read
-      - put: s3-spring-boot-fatjar-snapshot
-        params:
-          file: out/spring-boot-language-server-*.jar
-          acl: public-read
-      - put: artifactory
-        params:
-          debug: true
-          disable_checksum_uploads: true
-          build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_ID}"
-          build_number: "${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}"
-          repo: libs-snapshot-local
-          folder: maven-out
-          exclude: 
-          - "**/_remote.repositories"
+# - name: build-fatjars
+#   plan:
+#   - in_parallel:
+#     - get: sts4
+#       trigger: true
+#     - get: maven-cache
+#   - task: build-fatjars
+#     file: sts4/concourse/tasks/fatjars-language-servers.yml
+#     attempts: 3
+#     on_failure:
+#       put: slack-notification
+#       params:
+#         text: |
+#           Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!
+#     on_success:
+#       in_parallel:
+#       - put: s3-headless-maven-out
+#         params:
+#           file: out/headless-maven-out-*.tar.gz
+#       - put: s3-manifest-yaml-fatjar-snapshot
+#         params:
+#           file: out/manifest-yaml-language-server-*.jar
+#           acl: public-read
+#       - put: s3-concourse-fatjar-snapshot
+#         params:
+#           file: out/concourse-language-server-*.jar
+#           acl: public-read
+#       - put: s3-bosh-fatjar-snapshot
+#         params:
+#           file: out/bosh-language-server-*.jar
+#           acl: public-read
+#       - put: s3-spring-boot-fatjar-snapshot
+#         params:
+#           file: out/spring-boot-language-server-*.jar
+#           acl: public-read
+#       - put: artifactory
+#         params:
+#           debug: true
+#           disable_checksum_uploads: true
+#           build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_ID}"
+#           build_number: "${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}"
+#           repo: libs-snapshot-local
+#           folder: maven-out
+#           exclude: 
+#           - "**/_remote.repositories"
 # - name: publish-headless-snapshots
 #   plan:
 #   - in_parallel:
@@ -1046,9 +1046,9 @@ groups:
   jobs:
   - build-mvn-cache
   - build-docker-image
-- name: artifactory
-  jobs:
-  - build-fatjars
+#- name: artifactory
+#  jobs:
+#  - build-fatjars
 #  - publish-headless-snapshots
 # - name: debugging
 #   jobs:

diff --git a/concourse/set-pipeline.py b/concourse/set-pipeline.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import os
 
@@ -18,8 +18,8 @@ def replace(infile, outfile, findword, replaceword):
     fname = "pipeline-"+branch+".yml"
     replace("pipeline.yml", "pipeline-"+branch+".yml", "snapshot", branch)
     with open(fname, 'r') as fin:
-        print fin.read()
+        print(fin.read())
     cmd = ('fly -t tools set-pipeline ' + 
         '--var "branch=' + branch + '" ' + '-p sts4-' +branch+' -c '+fname)
-    print cmd
+    print(cmd)
     os.system(cmd)
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml b/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	id="org.springframework.boot.ide.branding.feature"
 	label="Spring Tool Suite 4 Branding Feature"
-	version="4.16.1.qualifier"
+	version="4.17.0.qualifier"
 	provider-name="VMware, Inc.">
 
 	<plugin

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/pom.xml b/eclipse-distribution/org.springframework.boot.ide.branding.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.16.1-SNAPSHOT</version>
+		<version>4.17.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF b/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.springframework.boot.ide.branding;singleton:=true
-Bundle-Version: 4.16.1.qualifier
+Bundle-Version: 4.17.0.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.equinox.p2.ui,

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/about.properties b/eclipse-distribution/org.springframework.boot.ide.branding/about.properties
@@ -8,6 +8,7 @@ title=Spring Tool Suite 4\n\
 \n\
 Version: @QUALIFIER@\n\
 Build Id: @BUILD_ID@\n\
+Revision: @REVISION@\n\
 \n\
 Copyright (c) 2007 - 2022 VMware, Inc.\n\
 All rights reserved. Visit https://spring.io/tools\n\

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/plugin.properties b/eclipse-distribution/org.springframework.boot.ide.branding/plugin.properties
@@ -6,6 +6,7 @@ productBlurb=Spring Tool Suite 4 \n\
 \n\
 Version: @QUALIFIER@\n\
 Build Id: @BUILD_ID@\n\
+Revision: @REVISION@\n\
 \n\
 Copyright (c) 2007 - 2022 VMware, Inc.\n\
 All rights reserved. Visit https://spring.io/tools\n\

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/plugin_customization.ini b/eclipse-distribution/org.springframework.boot.ide.branding/plugin_customization.ini
@@ -56,3 +56,6 @@ org.eclipse.oomph.setup.ui/enable.preference.recorder=false
 # Enable m2e APT. See: https://www.pivotaltracker.com/story/show/160300760
 org.jboss.tools.maven.apt/org.jboss.tools.maven.apt.aptProcessDuringReconcile=true
 org.jboss.tools.maven.apt/org.jboss.tools.maven.apt.mode=jdt_apt
+
+# Disable WTP validations
+org.eclipse.wst.validation/suspend=true
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml b/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.16.1-SNAPSHOT</version>
+		<version>4.17.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -30,20 +30,15 @@
 							<target>
 								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
 
-								<if>
-									<equals arg1="${p2.replaceQualifier}" arg2="true" />
-									<then>
-										<propertyregex property="shortQualifier" input="${buildQualifier}" regexp="[0-9a-z.A-Z]*\-(.*)" select="\1" casesensitive="false" />
-										<propertyregex property="build.id" input="${buildQualifier}" regexp="([0-9a-z.A-Z]*)\-.*" select="\1" casesensitive="false" />
+								<property name="qualifier" value="${unqualifiedVersion}.${p2.qualifier}" />
+								<property name="build.id" value="${buildQualifier}" />
 
-										<property name="qualifier" value="${unqualifiedVersion}.${shortQualifier}" />
-
-										<replace file="about.properties" token="@QUALIFIER@" value="${qualifier}" summary="yes" />
-										<replace file="about.properties" token="@BUILD_ID@" value="${build.id}" summary="yes" />
-										<replace file="plugin.properties" token="@QUALIFIER@" value="${qualifier}" summary="yes" />
-										<replace file="plugin.properties" token="@BUILD_ID@" value="${build.id}" summary="yes" />
-									</then>
-								</if>
+								<replace file="about.properties" token="@QUALIFIER@" value="${qualifier}" summary="yes" />
+								<replace file="about.properties" token="@BUILD_ID@" value="${build.id}" summary="yes" />
+								<replace file="about.properties" token="@REVISION@" value="${git.commit.id}" summary="yes" />
+								<replace file="plugin.properties" token="@QUALIFIER@" value="${qualifier}" summary="yes" />
+								<replace file="plugin.properties" token="@BUILD_ID@" value="${build.id}" summary="yes" />
+								<replace file="plugin.properties" token="@REVISION@" value="${git.commit.id}" summary="yes" />
 							</target>
 						</configuration>
 						<goals>
@@ -59,7 +54,6 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<format>yyyyMMddHHmm</format>
-<!--					<format>yyyyMMddHHmm-'${p2.qualifier}'</format> -->
 					<archiveSite>false</archiveSite>
 					<archive>
 						<addMavenDescriptor>false</addMavenDescriptor>

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e417/.project b/eclipse-distribution/org.springframework.boot.ide.product.e417/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.springframework.boot.ide.product.e417</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/...stribution/org.springframework.boot.ide.product.e423/org.springframework.boot.ide.product b/...stribution/org.springframework.boot.ide.product.e423/org.springframework.boot.ide.product
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
-<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.16.1.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.17.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e423/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e423/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.16.1-SNAPSHOT</version>
+		<version>4.17.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>