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 potential jetcd-core shading problem #4526

Merged
merged 3 commits into from
Nov 18, 2024
Merged

Fix potential jetcd-core shading problem #4526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b328811
Fix potential jetcd-core shading problem
Shawyeok Nov 16, 2024
6b54df8
Exclude jetcd-core-shaded from metadata driver integration test
Shawyeok Nov 17, 2024
964b5ed
Add comment for excluding jetcd-core-shaded from integration test
Shawyeok Nov 18, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/bk-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,9 @@ jobs:
run: mvn -B -nsu clean install -Pdocker -DskipTests

- name: Run metadata driver tests
run: mvn -B -nsu -f metadata-drivers/pom.xml test -DintegrationTests
# Exclude jetcd-core-shaded from integration tests, as it’s a POM-only project used internally,
# and maven prioritizes workspace artifacts during testing.
run: mvn -B -nsu -f metadata-drivers/pom.xml -pl '!jetcd-core-shaded' test -DintegrationTests
hezhangjian marked this conversation as resolved.
Show resolved Hide resolved

- name: Run all integration tests (except backward compatibility tests)
run: |
Expand Down
1 change: 0 additions & 1 deletion metadata-drivers/etcd/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<groupId>org.apache.bookkeeper.metadata.drivers</groupId>
<artifactId>jetcd-core-shaded</artifactId>
<version>${project.version}</version>
<classifier>shaded</classifier>
<exclusions>
<exclusion>
<groupId>io.etcd</groupId>
Expand Down
48 changes: 0 additions & 48 deletions metadata-drivers/jetcd-core-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,54 +132,6 @@
<file>${project.basedir}/dependency-reduced-pom.xml</file>
</transformer>
</transformers>
<!-- required for IntelliJ support -->
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
</configuration>
</execution>
</executions>
</plugin>
<!-- required for IntelliJ support, for some reason shadedArtifactAttached isn't sufficient alone -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-shaded-jar</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</file>
<type>jar</type>
<classifier>shaded</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
<!-- required for running tests with "mvn -f metadata-drivers/pom.xml test -DintegrationTests" -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>unpack-shaded-jar</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<unzip src="${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar"
dest="${project.build.outputDirectory}"
overwrite="true" />
</target>
</configuration>
</execution>
</executions>
Expand Down
Loading