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.

Sign up for GitHub

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

Prefix the JDBC artifacts with shamrock- as all the other artifacts #367

Merged
merged 1 commit into from
Dec 20, 2018
Merged

Prefix the JDBC artifacts with shamrock- as all the other artifacts #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@

<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-postgresql-deployment</artifactId>
<artifactId>shamrock-jdbc-postgresql-deployment</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-h2-deployment</artifactId>
<artifactId>shamrock-jdbc-h2-deployment</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-mariadb-deployment</artifactId>
<artifactId>shamrock-jdbc-mariadb-deployment</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
12 changes: 6 additions & 6 deletions build-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,32 +166,32 @@
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-postgresql-deployment</artifactId>
<artifactId>shamrock-jdbc-postgresql-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-postgresql-runtime</artifactId>
<artifactId>shamrock-jdbc-postgresql-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-h2-deployment</artifactId>
<artifactId>shamrock-jdbc-h2-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-h2-runtime</artifactId>
<artifactId>shamrock-jdbc-h2-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-mariadb-deployment</artifactId>
<artifactId>shamrock-jdbc-mariadb-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-mariadb-runtime</artifactId>
<artifactId>shamrock-jdbc-mariadb-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions docs/src/main/asciidoc/hibernate-orm-guide.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ and we make some opinionated choices and educated guesses.
In your `pom.xml`, add the following dependencies:

* the JPA extension
* your JDBC driver extension (`jdbc-postgresql-deployment`, `jdbc-h2-deployment`, `jdbc-mariadb-deployment`, ...)
* your JDBC driver extension (`shamrock-jdbc-postgresql-deployment`, `shamrock-jdbc-h2-deployment`, `shamrock-jdbc-mariadb-deployment`, ...)

[source,xml]
--
Expand All @@ -32,7 +32,7 @@ In your `pom.xml`, add the following dependencies:
<!-- JDBC driver dependencies -->
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-postgresql-deployment</artifactId>
<artifactId>shamrock-jdbc-postgresql-deployment</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -146,7 +146,7 @@ and only persistence units defined in `persistence.xml` will be taken into accou
In your `pom.xml`, add the following dependencies:

* the JPA extension
* your JDBC driver extension (`jdbc-postgresql-deployment`, `jdbc-h2-deployment`, `jdbc-mariadb-deployment`, ...)
* your JDBC driver extension (`shamrock-jdbc-postgresql-deployment`, `shamrock-jdbc-h2-deployment`, `shamrock-jdbc-mariadb-deployment`, ...)

[source,xml]
--
Expand All @@ -161,7 +161,7 @@ In your `pom.xml`, add the following dependencies:
<!-- JDBC driver dependencies -->
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-postgresql-deployment</artifactId>
<artifactId>shamrock-jdbc-postgresql-deployment</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion examples/jpa-h2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<!-- We'll be using the H2 database -->
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-h2-deployment</artifactId>
<artifactId>shamrock-jdbc-h2-deployment</artifactId>
<scope>provided</scope>
</dependency>
<!-- .. and some REST endpoints -->
Expand Down
2 changes: 1 addition & 1 deletion examples/jpa-mariadb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-mariadb-deployment</artifactId>
<artifactId>shamrock-jdbc-mariadb-deployment</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion examples/jpa-postgresql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-postgresql-deployment</artifactId>
<artifactId>shamrock-jdbc-postgresql-deployment</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion examples/strict/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-postgresql-deployment</artifactId>
<artifactId>shamrock-jdbc-postgresql-deployment</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions jdbc/jdbc-h2/jdbc-h2-deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
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>jdbc-h2</artifactId>
<artifactId>shamrock-jdbc-h2</artifactId>
<groupId>org.jboss.shamrock</groupId>
<version>1.0.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>jdbc-h2-deployment</artifactId>
<artifactId>shamrock-jdbc-h2-deployment</artifactId>
<name>Shamrock - JDBC - H2 - Deployment</name>

