Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CDEK Development
cdek-manager-report
Commits
45d045db
Commit
45d045db
authored
8 years ago
by
Rustam Sultansoy
Browse files
Options
Download
Email Patches
Plain Diff
remove parent pom xml
parent
e0d26346
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
compile.sh
+14
-0
compile.sh
modules/pom.xml
+0
-368
modules/pom.xml
modules/smr-common/pom.xml
+51
-10
modules/smr-common/pom.xml
modules/smr-dao/pom.xml
+122
-17
modules/smr-dao/pom.xml
modules/smr-model/pom.xml
+54
-7
modules/smr-model/pom.xml
modules/smr-service/pom.xml
+114
-19
modules/smr-service/pom.xml
modules/smr-synchronization/pom.xml
+114
-10
modules/smr-synchronization/pom.xml
modules/smr-web/pom.xml
+114
-7
modules/smr-web/pom.xml
with
583 additions
and
438 deletions
+583
-438
compile.sh
0 → 100755
View file @
45d045db
#!/usr/bin/env bash
cd
modules/smr-common
mvn clean
install
cd
../smr-model
mvn clean
install
cd
../smr-dao
mvn clean
install
cd
../smr-service
mvn clean
install
cd
../smr-synchronization
mvn clean
install
cd
../smr-web
mvn clean
install
\ No newline at end of file
This diff is collapsed.
Click to expand it.
modules/pom.xml
deleted
100644 → 0
View file @
e0d26346
<?xml version="1.0" encoding="UTF-8"?>
<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>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-parent
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<packaging>
pom
</packaging>
<description>
Parent module for sales manager reports modules
</description>
<modules>
<module>
smr-common
</module>
<module>
smr-model
</module>
<module>
smr-dao
</module>
<module>
smr-service
</module>
<module>
smr-web
</module>
</modules>
<properties>
<!-- Cdek versions -->
<com.cdek.Common.version>
RELEASE
</com.cdek.Common.version>
<com.cdek.lib.ChinaLib.version>
1.0-SNAPSHOT
</com.cdek.lib.ChinaLib.version>
<com.cdek.commons-jdbc.version>
RELEASE
</com.cdek.commons-jdbc.version>
<com.cdek.authinclude.authinclude.version>
RELEASE
</com.cdek.authinclude.authinclude.version>
<com.cdek.catalog.CatalogCommon.version>
1.0-4
</com.cdek.catalog.CatalogCommon.version>
<com.cdek.catalog.CatalogEntities.version>
RELEASE
</com.cdek.catalog.CatalogEntities.version>
<org.hc.JP.JettyPlatform.version>
RELEASE
</org.hc.JP.JettyPlatform.version>
<com.cdek.catalog.Catalog-Postgres.version>
RELEASE
</com.cdek.catalog.Catalog-Postgres.version>
<com.cdek.queue.cdek-queue-client.version>
1.0-6
</com.cdek.queue.cdek-queue-client.version>
<com.cdek.queue.cdek-queue-postgre.version>
1.0-4
</com.cdek.queue.cdek-queue-postgre.version>
<maven.compiler.source>
1.8
</maven.compiler.source>
<maven.compiler.target>
1.8
</maven.compiler.target>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<spring.version>
4.1.7.RELEASE
</spring.version>
<spring-security.version>
4.0.3.RELEASE
</spring-security.version>
<commons.collections4.version>
4.1
</commons.collections4.version>
<commons.collections.version>
3.2.1
</commons.collections.version>
<commons.codec.version>
1.9
</commons.codec.version>
<commons.lang.version>
2.6
</commons.lang.version>
<commons.io.version>
1.3.2
</commons.io.version>
<postgres.version>
9.4-1204-jdbc4
</postgres.version>
<jackson.verion>
2.7.2
</jackson.verion>
<junit.version>
4.12
</junit.version>
<slf4j.version>
1.7.7
</slf4j.version>
<log4j.version>
1.2.17
</log4j.version>
<mybatis.spring.version>
1.2.3
</mybatis.spring.version>
<mybatis.version>
3.3.0
</mybatis.version>
<randombeans.version>
2.0.0
</randombeans.version>
<mockito.version>
1.10.19
</mockito.version>
<flywaydb.version>
3.2.1
</flywaydb.version>
<flyway.spring.test.version>
4.0
</flyway.spring.test.version>
<dbcp.version>
1.4
</dbcp.version>
<okhttp.version>
2.5.0
</okhttp.version>
</properties>
<dependencyManagement>
<dependencies>
<!-- Cdek commons -->
<dependency>
<groupId>
com.cdek
</groupId>
<artifactId>
Commons
</artifactId>
<version>
${com.cdek.Common.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.lib
</groupId>
<artifactId>
ChinaLib
</artifactId>
<version>
${com.cdek.lib.ChinaLib.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek
</groupId>
<artifactId>
commons-jdbc
</artifactId>
<version>
${com.cdek.commons-jdbc.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.authinclude
</groupId>
<artifactId>
authinclude
</artifactId>
<version>
${com.cdek.authinclude.authinclude.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.catalog
</groupId>
<artifactId>
CatalogCommon
</artifactId>
<version>
${com.cdek.catalog.CatalogCommon.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.catalog
</groupId>
<artifactId>
CatalogEntities
</artifactId>
<version>
${com.cdek.catalog.CatalogEntities.version}
</version>
</dependency>
<dependency>
<groupId>
org.hc.JP
</groupId>
<artifactId>
JettyPlatform
</artifactId>
<version>
${org.hc.JP.JettyPlatform.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.catalog
</groupId>
<artifactId>
Catalog-Postgres
</artifactId>
<version>
${com.cdek.catalog.Catalog-Postgres.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.queue
</groupId>
<artifactId>
cdek-queue-client
</artifactId>
<version>
${com.cdek.queue.cdek-queue-client.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.queue
</groupId>
<artifactId>
cdek-queue-postgre
</artifactId>
<version>
${com.cdek.queue.cdek-queue-postgre.version}
</version>
</dependency>
<!-- Commons -->
<dependency>
<groupId>
commons-codec
</groupId>
<artifactId>
commons-codec
</artifactId>
<version>
${commons.codec.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.commons
</groupId>
<artifactId>
commons-collections4
</artifactId>
<version>
${commons.collections4.version}
</version>
</dependency>
<dependency>
<groupId>
commons-collections
</groupId>
<artifactId>
commons-collections
</artifactId>
<version>
${commons.collections.version}
</version>
</dependency>
<dependency>
<groupId>
commons-lang
</groupId>
<artifactId>
commons-lang
</artifactId>
<version>
${commons.lang.version}
</version>
</dependency>
<dependency>
<groupId>
commons-dbcp
</groupId>
<artifactId>
commons-dbcp
</artifactId>
<version>
${dbcp.version}
</version>
</dependency>
<dependency>
<groupId>
commons-io
</groupId>
<artifactId>
commons-io
</artifactId>
<version>
${commons.io.version}
</version>
</dependency>
<!-- Spring dependencies -->
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-web
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-webmvc
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-jdbc
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-tx
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-core
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-beans
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context-support
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<!-- OkHttp -->
<dependency>
<groupId>
com.squareup.okhttp
</groupId>
<artifactId>
okhttp
</artifactId>
<version>
${okhttp.version}
</version>
</dependency>
<!-- Spring Security -->
<dependency>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-core
</artifactId>
<version>
${spring-security.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-config
</artifactId>
<version>
${spring-security.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-acl
</artifactId>
<version>
${spring-security.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-web
</artifactId>
<version>
${spring-security.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-taglibs
</artifactId>
<version>
${spring-security.version}
</version>
</dependency>
<!-- Jackson -->
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-core
</artifactId>
<version>
${jackson.verion}
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-databind
</artifactId>
<version>
${jackson.verion}
</version>
</dependency>
<!-- Postgres -->
<dependency>
<groupId>
org.postgresql
</groupId>
<artifactId>
postgresql
</artifactId>
<version>
${postgres.version}
</version>
</dependency>
<!-- Flywadb -->
<dependency>
<groupId>
org.flywaydb
</groupId>
<artifactId>
flyway-core
</artifactId>
<version>
${flywaydb.version}
</version>
</dependency>
<!--MyBatis-->
<dependency>
<groupId>
org.mybatis
</groupId>
<artifactId>
mybatis
</artifactId>
<version>
${mybatis.version}
</version>
</dependency>
<dependency>
<groupId>
org.mybatis
</groupId>
<artifactId>
mybatis-spring
</artifactId>
<version>
${mybatis.spring.version}
</version>
</dependency>
<!-- Log -->
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-api
</artifactId>
<version>
${slf4j.version}
</version>
</dependency>
<dependency>
<groupId>
log4j
</groupId>
<artifactId>
log4j
</artifactId>
<version>
${log4j.version}
</version>
</dependency>
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-log4j12
</artifactId>
<version>
${slf4j.version}
</version>
</dependency>
<!-- Testing Dependencies -->
<dependency>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
${junit.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-test
</artifactId>
<version>
${spring.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.mockito
</groupId>
<artifactId>
mockito-core
</artifactId>
<version>
${mockito.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.flywaydb.flyway-test-extensions
</groupId>
<artifactId>
flyway-spring-test
</artifactId>
<version>
${flyway.spring.test.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
io.github.benas
</groupId>
<artifactId>
random-beans
</artifactId>
<version>
${randombeans.version}
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>
org.jacoco
</groupId>
<artifactId>
jacoco-maven-plugin
</artifactId>
<version>
0.7.6.201602180812
</version>
<executions>
<execution>
<id>
default-prepare-agent
</id>
<goals>
<goal>
prepare-agent
</goal>
</goals>
</execution>
<execution>
<id>
default-report
</id>
<phase>
prepare-package
</phase>
<goals>
<goal>
report
</goal>
</goals>
</execution>
<execution>
<id>
default-check
</id>
<goals>
<goal>
check
</goal>
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule
implementation=
"org.jacoco.maven.RuleConfiguration"
>
<element>
BUNDLE
</element>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit
implementation=
"org.jacoco.report.check.Limit"
>
<counter>
COMPLEXITY
</counter>
<value>
COVEREDRATIO
</value>
<minimum>
0.50
</minimum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>
test1
</id>
<name>
Cdek repo
</name>
<url>
http://nexus.cdek.ru/content/repositories/test1
</url>
</repository>
</repositories>
</project>
This diff is collapsed.
Click to expand it.
modules/smr-common/pom.xml
View file @
45d045db
...
...
@@ -2,56 +2,97 @@
<project
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns=
"http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<artifactId>
smr-parent
</artifactId>
<groupId>
com.cdek.smr
</groupId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-common
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<packaging>
jar
</packaging>
<properties>
<smr.version>
1.0-SNAPSHOT
</smr.version>
<!-- Cdek versions -->
<com.cdek.Common.version>
RELEASE
</com.cdek.Common.version>
<com.cdek.commons-jdbc.version>
RELEASE
</com.cdek.commons-jdbc.version>
<com.cdek.authinclude.authinclude.version>
RELEASE
</com.cdek.authinclude.authinclude.version>
<com.cdek.catalog.CatalogCommon.version>
1.0-4
</com.cdek.catalog.CatalogCommon.version>
<com.cdek.catalog.CatalogEntities.version>
RELEASE
</com.cdek.catalog.CatalogEntities.version>
<com.cdek.catalog.Catalog-Postgres.version>
RELEASE
</com.cdek.catalog.Catalog-Postgres.version>
<com.cdek.queue.cdek-queue-client.version>
1.0-6
</com.cdek.queue.cdek-queue-client.version>
<com.cdek.queue.cdek-queue-postgre.version>
1.0-4
</com.cdek.queue.cdek-queue-postgre.version>
<maven.compiler.source>
1.8
</maven.compiler.source>
<maven.compiler.target>
1.8
</maven.compiler.target>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<spring.version>
4.1.7.RELEASE
</spring.version>
<commons.collections4.version>
4.1
</commons.collections4.version>
<commons.collections.version>
3.2.1
</commons.collections.version>
<commons.codec.version>
1.9
</commons.codec.version>
<commons.lang.version>
2.6
</commons.lang.version>
<commons.io.version>
1.3.2
</commons.io.version>
<postgres.version>
9.4-1204-jdbc4
</postgres.version>
<junit.version>
4.12
</junit.version>
<mybatis.spring.version>
1.2.3
</mybatis.spring.version>
<mybatis.version>
3.3.0
</mybatis.version>
<mockito.version>
1.10.19
</mockito.version>
<flywaydb.version>
3.2.1
</flywaydb.version>
<flyway.spring.test.version>
4.0
</flyway.spring.test.version>
<dbcp.version>
1.4
</dbcp.version>
<okhttp.version>
2.5.0
</okhttp.version>
</properties>
<dependencies>
<dependency>
<groupId>
com.cdek
</groupId>
<artifactId>
Commons
</artifactId>
</dependency>
<dependency>
<groupId>
com.cdek
</groupId>
<artifactId>
Commons
</artifactId>
<version>
${com.cdek.Common.version}
</version>
</dependency>
<!--Spring dependencies-->
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-core
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-web
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<!-- Commons -->
<dependency>
<groupId>
commons-collections
</groupId>
<artifactId>
commons-collections
</artifactId>
<version>
${commons.collections.version}
</version>
</dependency>
<dependency>
<groupId>
commons-lang
</groupId>
<artifactId>
commons-lang
</artifactId>
<version>
${commons.lang.version}
</version>
</dependency>
<!--OkHttp-->
<dependency>
<groupId>
com.squareup.okhttp
</groupId>
<artifactId>
okhttp
</artifactId>
<version>
${okhttp.version}
</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>
test1
</id>
<name>
Cdek repo
</name>
<url>
http://nexus.cdek.ru/content/repositories/test1
</url>
</repository>
</repositories>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
modules/smr-dao/pom.xml
View file @
45d045db
...
...
@@ -2,24 +2,48 @@
<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"
>
<parent>
<artifactId>
smr-parent
</artifactId>
<groupId>
com.cdek.smr
</groupId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-dao
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<packaging>
jar
</packaging>
<build>
<testResources>
<testResource>
<directory>
src/test/resources
</directory>
<filtering>
true
</filtering>
</testResource>
</testResources>
</build>
<properties>
<smr.version>
1.0-SNAPSHOT
</smr.version>
<!-- Cdek versions -->
<com.cdek.Common.version>
RELEASE
</com.cdek.Common.version>
<com.cdek.lib.ChinaLib.version>
1.0-SNAPSHOT
</com.cdek.lib.ChinaLib.version>
<com.cdek.commons-jdbc.version>
RELEASE
</com.cdek.commons-jdbc.version>
<com.cdek.authinclude.authinclude.version>
RELEASE
</com.cdek.authinclude.authinclude.version>
<com.cdek.catalog.CatalogCommon.version>
1.0-4
</com.cdek.catalog.CatalogCommon.version>
<com.cdek.catalog.CatalogEntities.version>
RELEASE
</com.cdek.catalog.CatalogEntities.version>
<com.cdek.catalog.Catalog-Postgres.version>
RELEASE
</com.cdek.catalog.Catalog-Postgres.version>
<com.cdek.queue.cdek-queue-client.version>
1.0-6
</com.cdek.queue.cdek-queue-client.version>
<com.cdek.queue.cdek-queue-postgre.version>
1.0-4
</com.cdek.queue.cdek-queue-postgre.version>
<maven.compiler.source>
1.8
</maven.compiler.source>
<maven.compiler.target>
1.8
</maven.compiler.target>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<spring.version>
4.1.7.RELEASE
</spring.version>
<commons.collections4.version>
4.1
</commons.collections4.version>
<commons.collections.version>
3.2.1
</commons.collections.version>
<commons.codec.version>
1.9
</commons.codec.version>
<commons.lang.version>
2.6
</commons.lang.version>
<commons.io.version>
1.3.2
</commons.io.version>
<postgres.version>
9.4-1204-jdbc4
</postgres.version>
<junit.version>
4.12
</junit.version>
<slf4j.version>
1.7.7
</slf4j.version>
<log4j.version>
1.2.17
</log4j.version>
<mybatis.spring.version>
1.2.3
</mybatis.spring.version>
<mybatis.version>
3.3.0
</mybatis.version>
<randombeans.version>
2.0.0
</randombeans.version>
<mockito.version>
1.10.19
</mockito.version>
<flywaydb.version>
3.2.1
</flywaydb.version>
<flyway.spring.test.version>
4.0
</flyway.spring.test.version>
<dbcp.version>
1.4
</dbcp.version>
<okhttp.version>
2.5.0
</okhttp.version>
</properties>
<dependencies>
...
...
@@ -27,72 +51,85 @@
<dependency>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-common
</artifactId>
<version>
${
project.parent
.version}
</version>
<version>
${
smr
.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-model
</artifactId>
<version>
${
project.parent
.version}
</version>
<version>
${
smr
.version}
</version>
</dependency>
<!-- CDEK -->
<dependency>
<groupId>
com.cdek.lib
</groupId>
<artifactId>
ChinaLib
</artifactId>
<version>
${com.cdek.lib.ChinaLib.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.catalog
</groupId>
<artifactId>
Catalog-Postgres
</artifactId>
<version>
${com.cdek.catalog.Catalog-Postgres.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek
</groupId>
<artifactId>
commons-jdbc
</artifactId>
<version>
${com.cdek.commons-jdbc.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.catalog
</groupId>
<artifactId>
CatalogEntities
</artifactId>
<version>
${com.cdek.catalog.CatalogEntities.version}
</version>
</dependency>
<!--Spring -->
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-jdbc
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-tx
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-core
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<!-- Commons -->
<dependency>
<groupId>
commons-collections
</groupId>
<artifactId>
commons-collections
</artifactId>
<version>
${commons.collections.version}
</version>
</dependency>
<dependency>
<groupId>
commons-dbcp
</groupId>
<artifactId>
commons-dbcp
</artifactId>
<version>
${dbcp.version}
</version>
</dependency>
<!-- Log -->
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-api
</artifactId>
<version>
${slf4j.version}
</version>
</dependency>
<dependency>
<groupId>
log4j
</groupId>
<artifactId>
log4j
</artifactId>
<version>
${log4j.version}
</version>
<scope>
compile
</scope>
</dependency>
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-log4j12
</artifactId>
<version>
${slf4j.version}
</version>
<scope>
compile
</scope>
</dependency>
...
...
@@ -100,6 +137,7 @@
<dependency>
<groupId>
org.postgresql
</groupId>
<artifactId>
postgresql
</artifactId>
<version>
${postgres.version}
</version>
</dependency>
<!--DBSetup-->
...
...
@@ -126,23 +164,26 @@
<dependency>
<groupId>
org.flywaydb
</groupId>
<artifactId>
flyway-core
</artifactId>
<version>
${flywaydb.version}
</version>
</dependency>
<!--MyBatis-->
<dependency>
<groupId>
org.mybatis
</groupId>
<artifactId>
mybatis
</artifactId>
<version>
${mybatis.version}
</version>
</dependency>
<dependency>
<groupId>
org.mybatis
</groupId>
<artifactId>
mybatis-spring
</artifactId>
<version>
${mybatis.spring.version}
</version>
</dependency>
<!--Test dependencies-->
<dependency>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
4.11
</version>
<version>
${junit.version}
</version>
</dependency>
<dependency>
<groupId>
org.dbunit
</groupId>
...
...
@@ -159,16 +200,19 @@
<dependency>
<groupId>
io.github.benas
</groupId>
<artifactId>
random-beans
</artifactId>
<version>
${randombeans.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.flywaydb.flyway-test-extensions
</groupId>
<artifactId>
flyway-spring-test
</artifactId>
<version>
${flyway.spring.test.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context-support
</artifactId>
<version>
${spring.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
...
...
@@ -188,7 +232,68 @@
<artifactId>
poi-ooxml
</artifactId>
<version>
3.12
</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>
org.jacoco
</groupId>
<artifactId>
jacoco-maven-plugin
</artifactId>
<version>
0.7.6.201602180812
</version>
<executions>
<execution>
<id>
default-prepare-agent
</id>
<goals>
<goal>
prepare-agent
</goal>
</goals>
</execution>
<execution>
<id>
default-report
</id>
<phase>
prepare-package
</phase>
<goals>
<goal>
report
</goal>
</goals>
</execution>
<execution>
<id>
default-check
</id>
<goals>
<goal>
check
</goal>
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule
implementation=
"org.jacoco.maven.RuleConfiguration"
>
<element>
BUNDLE
</element>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit
implementation=
"org.jacoco.report.check.Limit"
>
<counter>
COMPLEXITY
</counter>
<value>
COVEREDRATIO
</value>
<minimum>
0.50
</minimum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<testResources>
<testResource>
<directory>
src/test/resources
</directory>
<filtering>
true
</filtering>
</testResource>
</testResources>
</build>
<repositories>
<repository>
<id>
test1
</id>
<name>
Cdek repo
</name>
<url>
http://nexus.cdek.ru/content/repositories/test1
</url>
</repository>
</repositories>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
modules/smr-model/pom.xml
View file @
45d045db
...
...
@@ -2,15 +2,47 @@
<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"
>
<parent>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-parent
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-model
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<packaging>
jar
</packaging>
<properties>
<smr.version>
1.0-SNAPSHOT
</smr.version>
<!-- Cdek versions -->
<com.cdek.Common.version>
RELEASE
</com.cdek.Common.version>
<com.cdek.lib.ChinaLib.version>
1.0-SNAPSHOT
</com.cdek.lib.ChinaLib.version>
<com.cdek.commons-jdbc.version>
RELEASE
</com.cdek.commons-jdbc.version>
<com.cdek.authinclude.authinclude.version>
RELEASE
</com.cdek.authinclude.authinclude.version>
<com.cdek.catalog.CatalogCommon.version>
1.0-4
</com.cdek.catalog.CatalogCommon.version>
<com.cdek.catalog.CatalogEntities.version>
RELEASE
</com.cdek.catalog.CatalogEntities.version>
<com.cdek.catalog.Catalog-Postgres.version>
RELEASE
</com.cdek.catalog.Catalog-Postgres.version>
<com.cdek.queue.cdek-queue-client.version>
1.0-6
</com.cdek.queue.cdek-queue-client.version>
<com.cdek.queue.cdek-queue-postgre.version>
1.0-4
</com.cdek.queue.cdek-queue-postgre.version>
<com.cdek.contragent.version>
1.0-SNAPSHOT
</com.cdek.contragent.version>
<maven.compiler.source>
1.8
</maven.compiler.source>
<maven.compiler.target>
1.8
</maven.compiler.target>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<spring.version>
4.1.7.RELEASE
</spring.version>
<commons.collections4.version>
4.1
</commons.collections4.version>
<commons.collections.version>
3.2.1
</commons.collections.version>
<commons.codec.version>
1.9
</commons.codec.version>
<commons.lang.version>
2.6
</commons.lang.version>
<commons.io.version>
1.3.2
</commons.io.version>
<postgres.version>
9.4-1204-jdbc4
</postgres.version>
<jackson.verion>
2.7.2
</jackson.verion>
<junit.version>
4.12
</junit.version>
<mybatis.spring.version>
1.2.3
</mybatis.spring.version>
<mybatis.version>
3.3.0
</mybatis.version>
<mockito.version>
1.10.19
</mockito.version>
<flywaydb.version>
3.2.1
</flywaydb.version>
<flyway.spring.test.version>
4.0
</flyway.spring.test.version>
<dbcp.version>
1.4
</dbcp.version>
<okhttp.version>
2.5.0
</okhttp.version>
</properties>
<dependencies>
...
...
@@ -18,30 +50,34 @@
<dependency>
<groupId>
com.cdek.contragent
</groupId>
<artifactId>
com.cdek.contragent.model
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<version>
${com.cdek.contragent.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-common
</artifactId>
<version>
${
project.parent
.version}
</version>
<version>
${
smr
.version}
</version>
</dependency>
<!-- CDEK -->
<dependency>
<groupId>
com.cdek.lib
</groupId>
<artifactId>
ChinaLib
</artifactId>
<version>
${com.cdek.lib.ChinaLib.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.catalog
</groupId>
<artifactId>
CatalogEntities
</artifactId>
<version>
${com.cdek.catalog.CatalogEntities.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.catalog
</groupId>
<artifactId>
CatalogCommon
</artifactId>
<version>
${com.cdek.Common.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek
</groupId>
<artifactId>
Commons
</artifactId>
<version>
${com.cdek.Common.version}
</version>
<exclusions>
<exclusion>
<groupId>
*
</groupId>
...
...
@@ -54,19 +90,30 @@
<dependency>
<groupId>
commons-codec
</groupId>
<artifactId>
commons-codec
</artifactId>
<version>
${commons.codec.version}
</version>
</dependency>
<!-- Jackson -->
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-core
</artifactId>
<version>
${jackson.verion}
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-databind
</artifactId>
<version>
${jackson.verion}
</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>
test1
</id>
<name>
Cdek repo
</name>
<url>
http://nexus.cdek.ru/content/repositories/test1
</url>
</repository>
</repositories>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
modules/smr-service/pom.xml
View file @
45d045db
...
...
@@ -2,27 +2,50 @@
<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"
>
<parent>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-parent
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-service
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<packaging>
jar
</packaging>
<properties>
<log4j.version>
1.2.17
</log4j.version>
</properties>
<smr.version>
1.0-SNAPSHOT
</smr.version>
<build>
<testResources>
<testResource>
<directory>
src/test/resources
</directory>
<filtering>
false
</filtering>
</testResource>
</testResources>
</build>
<!-- Cdek versions -->
<com.cdek.Common.version>
RELEASE
</com.cdek.Common.version>
<com.cdek.lib.ChinaLib.version>
1.0-SNAPSHOT
</com.cdek.lib.ChinaLib.version>
<com.cdek.commons-jdbc.version>
RELEASE
</com.cdek.commons-jdbc.version>
<com.cdek.authinclude.authinclude.version>
RELEASE
</com.cdek.authinclude.authinclude.version>
<com.cdek.catalog.CatalogCommon.version>
1.0-4
</com.cdek.catalog.CatalogCommon.version>
<com.cdek.catalog.CatalogEntities.version>
RELEASE
</com.cdek.catalog.CatalogEntities.version>
<org.hc.JP.JettyPlatform.version>
RELEASE
</org.hc.JP.JettyPlatform.version>
<com.cdek.catalog.Catalog-Postgres.version>
RELEASE
</com.cdek.catalog.Catalog-Postgres.version>
<com.cdek.queue.cdek-queue-client.version>
1.0-6
</com.cdek.queue.cdek-queue-client.version>
<com.cdek.queue.cdek-queue-postgre.version>
1.0-4
</com.cdek.queue.cdek-queue-postgre.version>
<com.cdek.contragent.version>
1.0-SNAPSHOT
</com.cdek.contragent.version>
<maven.compiler.source>
1.8
</maven.compiler.source>
<maven.compiler.target>
1.8
</maven.compiler.target>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<spring.version>
4.1.7.RELEASE
</spring.version>
<commons.collections4.version>
4.1
</commons.collections4.version>
<commons.collections.version>
3.2.1
</commons.collections.version>
<commons.codec.version>
1.9
</commons.codec.version>
<commons.lang.version>
2.6
</commons.lang.version>
<commons.io.version>
1.3.2
</commons.io.version>
<postgres.version>
9.4-1204-jdbc4
</postgres.version>
<junit.version>
4.12
</junit.version>
<slf4j.version>
1.7.7
</slf4j.version>
<log4j.version>
1.2.17
</log4j.version>
<mybatis.spring.version>
1.2.3
</mybatis.spring.version>
<mybatis.version>
3.3.0
</mybatis.version>
<randombeans.version>
2.0.0
</randombeans.version>
<mockito.version>
1.10.19
</mockito.version>
<flywaydb.version>
3.2.1
</flywaydb.version>
<flyway.spring.test.version>
4.0
</flyway.spring.test.version>
<dbcp.version>
1.4
</dbcp.version>
<okhttp.version>
2.5.0
</okhttp.version>
</properties>
<dependencies>
<dependency>
...
...
@@ -49,36 +72,39 @@
<dependency>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-common
</artifactId>
<version>
${
project.parent
.version}
</version>
<version>
${
smr
.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-model
</artifactId>
<version>
${
project.parent
.version}
</version>
<version>
${
smr
.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-dao
</artifactId>
<version>
${
project.parent
.version}
</version>
<version>
${
smr
.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.contragent
</groupId>
<artifactId>
com.cdek.contragent.dao
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<version>
${com.cdek.contragent.version}
</version>
</dependency>
<!-- Spring -->
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context-support
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-webmvc
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
javax.mail
</groupId>
...
...
@@ -90,14 +116,17 @@
<dependency>
<groupId>
com.cdek.lib
</groupId>
<artifactId>
ChinaLib
</artifactId>
<version>
${com.cdek.lib.ChinaLib.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek
</groupId>
<artifactId>
Commons
</artifactId>
<version>
${com.cdek.Common.version}
</version>
</dependency>
<dependency>
<groupId>
org.hc.JP
</groupId>
<artifactId>
JettyPlatform
</artifactId>
<version>
${org.hc.JP.JettyPlatform.version}
</version>
</dependency>
<dependency>
<groupId>
org.jxls
</groupId>
...
...
@@ -112,6 +141,7 @@
<dependency>
<groupId>
log4j
</groupId>
<artifactId>
log4j
</artifactId>
<version>
${log4j.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.velocity
</groupId>
...
...
@@ -130,6 +160,7 @@
<dependency>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
${junit.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
...
...
@@ -147,11 +178,13 @@
<dependency>
<groupId>
io.github.benas
</groupId>
<artifactId>
random-beans
</artifactId>
<version>
${randombeans.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.flywaydb.flyway-test-extensions
</groupId>
<artifactId>
flyway-spring-test
</artifactId>
<version>
${flyway.spring.test.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
...
...
@@ -171,6 +204,7 @@
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-test
</artifactId>
<version>
${spring.version}
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
...
...
@@ -187,5 +221,66 @@
</snapshots>
</repository>
<repository>
<id>
test1
</id>
<name>
Cdek repo
</name>
<url>
http://nexus.cdek.ru/content/repositories/test1
</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>
org.jacoco
</groupId>
<artifactId>
jacoco-maven-plugin
</artifactId>
<version>
0.7.6.201602180812
</version>
<executions>
<execution>
<id>
default-prepare-agent
</id>
<goals>
<goal>
prepare-agent
</goal>
</goals>
</execution>
<execution>
<id>
default-report
</id>
<phase>
prepare-package
</phase>
<goals>
<goal>
report
</goal>
</goals>
</execution>
<execution>
<id>
default-check
</id>
<goals>
<goal>
check
</goal>
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule
implementation=
"org.jacoco.maven.RuleConfiguration"
>
<element>
BUNDLE
</element>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit
implementation=
"org.jacoco.report.check.Limit"
>
<counter>
COMPLEXITY
</counter>
<value>
COVEREDRATIO
</value>
<minimum>
0.50
</minimum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<testResources>
<testResource>
<directory>
src/test/resources
</directory>
<filtering>
false
</filtering>
</testResource>
</testResources>
</build>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
modules/smr-synchronization/pom.xml
View file @
45d045db
...
...
@@ -2,73 +2,114 @@
<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"
>
<parent>
<artifactId>
com.cdek.smr.parent
</artifactId>
<groupId>
com.cdek.smr
</groupId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
com.cdek.smr.synchronization
</artifactId>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-synchronization
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<packaging>
jar
</packaging>
<properties>
<smr.version>
1.0-SNAPSHOT
</smr.version>
<!-- Cdek versions -->
<com.cdek.Common.version>
RELEASE
</com.cdek.Common.version>
<com.cdek.lib.ChinaLib.version>
1.0-SNAPSHOT
</com.cdek.lib.ChinaLib.version>
<com.cdek.commons-jdbc.version>
RELEASE
</com.cdek.commons-jdbc.version>
<com.cdek.authinclude.authinclude.version>
RELEASE
</com.cdek.authinclude.authinclude.version>
<com.cdek.catalog.CatalogCommon.version>
1.0-4
</com.cdek.catalog.CatalogCommon.version>
<com.cdek.catalog.CatalogEntities.version>
RELEASE
</com.cdek.catalog.CatalogEntities.version>
<com.cdek.catalog.Catalog-Postgres.version>
RELEASE
</com.cdek.catalog.Catalog-Postgres.version>
<com.cdek.queue.cdek-queue-client.version>
1.0-6
</com.cdek.queue.cdek-queue-client.version>
<com.cdek.queue.cdek-queue-postgre.version>
1.0-4
</com.cdek.queue.cdek-queue-postgre.version>
<com.cdek.contragent.version>
1.0-SNAPSHOT
</com.cdek.contragent.version>
<org.hc.JP.JettyPlatform.version>
RELEASE
</org.hc.JP.JettyPlatform.version>
<maven.compiler.source>
1.8
</maven.compiler.source>
<maven.compiler.target>
1.8
</maven.compiler.target>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<spring.version>
4.1.7.RELEASE
</spring.version>
<commons.collections4.version>
4.1
</commons.collections4.version>
<commons.collections.version>
3.2.1
</commons.collections.version>
<commons.codec.version>
1.9
</commons.codec.version>
<commons.lang.version>
2.6
</commons.lang.version>
<commons.io.version>
1.3.2
</commons.io.version>
<postgres.version>
9.4-1204-jdbc4
</postgres.version>
<junit.version>
4.12
</junit.version>
<mybatis.spring.version>
1.2.3
</mybatis.spring.version>
<mybatis.version>
3.3.0
</mybatis.version>
<mockito.version>
1.10.19
</mockito.version>
<flywaydb.version>
3.2.1
</flywaydb.version>
<flyway.spring.test.version>
4.0
</flyway.spring.test.version>
<dbcp.version>
1.4
</dbcp.version>
<okhttp.version>
2.5.0
</okhttp.version>
<log4j.version>
1.2.17
</log4j.version>
</properties>
<dependencies>
<!-- Project dependencies -->
<dependency>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
com.cdek.smr.common
</artifactId>
<version>
${
project.parent
.version}
</version>
<version>
${
smr
.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
com.cdek.smr.model
</artifactId>
<version>
${
project.parent
.version}
</version>
<version>
${
smr
.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
com.cdek.smr.dao
</artifactId>
<version>
${
project.parent
.version}
</version>
<version>
${
smr
.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.contragent
</groupId>
<artifactId>
com.cdek.contragent.dao
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<version>
${com.cdek.contragent.version}
</version>
</dependency>
<!-- Spring -->
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context-support
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-webmvc
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<!-- CDEK -->
<dependency>
<groupId>
com.cdek.lib
</groupId>
<artifactId>
ChinaLib
</artifactId>
<version>
${com.cdek.lib.ChinaLib.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek
</groupId>
<artifactId>
Commons
</artifactId>
<version>
${com.cdek.Common.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.queue
</groupId>
<artifactId>
cdek-queue-client
</artifactId>
<version>
${com.cdek.queue.cdek-queue-client.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.queue
</groupId>
<artifactId>
cdek-queue-postgre
</artifactId>
<version>
${com.cdek.queue.cdek-queue-postgre.version}
</version>
</dependency>
<dependency>
<groupId>
org.hc.JP
</groupId>
<artifactId>
JettyPlatform
</artifactId>
<version>
${org.hc.JP.JettyPlatform.version}
</version>
</dependency>
<dependency>
<groupId>
org.jxls
</groupId>
...
...
@@ -83,6 +124,69 @@
<dependency>
<groupId>
log4j
</groupId>
<artifactId>
log4j
</artifactId>
<version>
${log4j.version}
</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>
test1
</id>
<name>
Cdek repo
</name>
<url>
http://nexus.cdek.ru/content/repositories/test1
</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>
org.jacoco
</groupId>
<artifactId>
jacoco-maven-plugin
</artifactId>
<version>
0.7.6.201602180812
</version>
<executions>
<execution>
<id>
default-prepare-agent
</id>
<goals>
<goal>
prepare-agent
</goal>
</goals>
</execution>
<execution>
<id>
default-report
</id>
<phase>
prepare-package
</phase>
<goals>
<goal>
report
</goal>
</goals>
</execution>
<execution>
<id>
default-check
</id>
<goals>
<goal>
check
</goal>
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule
implementation=
"org.jacoco.maven.RuleConfiguration"
>
<element>
BUNDLE
</element>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit
implementation=
"org.jacoco.report.check.Limit"
>
<counter>
COMPLEXITY
</counter>
<value>
COVEREDRATIO
</value>
<minimum>
0.50
</minimum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<testResources>
<testResource>
<directory>
src/test/resources
</directory>
<filtering>
false
</filtering>
</testResource>
</testResources>
</build>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
modules/smr-web/pom.xml
View file @
45d045db
...
...
@@ -2,14 +2,49 @@
<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"
>
<parent>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-parent
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-web
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<packaging>
jar
</packaging>
<properties>
<smr.version>
1.0-SNAPSHOT
</smr.version>
<!-- Cdek versions -->
<com.cdek.Common.version>
RELEASE
</com.cdek.Common.version>
<com.cdek.lib.ChinaLib.version>
1.0-SNAPSHOT
</com.cdek.lib.ChinaLib.version>
<com.cdek.commons-jdbc.version>
RELEASE
</com.cdek.commons-jdbc.version>
<com.cdek.authinclude.authinclude.version>
RELEASE
</com.cdek.authinclude.authinclude.version>
<com.cdek.catalog.CatalogCommon.version>
1.0-4
</com.cdek.catalog.CatalogCommon.version>
<com.cdek.catalog.CatalogEntities.version>
RELEASE
</com.cdek.catalog.CatalogEntities.version>
<org.hc.JP.JettyPlatform.version>
RELEASE
</org.hc.JP.JettyPlatform.version>
<com.cdek.catalog.Catalog-Postgres.version>
RELEASE
</com.cdek.catalog.Catalog-Postgres.version>
<com.cdek.queue.cdek-queue-client.version>
1.0-6
</com.cdek.queue.cdek-queue-client.version>
<com.cdek.queue.cdek-queue-postgre.version>
1.0-4
</com.cdek.queue.cdek-queue-postgre.version>
<maven.compiler.source>
1.8
</maven.compiler.source>
<maven.compiler.target>
1.8
</maven.compiler.target>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<spring.version>
4.1.7.RELEASE
</spring.version>
<spring-security.version>
4.0.3.RELEASE
</spring-security.version>
<commons.collections4.version>
4.1
</commons.collections4.version>
<commons.collections.version>
3.2.1
</commons.collections.version>
<commons.codec.version>
1.9
</commons.codec.version>
<commons.lang.version>
2.6
</commons.lang.version>
<commons.io.version>
1.3.2
</commons.io.version>
<postgres.version>
9.4-1204-jdbc4
</postgres.version>
<jackson.verion>
2.7.2
</jackson.verion>
<junit.version>
4.12
</junit.version>
<slf4j.version>
1.7.7
</slf4j.version>
<log4j.version>
1.2.17
</log4j.version>
<mybatis.spring.version>
1.2.3
</mybatis.spring.version>
<mybatis.version>
3.3.0
</mybatis.version>
<mockito.version>
1.10.19
</mockito.version>
<dbcp.version>
1.4
</dbcp.version>
<okhttp.version>
2.5.0
</okhttp.version>
</properties>
<dependencies>
...
...
@@ -17,44 +52,51 @@
<dependency>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-common
</artifactId>
<version>
${
project.parent
.version}
</version>
<version>
${
smr
.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.smr
</groupId>
<artifactId>
smr-service
</artifactId>
<version>
${
project.parent
.version}
</version>
<version>
${
smr
.version}
</version>
</dependency>
<!-- CDEK -->
<dependency>
<groupId>
com.cdek
</groupId>
<artifactId>
Commons
</artifactId>
<version>
${com.cdek.Common.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.authinclude
</groupId>
<artifactId>
authinclude
</artifactId>
<version>
${com.cdek.authinclude.authinclude.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.lib
</groupId>
<artifactId>
ChinaLib
</artifactId>
<version>
${com.cdek.lib.ChinaLib.version}
</version>
</dependency>
<dependency>
<groupId>
com.cdek.catalog
</groupId>
<artifactId>
CatalogCommon
</artifactId>
<version>
${com.cdek.catalog.CatalogCommon.version}
</version>
</dependency>
<dependency>
<groupId>
org.hc.JP
</groupId>
<artifactId>
JettyPlatform
</artifactId>
<version>
${org.hc.JP.JettyPlatform.version}
</version>
</dependency>
<!-- Jackson -->
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-core
</artifactId>
<version>
${jackson.verion}
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-databind
</artifactId>
<version>
${jackson.verion}
</version>
</dependency>
<!-- Servlet API-->
...
...
@@ -68,63 +110,76 @@
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context-support
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-webmvc
</artifactId>
<version>
${spring.version}
</version>
</dependency>
<!-- Spring-security -->
<dependency>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-core
</artifactId>
<version>
${spring-security.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-config
</artifactId>
<version>
${spring-security.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-acl
</artifactId>
<version>
${spring-security.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-web
</artifactId>
<version>
${spring-security.version}
</version>
</dependency>
<!-- Apache Commons -->
<dependency>
<groupId>
commons-io
</groupId>
<artifactId>
commons-io
</artifactId>
<version>
${commons.io.version}
</version>
</dependency>
<!-- Log -->
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-api
</artifactId>
<version>
${slf4j.version}
</version>
</dependency>
<dependency>
<groupId>
log4j
</groupId>
<artifactId>
log4j
</artifactId>
<version>
${log4j.version}
</version>
</dependency>
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-log4j12
</artifactId>
<version>
${slf4j.version}
</version>
</dependency>
<!-- Testing -->
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-test
</artifactId>
<version>
${spring.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
${junit.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
...
...
@@ -200,7 +255,59 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>
org.jacoco
</groupId>
<artifactId>
jacoco-maven-plugin
</artifactId>
<version>
0.7.6.201602180812
</version>
<executions>
<execution>
<id>
default-prepare-agent
</id>
<goals>
<goal>
prepare-agent
</goal>
</goals>
</execution>
<execution>
<id>
default-report
</id>
<phase>
prepare-package
</phase>
<goals>
<goal>
report
</goal>
</goals>
</execution>
<execution>
<id>
default-check
</id>
<goals>
<goal>
check
</goal>
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule
implementation=
"org.jacoco.maven.RuleConfiguration"
>
<element>
BUNDLE
</element>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit
implementation=
"org.jacoco.report.check.Limit"
>
<counter>
COMPLEXITY
</counter>
<value>
COVEREDRATIO
</value>
<minimum>
0.50
</minimum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>
test1
</id>
<name>
Cdek repo
</name>
<url>
http://nexus.cdek.ru/content/repositories/test1
</url>
</repository>
</repositories>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help