|
|
@@ -83,7 +83,7 @@
|
|
|
<database>mysql</database>
|
|
|
<databaseGroupId>mysql</databaseGroupId>
|
|
|
<databaseArtifactId>mysql-connector-java</databaseArtifactId>
|
|
|
- <databaseVersion>5.1.25</databaseVersion>
|
|
|
+ <databaseVersion>5.1.30</databaseVersion>
|
|
|
<databaseDriver>com.mysql.jdbc.Driver</databaseDriver>
|
|
|
<databaseUrl>jdbc:mysql://localhost:3306/fess_db?noDatetimeStringSync=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true</databaseUrl>
|
|
|
<databaseTestUrl>jdbc:mysql://localhost:3306/fess_testdb?noDatetimeStringSync=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true</databaseTestUrl>
|
|
|
@@ -110,6 +110,8 @@
|
|
|
<dbflute.version>1.0.4K</dbflute.version>
|
|
|
<s2robot.version>0.7.1-SNAPSHOT</s2robot.version>
|
|
|
<solr.version>4.7.1</solr.version>
|
|
|
+ <slf4j.version>1.7.6</slf4j.version>
|
|
|
+ <poi.version>3.10-FINAL</poi.version>
|
|
|
</properties>
|
|
|
<build>
|
|
|
<finalName>fess</finalName>
|
|
|
@@ -145,7 +147,6 @@
|
|
|
<plugin>
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
<artifactId>maven-war-plugin</artifactId>
|
|
|
- <version>2.1-beta-1</version>
|
|
|
<configuration>
|
|
|
<webResources>
|
|
|
<resource>
|
|
|
@@ -182,7 +183,6 @@
|
|
|
<plugin>
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
<artifactId>maven-antrun-plugin</artifactId>
|
|
|
- <version>1.3</version>
|
|
|
<executions>
|
|
|
<execution>
|
|
|
<id>delete-lib-dir</id>
|
|
|
@@ -239,7 +239,6 @@
|
|
|
<plugin>
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
<artifactId>maven-dependency-plugin</artifactId>
|
|
|
- <version>2.1</version>
|
|
|
<executions>
|
|
|
<execution>
|
|
|
<goals>
|
|
|
@@ -258,7 +257,6 @@
|
|
|
<plugin>
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
<artifactId>maven-eclipse-plugin</artifactId>
|
|
|
- <version>2.7</version>
|
|
|
<configuration>
|
|
|
<buildOutputDirectory>src/main/webapp/WEB-INF/classes</buildOutputDirectory>
|
|
|
<downloadSources>true</downloadSources>
|
|
|
@@ -306,7 +304,6 @@
|
|
|
</plugin>
|
|
|
<plugin>
|
|
|
<artifactId>maven-site-plugin</artifactId>
|
|
|
- <version>3.2</version>
|
|
|
<configuration>
|
|
|
<locales>en,ja</locales>
|
|
|
<inputEncoding>UTF-8</inputEncoding>
|
|
|
@@ -316,7 +313,6 @@
|
|
|
<plugin>
|
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
|
<artifactId>sql-maven-plugin</artifactId>
|
|
|
- <version>1.2</version>
|
|
|
<dependencies>
|
|
|
<dependency>
|
|
|
<groupId>${databaseGroupId}</groupId>
|
|
|
@@ -371,7 +367,7 @@
|
|
|
<extension>
|
|
|
<groupId>org.apache.maven.wagon</groupId>
|
|
|
<artifactId>wagon-ftp</artifactId>
|
|
|
- <version>1.0-beta-6</version>
|
|
|
+ <version>2.6</version>
|
|
|
</extension>
|
|
|
</extensions>
|
|
|
</build>
|
|
|
@@ -463,7 +459,7 @@
|
|
|
<dependency>
|
|
|
<groupId>commons-collections</groupId>
|
|
|
<artifactId>commons-collections</artifactId>
|
|
|
- <version>3.2</version>
|
|
|
+ <version>3.2.1</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>commons-beanutils</groupId>
|
|
|
@@ -510,17 +506,17 @@
|
|
|
<dependency>
|
|
|
<groupId>org.slf4j</groupId>
|
|
|
<artifactId>jcl-over-slf4j</artifactId>
|
|
|
- <version>1.7.5</version>
|
|
|
+ <version>${slf4j.version}</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.slf4j</groupId>
|
|
|
<artifactId>slf4j-api</artifactId>
|
|
|
- <version>1.7.5</version>
|
|
|
+ <version>${slf4j.version}</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.slf4j</groupId>
|
|
|
<artifactId>slf4j-log4j12</artifactId>
|
|
|
- <version>1.7.5</version>
|
|
|
+ <version>${slf4j.version}</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.apache.solr</groupId>
|
|
|
@@ -625,14 +621,6 @@
|
|
|
<groupId>xml-apis</groupId>
|
|
|
<artifactId>xml-apis</artifactId>
|
|
|
</exclusion>
|
|
|
- <exclusion>
|
|
|
- <groupId>org.bouncycastle</groupId>
|
|
|
- <artifactId>bcprov-jdk15</artifactId>
|
|
|
- </exclusion>
|
|
|
- <exclusion>
|
|
|
- <groupId>org.bouncycastle</groupId>
|
|
|
- <artifactId>bcmail-jdk15</artifactId>
|
|
|
- </exclusion>
|
|
|
</exclusions>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
@@ -648,7 +636,7 @@
|
|
|
<dependency>
|
|
|
<groupId>org.quartz-scheduler</groupId>
|
|
|
<artifactId>quartz</artifactId>
|
|
|
- <version>2.2.0</version>
|
|
|
+ <version>2.2.1</version>
|
|
|
</dependency>
|
|
|
<!-- Geronimo -->
|
|
|
<dependency>
|
|
|
@@ -724,13 +712,13 @@
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.bouncycastle</groupId>
|
|
|
- <artifactId>bcprov-jdk16</artifactId>
|
|
|
- <version>1.46</version>
|
|
|
+ <artifactId>bcprov-jdk15on</artifactId>
|
|
|
+ <version>1.50</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.bouncycastle</groupId>
|
|
|
- <artifactId>bcmail-jdk16</artifactId>
|
|
|
- <version>1.46</version>
|
|
|
+ <artifactId>bcmail-jdk15on</artifactId>
|
|
|
+ <version>1.50</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>args4j</groupId>
|
|
|
@@ -740,12 +728,12 @@
|
|
|
<dependency>
|
|
|
<groupId>org.apache.tika</groupId>
|
|
|
<artifactId>tika-core</artifactId>
|
|
|
- <version>1.4</version>
|
|
|
+ <version>1.5</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.apache.tika</groupId>
|
|
|
<artifactId>tika-parsers</artifactId>
|
|
|
- <version>1.4</version>
|
|
|
+ <version>1.5</version>
|
|
|
<exclusions>
|
|
|
<exclusion>
|
|
|
<groupId>org.bouncycastle</groupId>
|
|
|
@@ -765,17 +753,17 @@
|
|
|
<dependency>
|
|
|
<groupId>org.apache.pdfbox</groupId>
|
|
|
<artifactId>pdfbox</artifactId>
|
|
|
- <version>1.8.3</version>
|
|
|
+ <version>1.8.4</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.apache.poi</groupId>
|
|
|
<artifactId>poi</artifactId>
|
|
|
- <version>3.10-beta2</version>
|
|
|
+ <version>${poi.version}</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.apache.poi</groupId>
|
|
|
<artifactId>poi-ooxml</artifactId>
|
|
|
- <version>3.10-beta2</version>
|
|
|
+ <version>${poi.version}</version>
|
|
|
<exclusions>
|
|
|
<exclusion>
|
|
|
<groupId>xml-apis</groupId>
|
|
|
@@ -786,7 +774,7 @@
|
|
|
<dependency>
|
|
|
<groupId>org.apache.poi</groupId>
|
|
|
<artifactId>poi-scratchpad</artifactId>
|
|
|
- <version>3.10-beta2</version>
|
|
|
+ <version>${poi.version}</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.javassist</groupId>
|
|
|
@@ -796,17 +784,17 @@
|
|
|
<dependency>
|
|
|
<groupId>net.arnx</groupId>
|
|
|
<artifactId>jsonic</artifactId>
|
|
|
- <version>1.3.0</version>
|
|
|
+ <version>1.3.3</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>com.github.jknack</groupId>
|
|
|
<artifactId>handlebars</artifactId>
|
|
|
- <version>1.2.1</version>
|
|
|
+ <version>1.3.0</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.codehaus.groovy</groupId>
|
|
|
<artifactId>groovy-all</artifactId>
|
|
|
- <version>2.1.7</version>
|
|
|
+ <version>2.2.2</version>
|
|
|
</dependency>
|
|
|
<!-- Removed from war -->
|
|
|
<dependency>
|
Shinsuke Sugaya