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

fix duplicated classes in bootstrap jar #2347

Merged
merged 2 commits into from
Dec 16, 2021
Merged

fix duplicated classes in bootstrap jar #2347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45620e6
fix duplicated classes in bootstrap jar
SylvainJuge Dec 16, 2021
0d3a35f
update binary resources
SylvainJuge Dec 16, 2021
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
18 changes: 18 additions & 0 deletions apm-agent-bootstrap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,18 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<!-- '.esclazz' resources have to be excluded as they are re-generated after shading from '.class' -->
<execution>
<id>default-jar</id>
<configuration>
<includes>**/*.class</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -103,13 +115,19 @@
with regular classloading. Their content will be injected as resources into the bootstrap
classloader -->

<delete dir="${tmpdir}"/>
<mkdir dir="${tmpdir}"/>

<unzip dest="${tmpdir}" src="${project.basedir}/target/${project.build.finalName}.jar"/>

<delete dir="${tmpdir}/bootstrap"/>
<mkdir dir="${tmpdir}/bootstrap"/>

<move todir="${tmpdir}/bootstrap">
<fileset dir="${tmpdir}" includes="**/*.class"/>
<mapper type="regexp" from="^(.*)\.class$$" to="\1\.esclazz"/>
</move>

<delete dir="${tmpdir}/java"/>
<delete dir="${tmpdir}/co"/>
<delete dir="${tmpdir}/META-INF"/>
Expand Down
Binary file modified ...strap/src/main/resources/bootstrap/co/elastic/apm/agent/modulesetter/ModuleSetter.esclazz
View file
Open in desktop
Binary file not shown.
Binary file modified apm-agent-bootstrap/src/main/resources/bootstrap/java/lang/IndyBootstrapDispatcher.esclazz
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.7</version>
<configuration>
<excludes>**/*.esclazz</excludes>
</configuration>
Expand Down Expand Up @@ -477,7 +476,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>0.8.7</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down