<dependencies>
Expand All @@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-h2-runtime</artifactId>
<artifactId>shamrock-jdbc-h2-runtime</artifactId>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions jdbc/jdbc-h2/jdbc-h2-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
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>jdbc-h2</artifactId>
<artifactId>shamrock-jdbc-h2</artifactId>
<groupId>org.jboss.shamrock</groupId>
<version>1.0.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>jdbc-h2-runtime</artifactId>
<artifactId>shamrock-jdbc-h2-runtime</artifactId>
<name>Shamrock - JDBC - H2 - Runtime</name>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jdbc/jdbc-h2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
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>jdbc</artifactId>
<artifactId>shamrock-jdbc</artifactId>
<groupId>org.jboss.shamrock</groupId>
<version>1.0.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>jdbc-h2</artifactId>
<artifactId>shamrock-jdbc-h2</artifactId>
<name>Shamrock - JDBC - H2</name>
<packaging>pom</packaging>
<modules>
Expand Down
6 changes: 3 additions & 3 deletions jdbc/jdbc-mariadb/jdbc-mariadb-deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
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>jdbc-mariadb</artifactId>
<artifactId>shamrock-jdbc-mariadb</artifactId>
<groupId>org.jboss.shamrock</groupId>
<version>1.0.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>jdbc-mariadb-deployment</artifactId>
<artifactId>shamrock-jdbc-mariadb-deployment</artifactId>
<name>Shamrock - JDBC - MariaDB - Deployment</name>

<dependencies>
Expand All @@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-mariadb-runtime</artifactId>
<artifactId>shamrock-jdbc-mariadb-runtime</artifactId>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions jdbc/jdbc-mariadb/jdbc-mariadb-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
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>jdbc-mariadb</artifactId>
<artifactId>shamrock-jdbc-mariadb</artifactId>
<groupId>org.jboss.shamrock</groupId>
<version>1.0.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>jdbc-mariadb-runtime</artifactId>
<artifactId>shamrock-jdbc-mariadb-runtime</artifactId>
<name>Shamrock - JDBC - MariaDB - Runtime</name>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jdbc/jdbc-mariadb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
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>jdbc</artifactId>
<artifactId>shamrock-jdbc</artifactId>
<groupId>org.jboss.shamrock</groupId>
<version>1.0.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>jdbc-mariadb</artifactId>
<artifactId>shamrock-jdbc-mariadb</artifactId>
<name>Shamrock - JDBC - MariaDB</name>
<packaging>pom</packaging>
<modules>
Expand Down
6 changes: 3 additions & 3 deletions jdbc/jdbc-postgresql/jdbc-postgresql-deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
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>jdbc-postgresql</artifactId>
<artifactId>shamrock-jdbc-postgresql</artifactId>
<groupId>org.jboss.shamrock</groupId>
<version>1.0.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>jdbc-postgresql-deployment</artifactId>
<artifactId>shamrock-jdbc-postgresql-deployment</artifactId>
<name>Shamrock - JDBC - PostgreSQL - Deployment</name>

<dependencies>
Expand All @@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-postgresql-runtime</artifactId>
<artifactId>shamrock-jdbc-postgresql-runtime</artifactId>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions jdbc/jdbc-postgresql/jdbc-postgresql-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
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>jdbc-postgresql</artifactId>
<artifactId>shamrock-jdbc-postgresql</artifactId>
<groupId>org.jboss.shamrock</groupId>
<version>1.0.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>jdbc-postgresql-runtime</artifactId>
<artifactId>shamrock-jdbc-postgresql-runtime</artifactId>
<name>Shamrock - JDBC - PostgreSQL - Runtime</name>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jdbc/jdbc-postgresql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
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>jdbc</artifactId>
<artifactId>shamrock-jdbc</artifactId>
<groupId>org.jboss.shamrock</groupId>
<version>1.0.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>jdbc-postgresql</artifactId>
<artifactId>shamrock-jdbc-postgresql</artifactId>
<name>Shamrock - JDBC - PostgreSQL</name>
<packaging>pom</packaging>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>jdbc</artifactId>
<artifactId>shamrock-jdbc</artifactId>
<name>Shamrock - JDBC</name>
<packaging>pom</packaging>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion jpa/integrationtests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
<artifactId>jdbc-postgresql-deployment</artifactId>
<artifactId>shamrock-jdbc-postgresql-deployment</artifactId>
<scope>provided</scope>
</dependency>

Expand Down