Skip to content

Commit ab4d758

Browse files
committed
GH-2382 - Refine maven build.
Enable checkstyle for ci profile, disable asciidoctor in regular build. Closes #2382
1 parent 94b5543 commit ab4d758

File tree

1 file changed

+37
-45
lines changed

1 file changed

+37
-45
lines changed

pom.xml

Lines changed: 37 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@
506506
<consoleOutput>true</consoleOutput>
507507
<failsOnError>true</failsOnError>
508508
<includeTestSourceDirectory>true</includeTestSourceDirectory>
509+
<skip>${skipArchitectureTests}</skip>
509510
</configuration>
510511
</plugin>
511512
<plugin>
@@ -640,47 +641,6 @@
640641
</archive>
641642
</configuration>
642643
</plugin>
643-
<plugin>
644-
<groupId>org.asciidoctor</groupId>
645-
<artifactId>asciidoctor-maven-plugin</artifactId>
646-
<version>${asciidoctor-maven-plugin.version}</version>
647-
<executions>
648-
<execution>
649-
<id>generate-docs</id>
650-
<phase>prepare-package</phase>
651-
<goals>
652-
<goal>process-asciidoc</goal>
653-
</goals>
654-
</execution>
655-
</executions>
656-
<dependencies>
657-
<dependency>
658-
<groupId>org.asciidoctor</groupId>
659-
<artifactId>asciidoctorj-diagram</artifactId>
660-
<version>${asciidoctorj-diagram.version}</version>
661-
</dependency>
662-
</dependencies>
663-
<configuration>
664-
<backend>html</backend>
665-
<doctype>book</doctype>
666-
<imagesDir>img</imagesDir>
667-
<sourceDirectory>${project.basedir}/src/main/asciidoc</sourceDirectory>
668-
<sourceDocumentName>index.adoc</sourceDocumentName>
669-
<sourceHighlighter>coderay</sourceHighlighter>
670-
<attributes>
671-
<icons>font</icons>
672-
<toc>left</toc>
673-
<setanchors/>
674-
<idprefix/>
675-
<idseparator/>
676-
<spring-data-commons-docs>${spring-data-commons-docs.dir}</spring-data-commons-docs>
677-
</attributes>
678-
<requires>
679-
<require>asciidoctor-diagram</require>
680-
</requires>
681-
<outputDirectory>${project.build.docs}</outputDirectory>
682-
</configuration>
683-
</plugin>
684644
<plugin>
685645
<groupId>com.buschmais.jqassistant</groupId>
686646
<artifactId>jqassistant-maven-plugin</artifactId>
@@ -743,17 +703,49 @@
743703

744704
<profiles>
745705
<profile>
746-
<id>ci</id>
706+
<id>distribute</id>
747707
<build>
748708
<plugins>
749709
<plugin>
750-
<groupId>org.apache.maven.plugins</groupId>
751-
<artifactId>maven-checkstyle-plugin</artifactId>
710+
<groupId>org.asciidoctor</groupId>
711+
<artifactId>asciidoctor-maven-plugin</artifactId>
712+
<version>${asciidoctor-maven-plugin.version}</version>
752713
<executions>
753714
<execution>
754-
<phase>none</phase>
715+
<id>generate-docs</id>
716+
<phase>prepare-package</phase>
717+
<goals>
718+
<goal>process-asciidoc</goal>
719+
</goals>
755720
</execution>
756721
</executions>
722+
<dependencies>
723+
<dependency>
724+
<groupId>org.asciidoctor</groupId>
725+
<artifactId>asciidoctorj-diagram</artifactId>
726+
<version>${asciidoctorj-diagram.version}</version>
727+
</dependency>
728+
</dependencies>
729+
<configuration>
730+
<backend>html</backend>
731+
<doctype>book</doctype>
732+
<imagesDir>img</imagesDir>
733+
<sourceDirectory>${project.basedir}/src/main/asciidoc</sourceDirectory>
734+
<sourceDocumentName>index.adoc</sourceDocumentName>
735+
<sourceHighlighter>coderay</sourceHighlighter>
736+
<attributes>
737+
<icons>font</icons>
738+
<toc>left</toc>
739+
<setanchors/>
740+
<idprefix/>
741+
<idseparator/>
742+
<spring-data-commons-docs>${spring-data-commons-docs.dir}</spring-data-commons-docs>
743+
</attributes>
744+
<requires>
745+
<require>asciidoctor-diagram</require>
746+
</requires>
747+
<outputDirectory>${project.build.docs}</outputDirectory>
748+
</configuration>
757749
</plugin>
758750
</plugins>
759751
</build>

0 commit comments

Comments
 (0)