This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new a3ef3f74a New assertions module.
a3ef3f74a is described below
commit a3ef3f74a3de5443b066e603bb31ac66d3a5eace
Author: JamesBognar <[email protected]>
AuthorDate: Mon Jun 27 07:55:42 2022 -0400
New assertions module.
---
juneau-core/juneau-assertions/.gitignore | 6 +++
.../juneau-assertions}/pom.xml | 34 ++++++------
juneau-core/juneau-config/pom.xml | 60 ----------------------
.../main/java/org/apache/juneau/utils/Snippet.java | 4 +-
juneau-core/pom.xml | 1 +
juneau-rest/juneau-rest-client/pom.xml | 5 --
juneau-rest/juneau-rest-common/pom.xml | 5 ++
juneau-rest/juneau-rest-server-jaxrs/pom.xml | 5 --
juneau-rest/juneau-rest-server/pom.xml | 5 --
juneau-utest-utils/pom.xml | 2 +-
10 files changed, 31 insertions(+), 96 deletions(-)
diff --git a/juneau-core/juneau-assertions/.gitignore
b/juneau-core/juneau-assertions/.gitignore
new file mode 100644
index 000000000..34acf885c
--- /dev/null
+++ b/juneau-core/juneau-assertions/.gitignore
@@ -0,0 +1,6 @@
+/target/
+**/.DS_Store
+.classpath
+.project
+/.settings/
+/bin/
diff --git a/juneau-utest-utils/pom.xml b/juneau-core/juneau-assertions/pom.xml
similarity index 82%
copy from juneau-utest-utils/pom.xml
copy to juneau-core/juneau-assertions/pom.xml
index 88633d393..560403472 100644
--- a/juneau-utest-utils/pom.xml
+++ b/juneau-core/juneau-assertions/pom.xml
@@ -19,13 +19,13 @@
<parent>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau</artifactId>
+ <artifactId>juneau-core</artifactId>
<version>9.0.0-SNAPSHOT</version>
</parent>
- <artifactId>juneau-utest-utils</artifactId>
- <name>juneau/utest-utils</name>
- <description>Apache Juneau Core API Unit Test Utils</description>
+ <artifactId>juneau-assertions</artifactId>
+ <name>juneau/core/assertions</name>
+ <description>Apache Juneau Assertions API</description>
<packaging>bundle</packaging>
<dependencies>
@@ -34,15 +34,6 @@
<artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
</dependencies>
<properties>
@@ -62,7 +53,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Automatic-Module-Name>org.apache.juneau.core.test.utils</Automatic-Module-Name>
+
<Automatic-Module-Name>org.apache.juneau.config</Automatic-Module-Name>
</instructions>
</configuration>
</plugin>
@@ -80,12 +71,21 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.2</version>
<executions>
<execution>
+ <id>default-prepare-agent</id>
+ <goals>
+
<goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-report</id>
+ <phase>prepare-package</phase>
<goals>
- <goal>test-jar</goal>
+ <goal>report</goal>
</goals>
</execution>
</executions>
diff --git a/juneau-core/juneau-config/pom.xml
b/juneau-core/juneau-config/pom.xml
index 0fdf248d4..8c7a7f3bd 100644
--- a/juneau-core/juneau-config/pom.xml
+++ b/juneau-core/juneau-config/pom.xml
@@ -57,15 +57,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
-
<include>**/*Test.class</include>
- </includes>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -99,57 +90,6 @@
</execution>
</executions>
</plugin>
- <!-- plugin>
- <groupId>com.github.siom79.japicmp</groupId>
- <artifactId>japicmp-maven-plugin</artifactId>
- <version>0.13.0</version>
- <configuration>
- <oldVersion>
- <dependency>
-
<groupId>org.apache.juneau</groupId>
-
<artifactId>${project.artifactId}</artifactId>
-
<version>${juneau.compare.version}</version>
- <type>jar</type>
- </dependency>
- </oldVersion>
- <newVersion>
- <file>
-
<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
- </file>
- </newVersion>
- <parameter>
-
<onlyModified>true</onlyModified>
-
<accessModifier>public</accessModifier>
- <excludes>
- </excludes>
-
<ignoreMissingClasses>true</ignoreMissingClasses>
-
<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
-
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
-
<breakBuildIfCausedByExclusion>false</breakBuildIfCausedByExclusion>
-
<breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>
-
<overrideCompatibilityChangeParameters>
-
<overrideCompatibilityChangeParameter>
-
<binaryCompatible>true</binaryCompatible>
-
<compatibilityChange>SUPERCLASS_REMOVED</compatibilityChange>
-
<sourceCompatible>true</sourceCompatible>
-
</overrideCompatibilityChangeParameter>
-
<overrideCompatibilityChangeParameter>
-
<binaryCompatible>true</binaryCompatible>
-
<compatibilityChange>FIELD_REMOVED_IN_SUPERCLASS</compatibilityChange>
-
<sourceCompatible>true</sourceCompatible>
-
</overrideCompatibilityChangeParameter>
-
</overrideCompatibilityChangeParameters>
- </parameter>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>cmp</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
</plugins>
</build>
</project>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Snippet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Snippet.java
index 4b89d5256..69915893d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Snippet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Snippet.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.utils;
-import org.apache.juneau.assertions.*;
-
/**
* Identical to {@link Runnable} but the run method can throw stuff.
*
@@ -21,7 +19,7 @@ import org.apache.juneau.assertions.*;
* Allows you to pass in arbitrary snippets of code in fluent interfaces.
*
* <p>
- * See {@link Assertions#assertThrown(Snippet)} for an example.
+ * See <c>Assertions.<jsm>assertThrown</jsm>(Snippet)</c> for an example.
*
* <ul class='seealso'>
* <li class='link'>{@doc jm.FluentAssertions}
diff --git a/juneau-core/pom.xml b/juneau-core/pom.xml
index 0b37413a4..dca382523 100644
--- a/juneau-core/pom.xml
+++ b/juneau-core/pom.xml
@@ -33,5 +33,6 @@
<module>juneau-marshall-rdf</module>
<module>juneau-dto</module>
<module>juneau-config</module>
+ <module>juneau-assertions</module>
</modules>
</project>
diff --git a/juneau-rest/juneau-rest-client/pom.xml
b/juneau-rest/juneau-rest-client/pom.xml
index f17059a9b..ae36ab0da 100644
--- a/juneau-rest/juneau-rest-client/pom.xml
+++ b/juneau-rest/juneau-rest-client/pom.xml
@@ -29,11 +29,6 @@
<packaging>bundle</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-common</artifactId>
diff --git a/juneau-rest/juneau-rest-common/pom.xml
b/juneau-rest/juneau-rest-common/pom.xml
index 6dbb06807..355c392cf 100644
--- a/juneau-rest/juneau-rest-common/pom.xml
+++ b/juneau-rest/juneau-rest-common/pom.xml
@@ -34,6 +34,11 @@
<artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-assertions</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
diff --git a/juneau-rest/juneau-rest-server-jaxrs/pom.xml
b/juneau-rest/juneau-rest-server-jaxrs/pom.xml
index 80fca444b..281ac6820 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/pom.xml
+++ b/juneau-rest/juneau-rest-server-jaxrs/pom.xml
@@ -29,11 +29,6 @@
<packaging>bundle</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-marshall-rdf</artifactId>
diff --git a/juneau-rest/juneau-rest-server/pom.xml
b/juneau-rest/juneau-rest-server/pom.xml
index 53e9082dc..1a226e2d3 100644
--- a/juneau-rest/juneau-rest-server/pom.xml
+++ b/juneau-rest/juneau-rest-server/pom.xml
@@ -29,11 +29,6 @@
<packaging>bundle</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-common</artifactId>
diff --git a/juneau-utest-utils/pom.xml b/juneau-utest-utils/pom.xml
index 88633d393..591199d90 100644
--- a/juneau-utest-utils/pom.xml
+++ b/juneau-utest-utils/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall</artifactId>
+ <artifactId>juneau-assertions</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
