diff --git a/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentDirBaseClassPathResolver.java b/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentDirBaseClassPathResolver.java index 91741446ada1..a9f30d8aba83 100644 --- a/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentDirBaseClassPathResolver.java +++ b/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentDirBaseClassPathResolver.java @@ -35,7 +35,7 @@ public class AgentDirBaseClassPathResolver implements ClassPathResolver { private final BootLogger logger = BootLogger.getLogger(this.getClass()); - static final String VERSION_PATTERN = "(-[0-9]+\\.[0-9]+\\.[0-9]+((\\-SNAPSHOT)|(-RC[0-9]+))?)?"; + static final String VERSION_PATTERN = "(-[0-9]+\\.[0-9]+\\.[0-9]+((\\-SNAPSHOT)|(-RC[0-9]+)|(-p[0-9]+))?)?"; static final JarDescription bootstrap = new JarDescription("pinpoint-bootstrap", true); private static final String EXTENSIONS = "*.{jar,xml,properties}"; diff --git a/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/agentdir/JarDescription.java b/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/agentdir/JarDescription.java index 235cf19814fc..fa3ce148c4bf 100644 --- a/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/agentdir/JarDescription.java +++ b/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/agentdir/JarDescription.java @@ -24,8 +24,8 @@ */ public class JarDescription { - static final String VERSION_PATTERN = "(-[0-9]+\\.[0-9]+\\.[0-9]+((\\-SNAPSHOT)|(-RC[0-9]+))?)?"; - static final String SIMPLE_PATTERN = "-x.x.x(-SNAPSHOT)(-RCx)"; + static final String VERSION_PATTERN = "(-[0-9]+\\.[0-9]+\\.[0-9]+((\\-SNAPSHOT)|(-RC[0-9]+)|(-p[0-9]+))?)?"; + static final String SIMPLE_PATTERN = "-x.x.x(-SNAPSHOT)(-RCx)(-px)"; private final String prefix; private final boolean required; diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentVersionTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentVersionTest.java index 9541f1159a95..faf33138785d 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentVersionTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentVersionTest.java @@ -42,7 +42,7 @@ public void testVersion() { assertVersion("-1.6.0-RC0"); assertVersion("-1.6.0-RC11"); - + assertVersion("-2.5.1-p1"); } @Test