Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
18
Issues
18
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
e3cf2c3e
Commit
e3cf2c3e
authored
Aug 20, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Using jetty 9.4.11
- Resolved duplicated class dependencies
parent
eb199dd3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
3 deletions
+39
-3
docker/Dockerfile
docker/Dockerfile
+5
-1
pom.xml
pom.xml
+34
-2
No files found.
docker/Dockerfile
View file @
e3cf2c3e
#
# Build Genesys server on top of jetty-alpine
#
FROM
jetty:9.4.
5
FROM
jetty:9.4.
11
LABEL
maintainer "Matija Obreza <matija.obreza@croptrust.org>"
USER
root
ENV
USER=jetty \
GENESYS_DATA=/data/genesys \
JETTY_BASE=/var/lib/jetty \
...
...
@@ -27,3 +29,5 @@ RUN mkdir -p ${GENESYS_DATA} \
# Exposed data volumes
VOLUME
/data/genesys
USER
jetty
pom.xml
View file @
e3cf2c3e
...
...
@@ -85,7 +85,7 @@
<slf4j.version>
1.7.21
</slf4j.version>
<log4j.version>
1.2.17
</log4j.version>
<aspectj.version>
1.
7.2
</aspectj.version>
<aspectj.version>
1.
8.9
</aspectj.version>
<mysql.version>
5.1.46
</mysql.version>
<hazelcast.version>
3.8.1
</hazelcast.version>
...
...
@@ -97,7 +97,7 @@
<swagger.version>
2.9.2
</swagger.version>
<!--Container -->
<jetty.version>
9.4.
5.v20170502
</jetty.version>
<jetty.version>
9.4.
11.v20180605
</jetty.version>
<maven.test.skip>
false
</maven.test.skip>
...
...
@@ -134,6 +134,32 @@
<groupId>
commons-logging
</groupId>
<artifactId>
commons-logging
</artifactId>
<version>
${commons.logging.version}
</version>
<!-- Embedded in jcl-over-slf4j -->
<scope>
provided
</scope>
</dependency>
<dependency>
<groupId>
aopalliance
</groupId>
<artifactId>
aopalliance
</artifactId>
<version>
1.0
</version>
<!-- Embedded in spring-aop -->
<scope>
provided
</scope>
</dependency>
<dependency>
<groupId>
org.aspectj
</groupId>
<artifactId>
aspectjrt
</artifactId>
<version>
${aspectj.version}
</version>
<!-- Embedded in aspectjweaver -->
<scope>
provided
</scope>
</dependency>
<dependency>
<groupId>
stax
</groupId>
<artifactId>
stax-api
</artifactId>
<version>
1.0.1
</version>
<!-- JDK 1.6 -->
<scope>
provided
</scope>
</dependency>
<dependency>
...
...
@@ -483,6 +509,12 @@
<groupId>
org.liquibase.ext
</groupId>
<artifactId>
liquibase-hibernate4
</artifactId>
<version>
${liquibase.version}
</version>
<exclusions>
<exclusion>
<groupId>
org.hibernate.javax.persistence
</groupId>
<artifactId>
hibernate-jpa-2.0-api
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.genesys-pgr
</groupId>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment