iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/eugenp/tutorials into BAEL-13313

This commit is contained in:
amit2103 2019-04-07 11:27:06 +05:30
parent caef6500c2 2cd8a93fe5
commit 9a69933712
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/pom.xml
View File

@ -481,16 +481,6 @@
<groupId>org.docx4j</groupId> <groupId>org.docx4j</groupId>
<artifactId>docx4j</artifactId> <artifactId>docx4j</artifactId>
<version>${docx4j.version}</version> <version>${docx4j.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>

17
logging-modules/logback/pom.xml
View File

@ -37,12 +37,29 @@
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.docx4j</groupId>
<artifactId>docx4j</artifactId>
<version>${docx4j.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
<logback.contrib.version>0.1.5</logback.contrib.version> <logback.contrib.version>0.1.5</logback.contrib.version>
<jackson.version>2.9.7</jackson.version> <jackson.version>2.9.7</jackson.version>
<docx4j.version>3.3.5</docx4j.version>
</properties> </properties>
</project> </project>