Skip to content

Commit 557e875

Browse files
authored
remove 'without-spotbugs' profile (#1236)
1 parent f30407c commit 557e875

File tree

4 files changed

+15
-50
lines changed

4 files changed

+15
-50
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
java-version: ${{ matrix.java }}
6262
cache: 'maven'
6363
- name: Build with Maven
64-
run: mvn -Pbuild-without-spotbugs -B install --file pom.xml
64+
run: mvn -B install --file pom.xml
6565
- name: Upload coverage to Codecov
6666
uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # 3.1.1
6767
if: ${{ matrix.java == '11' }} # publish results once

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
RELEASE_TAG_VERSION=${{ github.event.release.tag_name }}
2525
echo "RELEASE_TAG_VERSION=${RELEASE_TAG_VERSION:1}" >> $GITHUB_ENV
2626
- name: Publish package
27-
run: mvn -P sign,build-without-spotbugs clean deploy -DskipTests
27+
run: mvn -Prelease clean deploy -DskipTests
2828
env:
2929
MAVEN_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
3030
MAVEN_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}

.github/workflows/run-e2e-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ jobs:
4545
role-to-assume: ${{ secrets.AWS_ROLE_ARN_TO_ASSUME }}
4646
aws-region: ${{ env.AWS_DEFAULT_REGION }}
4747
- name: Run e2e test with Maven
48-
run: mvn -Pbuild-without-spotbugs -DskipTests install --file pom.xml && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml
48+
run: mvn -DskipTests install --file pom.xml && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml

pom.xml

Lines changed: 12 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@
423423

424424
<profiles>
425425
<profile>
426-
<id>sign</id>
426+
<id>release</id>
427427
<build>
428428
<plugins>
429429
<plugin>
@@ -445,33 +445,6 @@
445445
</execution>
446446
</executions>
447447
</plugin>
448-
</plugins>
449-
</build>
450-
</profile>
451-
<profile>
452-
<id>build-with-spotbugs</id>
453-
<activation>
454-
<activeByDefault>false</activeByDefault>
455-
</activation>
456-
<build>
457-
<plugins>
458-
<plugin>
459-
<groupId>com.github.spotbugs</groupId>
460-
<artifactId>spotbugs-maven-plugin</artifactId>
461-
<version>4.7.3.5</version>
462-
<executions>
463-
<execution>
464-
<id>test</id>
465-
<goals>
466-
<goal>check</goal>
467-
</goals>
468-
</execution>
469-
</executions>
470-
<configuration>
471-
<xmlOutput>true</xmlOutput>
472-
<excludeFilterFile>../spotbugs-exclude.xml</excludeFilterFile>
473-
</configuration>
474-
</plugin>
475448
<plugin>
476449
<groupId>org.apache.maven.plugins</groupId>
477450
<artifactId>maven-source-plugin</artifactId>
@@ -504,36 +477,28 @@
504477
</build>
505478
</profile>
506479
<profile>
507-
<id>build-without-spotbugs</id>
480+
<id>build-with-spotbugs</id>
481+
<activation>
482+
<activeByDefault>false</activeByDefault>
483+
</activation>
508484
<build>
509485
<plugins>
510486
<plugin>
511-
<groupId>org.apache.maven.plugins</groupId>
512-
<artifactId>maven-source-plugin</artifactId>
487+
<groupId>com.github.spotbugs</groupId>
488+
<artifactId>spotbugs-maven-plugin</artifactId>
489+
<version>4.7.3.5</version>
513490
<executions>
514491
<execution>
515-
<id>attach-sources</id>
492+
<id>test</id>
516493
<goals>
517-
<goal>jar-no-fork</goal>
494+
<goal>check</goal>
518495
</goals>
519496
</execution>
520497
</executions>
521-
</plugin>
522-
<plugin>
523-
<groupId>org.apache.maven.plugins</groupId>
524-
<artifactId>maven-javadoc-plugin</artifactId>
525498
<configuration>
526-
<doclint>none</doclint>
527-
<detectJavaApiLink>false</detectJavaApiLink>
499+
<xmlOutput>true</xmlOutput>
500+
<excludeFilterFile>../spotbugs-exclude.xml</excludeFilterFile>
528501
</configuration>
529-
<executions>
530-
<execution>
531-
<id>attach-javadocs</id>
532-
<goals>
533-
<goal>jar</goal>
534-
</goals>
535-
</execution>
536-
</executions>
537502
</plugin>
538503
</plugins>
539504
</build>

0 commit comments

Comments
 (0)