Skip to content

Commit

Permalink
Fixes #420 (#421)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Riduidel
Riduidel authored Feb 19, 2024
1 parent 14d3109 commit bdcc819
Show file tree
Hide file tree
Showing 22 changed files with 2,111 additions and 2,053 deletions.
487 changes: 244 additions & 243 deletions aadarchi-maven-plugin/pom.xml
View file

Large diffs are not rendered by default.

46 changes: 24 additions & 22 deletions aadarchi-test-utils/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>system</artifactId>
<version>0.1.15-SNAPSHOT</version>
</parent>
<name>Aadarchi : test utilities</name>
<artifactId>aadarchi-test-utils</artifactId>
<description>Some test utilities dedicated to the improvement of Aadarchi quality.
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>system</artifactId>
<version>0.1.15-SNAPSHOT</version>
</parent>
<artifactId>aadarchi-test-utils</artifactId>
<name>Aadarchi : test utilities</name>
<description>Some test utilities dedicated to the improvement of Aadarchi quality.
Mainly contains tools allowing easy injection of Maven properties into tests</description>
<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<!-- Directly referenced to make sure we can create the ConfigSource allowing us to provide maven properties as config properties -->
<dependency>
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-impl</artifactId>
</dependency>
</dependencies>
</project>
<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<!-- Directly referenced to make sure we can create the ConfigSource allowing us to provide maven properties as config properties -->
<dependency>
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-impl</artifactId>
</dependency>
</dependencies>
</project>
48 changes: 25 additions & 23 deletions adr-tickets-extractor/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>system</artifactId>
<version>0.1.15-SNAPSHOT</version>
</parent>
<artifactId>adr-tickets-extractor</artifactId>
<name>Aadarchi : ADR ticket extractor</name>
<description>Provides mechanisms to initialize repository elements AND include project ADR from GitHub issues</description>
<dependencies>
<dependency>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>freemarker-cdi-producer</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>system</artifactId>
<version>0.1.15-SNAPSHOT</version>
</parent>
<artifactId>adr-tickets-extractor</artifactId>
<name>Aadarchi : ADR ticket extractor</name>
<description>Provides mechanisms to initialize repository elements AND include project ADR from GitHub issues</description>
<dependencies>
<dependency>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>freemarker-cdi-producer</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
262 changes: 131 additions & 131 deletions archetype/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,137 +1,137 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>system</artifactId>
<version>0.1.15-SNAPSHOT</version>
</parent>
<artifactId>archetype</artifactId>
<packaging>maven-archetype</packaging>
<parent>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>system</artifactId>
<version>0.1.15-SNAPSHOT</version>
</parent>
<artifactId>archetype</artifactId>
<packaging>maven-archetype</packaging>

<name>Aadarchi : Archetype</name>
<description>Easily create configuration to document your project with this archetype</description>
<name>Aadarchi : Archetype</name>
<description>Easily create configuration to document your project with this archetype</description>

<dependencies>
<!-- This dependency ensures the build order is the one we want (in other words it allows
<dependencies>
<!-- This dependency ensures the build order is the one we want (in other words it allows
base to build before archetype) -->
<dependency>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>aadarchi-maven-plugin</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>github-scm-handler</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<dependency>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>aadarchi-maven-plugin</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>github-scm-handler</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>archetype-resources/pom.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>archetype-resources/pom.xml</exclude>
</excludes>
</resource>
</resources>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
<version>3.1.2</version>
</extension>
</extensions>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
<version>3.2.1</version>
<configuration>
<properties>
<!-- Used in integration test to generate the pom -->
<aadarchi-used-version>${project.version}</aadarchi-used-version>
</properties>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<addDefaultExcludes>false</addDefaultExcludes>
<escapeString><![CDATA[\]]></escapeString>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>generate-asciidoc-templates</id>
<properties>
<pageUrl>
http://www.codingthearchitecture.com/2016/05/31/agile_software_architecture_documentation.html</pageUrl>
<templatesDir>${asciidoc.source.docs.directory}</templatesDir>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<scripts>
<script>
${pom.basedir}/src/build/groovy/download_templates.groovy</script>
</scripts>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<!-- any version of Groovy \>= 1.5.0 should work here -->
<version>2.5.8</version>
<scope>runtime</scope>
<type>pom</type>
</dependency>
<!-- I do prefer maven dependencies, as they're downloaded only once
<build>
<resources>
<resource>
<filtering>true</filtering>
<directory>src/main/resources</directory>
<includes>
<include>archetype-resources/pom.xml</include>
</includes>
</resource>
<resource>
<filtering>false</filtering>
<directory>src/main/resources</directory>
<excludes>
<exclude>archetype-resources/pom.xml</exclude>
</excludes>
</resource>
</resources>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<addDefaultExcludes>false</addDefaultExcludes>
<escapeString><![CDATA[\]]></escapeString>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
<version>3.2.1</version>
<configuration>
<properties>
<!-- Used in integration test to generate the pom -->
<aadarchi-used-version>${project.version}</aadarchi-used-version>
</properties>
</configuration>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
<version>3.1.2</version>
</extension>
</extensions>
</build>
<profiles>
<profile>
<id>generate-asciidoc-templates</id>
<properties>
<pageUrl>http://www.codingthearchitecture.com/2016/05/31/agile_software_architecture_documentation.html</pageUrl>
<templatesDir>${asciidoc.source.docs.directory}</templatesDir>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<dependencies>
<dependency>
<!-- this is here for both the script and the project to use -->
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
</dependency>
<!-- I do prefer maven dependencies, as they're downloaded only once
in a place I understand (bad reason, of course) -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>${version.jsoup}</version>
</dependency>
<dependency>
<!-- this is here for both the script and the project to use -->
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>${version.jsoup}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<!-- any version of Groovy \>= 1.5.0 should work here -->
<version>2.5.8</version>
<type>pom</type>
<scope>runtime</scope>
</dependency>
</dependencies>
<executions>
<execution>
<goals>
<goal>execute</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<scripts>
<script>${pom.basedir}/src/build/groovy/download_templates.groovy</script>
</scripts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Loading

0 comments on commit bdcc819

Please sign in to comment.