apm: Neutral naming for apm-agent-java

README.md

@@ -418,7 +418,7 @@ It is possible to configure some options and versions to run by defining environ
 
 * `APM_AGENT_GO_VERSION`: selects the agent Go version to use. By default it uses the master branch. See [specify an agent version](#specify-an-agent-version)
 
-* `APM_AGENT_JAVA_VERSION`: selects the agent Java version to use. By default it uses the master branch. See [specify an agent version](#specify-an-agent-version)
+* `APM_AGENT_JAVA_VERSION`: selects the agent Java version to use. By default it uses the main branch. See [specify an agent version](#specify-an-agent-version)
 
 * `APM_AGENT_NODEJS_VERSION`: selects the agent Nodejs version to use. By default it uses the master branch. See [specify an agent version](#specify-an-agent-version)
 

docker/java/spring/Dockerfile

@@ -1,7 +1,7 @@
 FROM maven:3.6.3-adoptopenjdk-11
 
 ARG JAVA_AGENT_REPO=elastic/apm-agent-java
-ARG JAVA_AGENT_BRANCH=master
+ARG JAVA_AGENT_BRANCH=main
 ARG JAVA_AGENT_BUILT_VERSION=
 ARG JAVA_M2_CACHE=false
 

scripts/modules/apm_agents.py

@@ -460,7 +460,7 @@ def _content(self):
 
 class AgentJavaSpring(Service):
     SERVICE_PORT = 8090
-    DEFAULT_AGENT_VERSION = "master"
+    DEFAULT_AGENT_VERSION = "main"
     DEFAULT_AGENT_RELEASE = ""
     DEFAULT_AGENT_REPO = "elastic/apm-agent-java"
 
@@ -470,7 +470,7 @@ def add_arguments(cls, parser):
         parser.add_argument(
             "--java-agent-version",
             default=cls.DEFAULT_AGENT_VERSION,
-            help='Use Java agent version (master, 0.5, v.0.7.1, ...)',
+            help='Use Java agent version (main, 0.5, v.0.7.1, ...)',
         )
         parser.add_argument(
             "--java-agent-release",

scripts/tests/test_service.py

@@ -318,7 +318,7 @@ def test_agent_java_spring(self):
                 agent-java-spring:
                     build:
                         args:
-                            JAVA_AGENT_BRANCH: master
+                            JAVA_AGENT_BRANCH: main
                             JAVA_AGENT_BUILT_VERSION: ""
                             JAVA_AGENT_REPO: elastic/apm-agent-java
                             JAVA_M2_CACHE: "false"

tests/versions/java.yml

@@ -1,4 +1,4 @@
 JAVA_AGENT:
-  - 'github;master'
+  - 'github;main'
   - 'release;1.19.0'
   - 'release;1.18.1'

tests/versions/python.yml

@@ -2,6 +2,6 @@ PYTHON_AGENT:
   # github;version -> pip install elastic-apm==git+https://github.com/elastic/apm-agent-python.git@version
   # release;latest -> pip install elastic-apm
   # release;release -> pip install elastic-apm==version
-  - 'github;master'
+  - 'github;main'
   - 'release;latest'
   - 'release;4.2.2'