Shinsuke Sugaya %!s(int64=10) %!d(string=hai) anos
pai
achega
e4a3735f87
Modificáronse 2 ficheiros con 7 adicións e 9 borrados
  1. 7 7
      pom.xml
  2. 0 2
      src/main/resources/lasta_di.properties

+ 7 - 7
pom.xml

@@ -39,7 +39,7 @@
 
 
 		<!-- Main Framework -->
 		<!-- Main Framework -->
 		<dbflute.version>1.1.0-sp8-RC1</dbflute.version>
 		<dbflute.version>1.1.0-sp8-RC1</dbflute.version>
-		<lastaflute.version>0.6.1-RC5</lastaflute.version>
+		<lastaflute.version>0.6.1-RC8</lastaflute.version>
 		<lasta.taglib.version>0.6.0</lasta.taglib.version>
 		<lasta.taglib.version>0.6.0</lasta.taglib.version>
 		<servlet.version>3.1.0</servlet.version>
 		<servlet.version>3.1.0</servlet.version>
 		<jsp.version>2.3.1</jsp.version>
 		<jsp.version>2.3.1</jsp.version>
@@ -373,12 +373,6 @@
 			<version>1.1.3</version>
 			<version>1.1.3</version>
 			<scope>provided</scope>
 			<scope>provided</scope>
 		</dependency>
 		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-			<scope>provided</scope>
-		</dependency>
 
 
 		<!-- servlet -->
 		<!-- servlet -->
 		<dependency>
 		<dependency>
@@ -412,6 +406,12 @@
 			<groupId>org.codelibs</groupId>
 			<groupId>org.codelibs</groupId>
 			<artifactId>elasticsearch-cluster-runner</artifactId>
 			<artifactId>elasticsearch-cluster-runner</artifactId>
 			<version>${cluster.runner.version}</version>
 			<version>${cluster.runner.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		</dependency>
 
 
 		<!-- common library -->
 		<!-- common library -->

+ 0 - 2
src/main/resources/lasta_di.properties

@@ -7,5 +7,3 @@ smart.deploy.mode.location = fess_env.properties: lasta_di.smart.deploy.mode
 
 
 # package for smart deploy target e.g. org.docksidestage.app
 # package for smart deploy target e.g. org.docksidestage.app
 smart.package1 = org.codelibs.fess.app
 smart.package1 = org.codelibs.fess.app
-# TODO remove
-smart.package2 = org.codelibs.sastruts.core