Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
yannisf committed Aug 21, 2019
1 parent 4bba439 commit ea54ee7
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 41 deletions.
7 changes: 2 additions & 5 deletions README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand All @@ -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:

Expand Down
50 changes: 14 additions & 36 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
</scm>

<properties>
<spring.version>4.3.8.RELEASE</spring.version>
<spring-security.version>4.2.2.RELEASE</spring-security.version>
<spring-data-jpa.version>1.11.3.RELEASE</spring-data-jpa.version>
<postgres.jdbc.version>9.4-1201-jdbc41</postgres.jdbc.version>
<jackson-databind.version>2.8.7</jackson-databind.version>
<spring.version>4.3.25.RELEASE</spring.version>
<spring-security.version>4.2.13.RELEASE</spring-security.version>
<spring-data-jpa.version>1.11.21.RELEASE</spring-data-jpa.version>
<postgres.jdbc.version>42.2.6</postgres.jdbc.version>
<jackson-databind.version>2.8.11.4</jackson-databind.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomcat.manager.url>http://telesto:8080/manager/text</tomcat.manager.url>
Expand All @@ -28,7 +28,7 @@

<dev.jdbc.user>registry</dev.jdbc.user>
<dev.jdbc.password>registry</dev.jdbc.password>
<dev.jdbc.url>jdbc:postgresql://localhost:5432/registry_dev</dev.jdbc.url>
<dev.jdbc.url>jdbc:postgresql://localhost:5432/registry</dev.jdbc.url>

<build.timestamp>${maven.build.timestamp}</build.timestamp>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
Expand Down Expand Up @@ -119,28 +119,6 @@
</build>
</profile>

<profile>
<id>jrebel</id>
<build>
<plugins>
<plugin>
<groupId>org.zeroturnaround</groupId>
<artifactId>jrebel-maven-plugin</artifactId>
<version>1.1.7</version>
<executions>
<execution>
<id>generate-rebel-xml</id>
<phase>process-resources</phase>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

</profiles>

<build>
Expand Down Expand Up @@ -205,7 +183,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -217,7 +195,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.3</version>
<configuration>
<archive>
<manifestEntries>
Expand Down Expand Up @@ -313,17 +291,17 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.2.7.Final</version>
<version>5.2.18.Final</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
<version>3.9</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -333,12 +311,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
<version>1.1.11</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.25</version>
<version>1.7.28</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -366,7 +344,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>5.1.2.Final</version>
<version>5.1.3.Final</version>
</dependency>
<dependency>
<groupId>org.xhtmlrenderer</groupId>
Expand Down

0 comments on commit ea54ee7

Please sign in to comment.