Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
fb045524
Commit
fb045524
authored
Oct 16, 2018
by
Piotr Gawron
Browse files
commons-fileupload and commons-validator updated
parent
d0cd1a3e
Changes
2
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
fb045524
...
...
@@ -79,15 +79,18 @@
<jsf.version>
2.2.18
</jsf.version>
<unboundid-ldapsdk.version>
4.0.8
</unboundid-ldapsdk.version>
<jstl.version>
1.2
</jstl.version>
<commons-fileupload.version>
1.3.3
</commons-fileupload.version>
<primafaces.themes.version>
1.0.8
</primafaces.themes.version>
<primefaces-extensions.version>
0.7.1
</primefaces-extensions.version>
<jstl.version>
1.2
</jstl.version>
<commons-fileupload.version>
1.2.2
</commons-fileupload.version>
<commons-validator.version>
1.4.0
</commons-validator.version>
...
...
@@ -112,7 +115,6 @@
<unboundid-ldapsdk.version>
4.0.6
</unboundid-ldapsdk.version>
</properties>
<repositories>
...
...
web/pom.xml
View file @
fb045524
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
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"
>
<modelVersion>
4.0.0
</modelVersion>
<parent>
<groupId>
lcsb.mapviewer
</groupId>
...
...
@@ -16,10 +15,10 @@
<repositories>
<repository>
<id>
repo
</id>
<id>
repo
</id>
<releases>
<enabled>
true
</enabled>
<checksumPolicy>
ignore
</checksumPolicy>
<enabled>
true
</enabled>
<checksumPolicy>
ignore
</checksumPolicy>
</releases>
<snapshots>
<enabled>
false
</enabled>
...
...
@@ -29,8 +28,8 @@
</repositories>
<dependencies>
<!-- the MapViewer service -->
<!-- the MapViewer service -->
<dependency>
<groupId>
lcsb.mapviewer
</groupId>
<artifactId>
service
</artifactId>
...
...
@@ -72,16 +71,16 @@
<version>
${servlet-api.version}
</version>
<scope>
provided
</scope>
</dependency>
<dependency>
<groupId>
org.springframework.webflow
</groupId>
<artifactId>
spring-faces
</artifactId>
<version>
${springframework.webflow.version}
</version>
<exclusions>
<exclusion>
<groupId>
commons-logging
</groupId>
<artifactId>
commons-logging
</artifactId>
</exclusion>
<groupId>
commons-logging
</groupId>
<artifactId>
commons-logging
</artifactId>
</exclusion>
</exclusions>
</dependency>
...
...
@@ -96,9 +95,9 @@
<version>
${springframework.version}
</version>
<exclusions>
<exclusion>
<groupId>
commons-logging
</groupId>
<artifactId>
commons-logging
</artifactId>
</exclusion>
<groupId>
commons-logging
</groupId>
<artifactId>
commons-logging
</artifactId>
</exclusion>
</exclusions>
</dependency>
...
...
@@ -118,14 +117,14 @@
<groupId>
org.springframework
</groupId>
<artifactId>
spring-tx
</artifactId>
<version>
${springframework.version}
</version>
</dependency>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-orm
</artifactId>
<version>
${springframework.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-test
</artifactId>
...
...
@@ -167,12 +166,18 @@
<groupId>
cglib
</groupId>
<artifactId>
cglib
</artifactId>
<version>
${cglib.version}
</version>
</dependency>
</dependency>
<dependency>
<groupId>
commons-fileupload
</groupId>
<artifactId>
commons-fileupload
</artifactId>
<version>
${commons-fileupload.version}
</version>
<exclusions>
<exclusion>
<groupId>
commons-io
</groupId>
<artifactId>
commons-io
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
...
...
@@ -181,13 +186,20 @@
<version>
${commons-validator.version}
</version>
<exclusions>
<exclusion>
<groupId>
commons-logging
</groupId>
<artifactId>
commons-logging
</artifactId>
</exclusion>
<groupId>
commons-logging
</groupId>
<artifactId>
commons-logging
</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- mockito used for testing -->
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>
commons-io
</groupId>
<artifactId>
commons-io
</artifactId>
<version>
${commons-io.version}
</version>
</dependency>
<!-- mockito used for testing -->
<dependency>
<groupId>
org.mockito
</groupId>
<artifactId>
mockito-core
</artifactId>
...
...
@@ -197,52 +209,52 @@
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>
maven-resources-plugin
</artifactId>
<version>
2.7
</version>
<executions>
<execution>
<id>
copy-js
</id>
<phase>
prepare-package
</phase>
<goals>
<goal>
copy-resources
</goal>
</goals>
<configuration>
<outputDirectory>
${basedir}/src/main/webapp/resources/js/
</outputDirectory>
<resources>
<resource>
<directory>
${basedir}/../frontend-js/dist/
</directory>
<includes>
<include>
**/*.js
</include>
<include>
**/*.map
</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>
copy-css
</id>
<phase>
prepare-package
</phase>
<goals>
<goal>
copy-resources
</goal>
</goals>
<configuration>
<outputDirectory>
${basedir}/src/main/webapp/resources/css/
</outputDirectory>
<resources>
<resource>
<directory>
${basedir}/../frontend-js/dist/
</directory>
<includes>
<include>
**/*.css
</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<artifactId>
maven-resources-plugin
</artifactId>
<version>
2.7
</version>
<executions>
<execution>
<id>
copy-js
</id>
<phase>
prepare-package
</phase>
<goals>
<goal>
copy-resources
</goal>
</goals>
<configuration>
<outputDirectory>
${basedir}/src/main/webapp/resources/js/
</outputDirectory>
<resources>
<resource>
<directory>
${basedir}/../frontend-js/dist/
</directory>
<includes>
<include>
**/*.js
</include>
<include>
**/*.map
</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>
copy-css
</id>
<phase>
prepare-package
</phase>
<goals>
<goal>
copy-resources
</goal>
</goals>
<configuration>
<outputDirectory>
${basedir}/src/main/webapp/resources/css/
</outputDirectory>
<resources>
<resource>
<directory>
${basedir}/../frontend-js/dist/
</directory>
<includes>
<include>
**/*.css
</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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