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

Jump to bottom

Rework Maven Source Plugin Skip #11246

Merged
merged 2 commits into from
Jul 25, 2024
Merged

Rework Maven Source Plugin Skip #11246

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
79d7266
Test
gerashegalov Jul 24, 2024
a3b1653
reviews: fix typo
gerashegalov Jul 25, 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
8 changes: 4 additions & 4 deletions .github/workflows/mvn-verify-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ jobs:
fi
}
done

cache-dependencies-scala213:
runs-on: ubuntu-latest
outputs:
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
jdkVersionArrBody=${jdkVersionArrBody:1}
jdkVersionJsonStr=$(printf {\"include\":[%s]} $jdkVersionArrBody)
echo "jdkVersions=$jdkVersionJsonStr" >> $GITHUB_OUTPUT


package-tests-scala213:
needs: cache-dependencies-scala213
Expand Down Expand Up @@ -304,12 +304,12 @@ jobs:
exit 1
fi
# change to Scala 2.13 Directory
cd scala2.13
cd scala2.13
# test command, will retry for 3 times if failed.
max_retry=3; delay=30; i=1
while true; do
mvn verify \
-P "individual,pre-merge" -Dbuildver=${{ matrix.spark-version }} \
-P "individual,pre-merge,source-javadoc" -Dbuildver=${{ matrix.spark-version }} \
${{ env.COMMON_MVN_FLAGS }} && break || {
if [[ $i -le $max_retry ]]; then
echo "mvn command failed. Retry $i/$max_retry."; ((i++)); sleep $delay; ((delay=delay*2))
Expand Down
21 changes: 1 addition & 20 deletions aggregator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<rapids.default.jar.phase>initialize</rapids.default.jar.phase>
<!-- Maven to register attached artifact , which we later replace -->
<rapids.shim.jar.phase>initialize</rapids.shim.jar.phase>
<rapids.source.jar.phase>none</rapids.source.jar.phase>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -263,26 +264,6 @@
</build>

<profiles>
<profile>
<id>source-javadoc</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-source</id>
<goals>
<goal>jar</goal>
</goals>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>release320</id>
<activation>
Expand Down
1 change: 1 addition & 0 deletions dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<dist.jar.pom.url>jar:file:${dist.jar.name}!/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml</dist.jar.pom.url>
<rapids.default.jar.phase>none</rapids.default.jar.phase>
<rapids.jni.unpack.skip>false</rapids.jni.unpack.skip>
<rapids.source.jar.phase>none</rapids.source.jar.phase>
</properties>
<profiles>
<profile>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@
<executions>
<execution>
<id>attach-source</id>
<phase>${rapids.source.jar.phase}</phase>
<goals>
<goal>jar</goal>
</goals>
Expand Down Expand Up @@ -887,6 +888,7 @@
<bloop.configDirectory>${spark.rapids.source.basedir}/.bloop</bloop.configDirectory>
<build.info.path>${project.build.outputDirectory}/rapids4spark-version-info.properties</build.info.path>
<nonfail.errors.quiet>false</nonfail.errors.quiet>
<rapids.source.jar.phase>package</rapids.source.jar.phase>
</properties>

<dependencyManagement>
Expand Down
21 changes: 1 addition & 20 deletions scala2.13/aggregator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<rapids.default.jar.phase>initialize</rapids.default.jar.phase>
<!-- Maven to register attached artifact , which we later replace -->
<rapids.shim.jar.phase>initialize</rapids.shim.jar.phase>
<rapids.source.jar.phase>none</rapids.source.jar.phase>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -263,26 +264,6 @@
</build>

<profiles>
<profile>
<id>source-javadoc</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-source</id>
<goals>
<goal>jar</goal>
</goals>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>release320</id>
<activation>
Expand Down
1 change: 1 addition & 0 deletions scala2.13/dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<dist.jar.pom.url>jar:file:${dist.jar.name}!/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml</dist.jar.pom.url>
<rapids.default.jar.phase>none</rapids.default.jar.phase>
<rapids.jni.unpack.skip>false</rapids.jni.unpack.skip>
<rapids.source.jar.phase>none</rapids.source.jar.phase>
</properties>
<profiles>
<profile>
Expand Down
2 changes: 2 additions & 0 deletions scala2.13/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@
<executions>
<execution>
<id>attach-source</id>
<phase>${rapids.source.jar.phase}</phase>
<goals>
<goal>jar</goal>
</goals>
Expand Down Expand Up @@ -887,6 +888,7 @@
<bloop.configDirectory>${spark.rapids.source.basedir}/.bloop</bloop.configDirectory>
<build.info.path>${project.build.outputDirectory}/rapids4spark-version-info.properties</build.info.path>
<nonfail.errors.quiet>false</nonfail.errors.quiet>
<rapids.source.jar.phase>package</rapids.source.jar.phase>
</properties>

<dependencyManagement>
Expand Down