switch back to the postgres-driver by default

jberet · Nov 7, 2024 · 48835d2 · 48835d2
1 parent 22bd149
commit 48835d2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/deployment/README.md b/deployment/README.md
@@ -27,7 +27,7 @@ The example project also provides the `postgresql-datasource` layer usage, which
 podman run -it -e POSTGRES_PASSWORD=123 -e POSTGRES_USER=batch_user -e POSTGRES_DB=batch_db -p 5432:5432 postgres
 ```
 
-Then you need to enable the prostrgres profile. This can be done with `-Ppostgres` or `-Dpostgres`.
+Then you need to enable the postgres profile. This can be done with `-Ppostgres` or `-Dpostgres`.
 
 Here's the console output of from the server:
 

diff --git a/deployment/pom.xml b/deployment/pom.xml
@@ -86,13 +86,13 @@
                 <artifactId>wildfly-maven-plugin</artifactId>
                 <version>${version.maven.wildfly.plugin}</version>
                 <configuration>
-                    <!--                    These environment variables are required if you are using the `postgresql-datasource` instead of the `postgresql-driver` in below.-->
-                    <env>
-                        <POSTGRESQL_DATABASE>batch_db</POSTGRESQL_DATABASE>
-                        <POSTGRESQL_PASSWORD>123</POSTGRESQL_PASSWORD>
-                        <POSTGRESQL_URL>jdbc:postgresql://localhost:5432/batch_db</POSTGRESQL_URL>
-                        <POSTGRESQL_USER>batch_user</POSTGRESQL_USER>
-                    </env>
+                    <!--                    These environment variables are required if you are using the `postgresql-datasource` layer instead of the `postgresql-driver` layer in below.-->
+                    <!--                    <env>-->
+                    <!--                        <POSTGRESQL_DATABASE>batch_db</POSTGRESQL_DATABASE>-->
+                    <!--                        <POSTGRESQL_PASSWORD>123</POSTGRESQL_PASSWORD>-->
+                    <!--                        <POSTGRESQL_URL>jdbc:postgresql://localhost:5432/batch_db</POSTGRESQL_URL>-->
+                    <!--                        <POSTGRESQL_USER>batch_user</POSTGRESQL_USER>-->
+                    <!--                    </env>-->
                     <provisioning-dir>${jboss.home}</provisioning-dir>
                     <galleon-options>
                         <jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
@@ -109,12 +109,12 @@
                     </feature-packs>
                     <layers>
                         <!--                        The `postgresql-datasource` layer provides a `PostgreSQLDS` datasource by default.-->
-                        <layer>postgresql-datasource</layer>
+                        <!--                        <layer>postgresql-datasource</layer>-->
                         <layer>core-tools</layer>
                         <layer>batch-jberet</layer>
                         <layer>h2-driver</layer>
                         <layer>jaxrs-server</layer>
-<!--                        <layer>postgresql-driver</layer>-->
+                        <layer>postgresql-driver</layer>
                     </layers>
                     <channels>
                         <channel>
@@ -191,8 +191,9 @@
                 </property>
             </activation>
             <properties>
-<!--                <configure.ds.script>${project.basedir}/add-postgresql-ds.cli</configure.ds.script>-->
-                <configure.ds.script>${project.basedir}/add-postgresql-ds-default.cli</configure.ds.script>
+                <configure.ds.script>${project.basedir}/add-postgresql-ds.cli</configure.ds.script>
+                <!--                Using this script instead with the `postgresql-datasource` layer-->
+                <!--                <configure.ds.script>${project.basedir}/add-postgresql-ds-default.cli</configure.ds.script>-->
             </properties>
         </profile>
     </profiles>