diff --git a/README.adoc b/README.adoc index 620a9ba..72fd25d 100644 --- a/README.adoc +++ b/README.adoc @@ -14,7 +14,7 @@ Before deploying the application a Postgres database schema must created. Just f . Connect to postgres using `psql` [source,sh] -# psql --host=localhost --port=5432 --username=postgres +$ psql --host=localhost --port=5432 --username=postgres . Create the application user [source,sql] CREATE USER registry PASSWORD 'registry' createdb; @@ -87,7 +87,7 @@ When deploying a *production* build a _JNDI datasource_ is required. For tomcat To build the application the user interface (client) and server must be built individually. The client exists in a seperate repository. === Server -For the server build, maven is used. The build is profile based with profiles: *local_ds*, *jndi_ds*, *bundle*, *deploy* and *jrebel*. +For the server build, maven is used. The build is profile based with profiles: *local_ds*, *jndi_ds*, *bundle* and *deploy*. ==== local_ds vs jndi_jd The *local_ds* profile uses a Spring configured datasource, while the *jndi_ds* profile, expects a JNDI datasource to be in place when deploying. These two profiles should be considered as mutually exclusive. @@ -100,9 +100,6 @@ This profile instructs the build to include an already built and installed in th ==== deploy Deploys the application during the _package_ phase to a configured Tomcat instance, using the tomcat _manager_ application, as configured in _pom.xml_. -==== jrebel -Enables the _jrebel_ plugin for fast redeployments - === System properties The application accepts two system properties: diff --git a/pom.xml b/pom.xml index 7af0ca4..9c8ee70 100644 --- a/pom.xml +++ b/pom.xml @@ -15,11 +15,11 @@ - 4.3.8.RELEASE - 4.2.2.RELEASE - 1.11.3.RELEASE - 9.4-1201-jdbc41 - 2.8.7 + 4.3.25.RELEASE + 4.2.13.RELEASE + 1.11.21.RELEASE + 42.2.6 + 2.8.11.4 UTF-8 http://telesto:8080/manager/text @@ -28,7 +28,7 @@ registry registry - jdbc:postgresql://localhost:5432/registry_dev + jdbc:postgresql://localhost:5432/registry ${maven.build.timestamp} yyyyMMddHHmm @@ -119,28 +119,6 @@ - - jrebel - - - - org.zeroturnaround - jrebel-maven-plugin - 1.1.7 - - - generate-rebel-xml - process-resources - - generate - - - - - - - - @@ -205,7 +183,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + 3.8.1 1.8 1.8 @@ -217,7 +195,7 @@ org.apache.maven.plugins maven-war-plugin - 3.1.0 + 3.2.3 @@ -313,17 +291,17 @@ org.hibernate hibernate-core - 5.2.7.Final + 5.2.18.Final commons-io commons-io - 2.4 + 2.6 org.apache.commons commons-lang3 - 3.5 + 3.9 com.fasterxml.jackson.core @@ -333,12 +311,12 @@ ch.qos.logback logback-classic - 1.1.2 + 1.1.11 org.slf4j jcl-over-slf4j - 1.7.25 + 1.7.28 junit @@ -366,7 +344,7 @@ org.hibernate hibernate-validator - 5.1.2.Final + 5.1.3.Final org.xhtmlrenderer