Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some pom/artifact organization assorted clean ups #435

Merged
merged 5 commits into from
Jan 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ dumps
graph-output.dot
*.swp
*.swo
ObjectStore


docker/distroless/bazel-*
2 changes: 0 additions & 2 deletions extensions/jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integrationtests</module>
</modules>


</project>
2 changes: 1 addition & 1 deletion extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>shamrock-extensions-parent</artifactId>
<name>Shamrock Extensions Parent Pom</name>
<name>Shamrock - Extensions - Parent pom</name>
<packaging>pom</packaging>
<modules>
<!-- Plumbing -->
Expand Down
1 change: 0 additions & 1 deletion extensions/vertx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-tests</module>
</modules>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<artifactId>shamrock-integration-test-bean-validation</artifactId>
<name>Shamrock - Integration Tests - Bean Validation</name>
<description>Module that contains Bean Validation related tests running in strict mode</description>
<description>Module that contains Bean Validation related tests</description>
<dependencies>
<dependency>
<groupId>org.jboss.shamrock</groupId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/common-jpa-entities/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>shamrock-integration-test-common-jpa-entities</artifactId>
<name>Shamrock - Integration Tests - Strict - Common JPA entities</name>
<name>Shamrock - Integration Tests - Common JPA entities</name>
<description>Shared classes outside of the module compilation running Shamrock. Used to test `class` references in `persistence.xml`</description>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jpa-mariadb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<artifactId>shamrock-integration-test-jpa-mariadb</artifactId>
<name>Shamrock - Integration Tests - JPA - MariaDB</name>
<description>Module that contains JPA related tests running in strict mode with the MariaDB database</description>
<description>Module that contains JPA related tests running with the MariaDB database</description>
<dependencies>
<dependency>
<groupId>org.jboss.shamrock</groupId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jpa-postgresql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<artifactId>shamrock-integration-test-jpa-postgresql</artifactId>
<name>Shamrock - Integration Tests - JPA - PostgreSQL</name>
<description>Module that contains JPA related tests running in strict mode with the PostgreSQL database</description>
<description>Module that contains JPA related tests running with the PostgreSQL database</description>
<dependencies>
<dependency>
<groupId>org.jboss.shamrock</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
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">
<parent>
<artifactId>shamrock-jpa</artifactId>
<artifactId>shamrock-integration-tests-parent</artifactId>
<groupId>org.jboss.shamrock</groupId>
<version>1.0.0.Alpha1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>shamrock-jpa-integration-tests</artifactId>
<name>Shamrock - JPA - Integration tests</name>
<artifactId>shamrock-integration-test-jpa</artifactId>
<name>Shamrock - Integration Tests - JPA</name>

<dependencies>
<dependency>
Expand Down
4 changes: 3 additions & 1 deletion integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@
<module>class-transformer</module>
<module>shared-library</module>
<module>undertow</module>
<module>bean-validation-strict</module>
<module>bean-validation</module>
<module>common-jpa-entities</module>
<module>main</module>
<module>jpa</module>
<module>jpa-postgresql</module>
<module>jpa-mariadb</module>
<module>jpa-h2</module>
<module>vertx</module>
</modules>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,14 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>shamrock-vertx</artifactId>
<artifactId>shamrock-integration-tests-parent</artifactId>
<groupId>org.jboss.shamrock</groupId>
<version>1.0.0.Alpha1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>shamrock-vertx-integration-tests</artifactId>
<name>Shamrock - Vert.x - Integration tests</name>

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<artifactId>shamrock-integration-test-vertx</artifactId>
<name>Shamrock - Integration Tests - Vert.x</name>

<dependencies>
<dependency>
Expand Down