diff options
| author | Benjamin Culkin <scorpress@gmail.com> | 2024-06-04 17:14:35 -0400 |
|---|---|---|
| committer | Benjamin Culkin <scorpress@gmail.com> | 2024-06-04 17:14:35 -0400 |
| commit | 0f9e11bf09c21e7c93bf324fe23a9c5170109fd5 (patch) | |
| tree | 8a58f401b17442a2df18f5a89e67921b30369ffd | |
| parent | f9d171dbd78c287220c262766637060ec57a882e (diff) | |
| parent | 90fc7ae4bef3d566a7b30f043a21f6d2eea33436 (diff) | |
Merge branch 'trunk' of git@ashardalon.com:bjc-utils2.git into trunk
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | base/pom.xml | 45 | ||||
| -rw-r--r-- | clformat/pom.xml | 45 | ||||
| -rw-r--r-- | commander/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 75 |
5 files changed, 76 insertions, 93 deletions
@@ -3,3 +3,5 @@ HTML/ ID *.ps +target/ +.settings diff --git a/base/pom.xml b/base/pom.xml index 66522c4..ace8bf7 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -17,53 +17,10 @@ <configuration> <!-- Sets the VM argument line used when unit tests are run. --> - <forkCount>0</forkCount> + <forkCount>0</forkCount> </configuration> </plugin> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.2</version> - <executions> - <!-- - Prepares the property pointing to the JaCoCo runtime agent which - is passed as VM argument when Maven the Surefire plugin is executed. - --> - <execution> - <id>pre-unit-test</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile> - <!-- - Sets the name of the property containing the settings - for JaCoCo runtime agent. - --> - <propertyName>surefireArgLine</propertyName> - </configuration> - </execution> - <!-- - Ensures that the code coverage report for unit tests is created after - unit tests have been run. - --> - <execution> - <id>post-unit-test</id> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile> - <!-- Sets the output directory for the code coverage report. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> diff --git a/clformat/pom.xml b/clformat/pom.xml index 5154c42..1fec73d 100644 --- a/clformat/pom.xml +++ b/clformat/pom.xml @@ -4,8 +4,8 @@ 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> - <artifactId>BJCUtils-Parent</artifactId> <groupId>com.ashardalon</groupId> + <artifactId>BJCUtils-Parent</artifactId> <version>2.0-SNAPSHOT</version> </parent> @@ -25,12 +25,12 @@ <version>4.13.1</version> </dependency> <dependency> - <groupId>bjc</groupId> + <groupId>com.ashardalon</groupId> <artifactId>BJC-Utils2</artifactId> <version>2.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>bjc</groupId> + <groupId>com.ashardalon</groupId> <artifactId>inflexion</artifactId> <version>2.0-SNAPSHOT</version> </dependency> @@ -65,46 +65,9 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <!-- Sets the VM argument line used when unit tests are run. --> - <forkCount>0</forkCount> + <forkCount>0</forkCount> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.2</version> - <executions> - <!-- Prepares the property pointing to the JaCoCo runtime agent which - is passed as VM argument when Maven the Surefire plugin is executed. --> - <execution> - <id>pre-unit-test</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile> - <!-- Sets the name of the property containing the settings for JaCoCo - runtime agent. --> - <propertyName>surefireArgLine</propertyName> - </configuration> - </execution> - <!-- Ensures that the code coverage report for unit tests is created - after unit tests have been run. --> - <execution> - <id>post-unit-test</id> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile> - <!-- Sets the output directory for the code coverage report. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/commander/pom.xml b/commander/pom.xml index 7a50175..fc0aed9 100644 --- a/commander/pom.xml +++ b/commander/pom.xml @@ -26,7 +26,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>bjc</groupId> + <groupId>com.ashardalon</groupId> <artifactId>BJC-Utils2</artifactId> <version>2.0-SNAPSHOT</version> <type>jar</type> @@ -1,5 +1,7 @@ <?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"> +<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> <groupId>com.ashardalon</groupId> @@ -7,6 +9,10 @@ <version>2.0-SNAPSHOT</version> <packaging>pom</packaging> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> <plugins> <plugin> @@ -18,22 +24,77 @@ <target>11</target> </configuration> </plugin> + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>3.7.1</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>3.5.3</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>3.0.0</version> + </plugin> </plugins> </build> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>3.4.0</version> + <configuration></configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.1</version> + </plugin> + <plugin> + <artifactId>maven-changes-plugin</artifactId> + <version>2.12.1</version> + </plugin> + </plugins> + </reporting> + <distributionManagement> + <site> + <id>ashardalon-dav</id> + <url>dav:https://ashardalon.com/projects/bjc-utils2</url> + </site> <snapshotRepository> - <id>ossrh</id> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> + <id>ashardalon</id> + <name>Ashardalon Snapshots</name> + <url>https://repo.ashardalon.com/snapshots</url> </snapshotRepository> <repository> - <id>ossrh</id> - <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> + <id>ashardalon</id> + <name>Ashardalon Releases</name> + <url>https://repo.ashardalon.com/releases</url> </repository> </distributionManagement> + <repositories> + <repository> + <id>ashardalon-forge</id> + <name>Ashardalon Forge</name> + <url>https://repo.ashardalon.com</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> <modules> <module>base</module> <module>clformat</module> - <module>commander</module> - </modules> + <module>commander</module> + </modules> </project> |