summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Culkin <scorpress@gmail.com>2024-01-21 15:46:25 -0500
committerBenjamin Culkin <scorpress@gmail.com>2024-01-21 15:46:25 -0500
commitfe92f1f934c1b20fb97b7dad072927f90b60a7b4 (patch)
tree296895e3830c8496e3405df3a011953c6b95ed17
parentc1d4716b079d4ef32650144709294525fed6badf (diff)
Fix things
-rw-r--r--.gitignore1
-rw-r--r--base/pom.xml49
-rw-r--r--clformat/pom.xml47
-rw-r--r--commander/pom.xml4
-rw-r--r--pom.xml73
5 files changed, 77 insertions, 97 deletions
diff --git a/.gitignore b/.gitignore
index 27bacfc..303da4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
HTML/
ID
*.ps
+target/
diff --git a/base/pom.xml b/base/pom.xml
index cae055c..ace8bf7 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>bjc</groupId>
+ <groupId>com.ashardalon</groupId>
<artifactId>BJCUtils-Parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
@@ -17,53 +17,10 @@
<configuration>
<!-- Sets the VM argument line used
when unit tests are run. -->
- <argLine>${surefireArgLine}</argLine>
+ <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>
@@ -148,7 +105,7 @@
<dependency>
- <groupId>io.github.bculkin2442</groupId>
+ <groupId>com.ashardalon</groupId>
<artifactId>esodata</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
diff --git a/clformat/pom.xml b/clformat/pom.xml
index 47439f6..324d119 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>
+ <groupId>com.ashardalon</groupId>
<artifactId>BJCUtils-Parent</artifactId>
- <groupId>bjc</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
@@ -25,17 +25,17 @@
<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>
<dependency>
- <groupId>io.github.bculkin2442</groupId>
+ <groupId>com.ashardalon</groupId>
<artifactId>esodata</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. -->
- <argLine>${surefireArgLine}</argLine>
+ <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 c764012..fc0aed9 100644
--- a/commander/pom.xml
+++ b/commander/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>bjc</groupId>
+ <groupId>com.ashardalon</groupId>
<artifactId>BJCUtils-Parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
@@ -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>
diff --git a/pom.xml b/pom.xml
index 5d972b1..0276ca8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,11 +2,15 @@
<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>bjc</groupId>
+ <groupId>com.ashardalon</groupId>
<artifactId>BJCUtils-Parent</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -18,18 +22,73 @@
<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>
- <snapshotRepository>
- <id>ossrh</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
+ <site>
+ <id>ashardalon-dav</id>
+ <url>dav:https://ashardalon.com/projects/bjc-utils2</url>
+ </site>
+ <snapshotRepository>
+ <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>