Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename apm-agent-java.jar to elastic-apm-agent.jar #91

Merged
merged 1 commit into from
May 25, 2018
Merged

Rename apm-agent-java.jar to elastic-apm-agent.jar #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 apm-agent-java/README.md → elastic-apm-agent/README.md
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion apm-agent-java/pom.xml → elastic-apm-agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</parent>
<packaging>jar</packaging>

<artifactId>apm-agent-java</artifactId>
<artifactId>elastic-apm-agent</artifactId>
<name>${project.groupId}:${project.artifactId}</name>

<build>
Expand Down
0 ...figuration/ConfigurationExporterTest.java → ...figuration/ConfigurationExporterTest.java
View file
Open in desktop
File renamed without changes.
0 ...test/resources/configuration.asciidoc.ftl → ...test/resources/configuration.asciidoc.ftl
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...-integration-test/src/test/java/co/elastic/apm/servlet/AbstractTomcatIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public abstract class AbstractTomcatIntegrationTest {
}

private static String getPathToJavaagent() {
File agentBuildDir = new File("../../apm-agent-java/target/");
FileFilter fileFilter = new WildcardFileFilter("apm-agent-java-*.jar");
File agentBuildDir = new File("../../elastic-apm-agent/target/");
FileFilter fileFilter = new WildcardFileFilter("elastic-apm-agent-*.jar");
for (File file : agentBuildDir.listFiles(fileFilter)) {
if (!file.getAbsolutePath().endsWith("javadoc.jar") && !file.getAbsolutePath().endsWith("sources.jar")) {
return file.getAbsolutePath();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

<modules>
<module>apm-agent-core</module>
<module>apm-agent-java</module>
<module>elastic-apm-agent</module>
<module>apm-agent-benchmarks</module>
<module>apm-agent-plugins</module>
<module>apm-agent-api</module>
Expand Down