From 28758b2cf2eb9754141032e29bf8ec577d8ea812 Mon Sep 17 00:00:00 2001
From: Calvin <calvinxiu@gmail.com>
Date: Sun, 30 Jun 2013 12:29:34 +0800
Subject: [PATCH] =?UTF-8?q?#223=20=E4=BD=BF=E7=94=A8m2e=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=96=E4=BB=A3mvn=20eclipse:eclipse=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=B8=94=EF=BC=8Cspymemcached=E7=BB=88?=
 =?UTF-8?q?=E4=BA=8E=E6=94=BE=E5=9B=9E=E4=B8=AD=E5=A4=AE=E5=BA=93=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E8=BF=9E=E6=8E=A5=E5=AE=83?=
 =?UTF-8?q?=E7=9A=84=E7=A7=81=E5=BA=93=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 -
 examples/quickstart/pom.xml                   | 21 --------
 examples/showcase/pom.xml                     | 14 +----
 modules/core/pom.xml                          |  6 ---
 modules/extension/pom.xml                     |  8 +--
 modules/parent/pom.xml                        | 51 +++----------------
 modules/test/pom.xml                          |  8 +--
 .../display-dependency-updates.bat            |  5 --
 support/maven-scripts/install-modules.bat     |  5 --
 9 files changed, 10 insertions(+), 109 deletions(-)
 delete mode 100644 support/maven-scripts/display-dependency-updates.bat
 delete mode 100644 support/maven-scripts/install-modules.bat

diff --git a/.gitignore b/.gitignore
index 979afd64..40935255 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,5 @@
 .settings/
 target/
 logs/
-eclipse-local.bat
 /examples/showcase/bin/yuicompressor-2.4.7.jar
 /support/local-script/
diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml
index 0350bdbc..07bd6724 100644
--- a/examples/quickstart/pom.xml
+++ b/examples/quickstart/pom.xml
@@ -491,27 +491,6 @@
 					</instrumentation>
                 </configuration>
 			</plugin>
-
-			<!-- eclipse插件, 设定wtp版本 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.9</version>
-				<configuration>
-					<downloadSources>true</downloadSources>
-					<downloadJavadocs>false</downloadJavadocs>
-					<wtpversion>2.0</wtpversion>
-					<!-- 增加设置项目encoding的文件 -->
-					<additionalConfig>
-						<file>
-							<name>.settings/org.eclipse.core.resources.prefs</name>
-							<content>
-					                <![CDATA[eclipse.preferences.version=1${line.separator}encoding/<project>=${project.build.sourceEncoding}${line.separator}]]>
-							</content>
-						</file>
-					</additionalConfig>
-				</configuration>
-			</plugin>
 			
 			<!-- enforcer插件, 设定环境与依赖的规则 -->
 			<plugin>
diff --git a/examples/showcase/pom.xml b/examples/showcase/pom.xml
index b44ba5cb..07056c45 100644
--- a/examples/showcase/pom.xml
+++ b/examples/showcase/pom.xml
@@ -190,7 +190,7 @@
 
 		<!-- CACHE begin -->
 		<dependency>
-			<groupId>spy</groupId>
+			<groupId>net.spy</groupId>
 			<artifactId>spymemcached</artifactId>
 		</dependency>
 
@@ -445,18 +445,6 @@
 				</configuration>
 			</plugin>
 
-			<!-- eclipse插件, 设定wtp版本并添加springIDE nature -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<configuration>
-					<wtpversion>2.0</wtpversion>
-					<additionalProjectnatures>
-						<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
-					</additionalProjectnatures>
-				</configuration>
-			</plugin>
-
 			<!-- jetty插件, 设定context path与spring profile -->
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index ad0cc539..343261d9 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -164,12 +164,6 @@
 
 	<build>
 		<plugins>
-			<!-- eclipse plugin -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-			</plugin>
-
 			<!-- source attach plugin -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/modules/extension/pom.xml b/modules/extension/pom.xml
index bb266583..00b986fe 100644
--- a/modules/extension/pom.xml
+++ b/modules/extension/pom.xml
@@ -36,7 +36,7 @@
 
 		<!-- CACHE -->
 		<dependency>
-			<groupId>spy</groupId>
+			<groupId>net.spy</groupId>
 			<artifactId>spymemcached</artifactId>
 			<optional>true</optional>
 		</dependency>
@@ -111,12 +111,6 @@
 
 	<build>
 		<plugins>
-			<!-- eclipse plugin -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-			</plugin>
-
 			<!-- source attach plugin -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml
index f54d7d2d..70001e47 100644
--- a/modules/parent/pom.xml
+++ b/modules/parent/pom.xml
@@ -23,9 +23,9 @@
 		<quartz.version>2.1.7</quartz.version>
         <jedis.version>2.1.0</jedis.version>
 		<ehcache.version>2.6.6</ehcache.version>
-		<spymemcached.version>2.8.9</spymemcached.version>
+		<spymemcached.version>2.9.0</spymemcached.version>
 		<hibernate-validator.version>4.3.1.Final</hibernate-validator.version>
-		<jolokia.version>1.1.1</jolokia.version>
+		<jolokia.version>1.1.2</jolokia.version>
 		<jackson.version>2.2.2</jackson.version>
 		<slf4j.version>1.7.5</slf4j.version>
 		<logback.version>1.0.13</logback.version>
@@ -35,7 +35,7 @@
 		<joda-time.version>2.2</joda-time.version>
 		<dozer.version>5.4.0</dozer.version>
 		<httpclient.version>4.2.3</httpclient.version>
-		<freemarker.version>2.3.19</freemarker.version>
+		<freemarker.version>2.3.20</freemarker.version>
 		<junit.version>4.11</junit.version>
 		<mockito.version>1.9.5</mockito.version>
 		<powermock.version>1.5.1</powermock.version>
@@ -57,26 +57,9 @@
 			<url>http://localhost:8081/nexus/content/groups/public</url> 
 		</repository>
 		-->
-		<repository>
-			<id>central</id>
-			<name>Central Repository</name>
-			<url>http://repo.maven.apache.org/maven2</url>	
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-			
-		<repository>
-			<id>spy</id>
-			<name>Spy Repository</name>
-			<url>http://files.couchbase.com/maven2/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-	    </repository>
 	</repositories>
 
-	<!-- 设定插件仓库 如有Nexus私服, 取消注释并指向正确的服务器地址. 
+	<!-- 如有Nexus私服, 取消注释并指向正确的服务器地址. 
 	<pluginRepositories> 
 		<pluginRepository> 
 			<id>nexus</id>
@@ -149,12 +132,12 @@
 			<dependency>
 				<groupId>org.aspectj</groupId>
 				<artifactId>aspectjrt</artifactId>
-				<version>1.7.2</version>
+				<version>1.7.3</version>
 			</dependency>
 			<dependency>
 				<groupId>org.aspectj</groupId>
 				<artifactId>aspectjweaver</artifactId>
-				<version>1.7.2</version>
+				<version>1.7.3</version>
 				<scope>runtime</scope>
 			</dependency>
 			<!-- AOP end -->
@@ -385,7 +368,7 @@
 			<!-- CACHE begin -->
 			<!-- memcached -->
 			<dependency>
-				<groupId>spy</groupId>
+				<groupId>net.spy</groupId>
 				<artifactId>spymemcached</artifactId>
 				<version>${spymemcached.version}</version>
 			</dependency>
@@ -864,26 +847,6 @@
 					</executions>
 				</plugin>
 
-				<!-- eclipse插件, 设定下载依赖包的source code -->
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-eclipse-plugin</artifactId>
-					<version>2.9</version>
-					<configuration>
-						<downloadSources>true</downloadSources>
-						<downloadJavadocs>false</downloadJavadocs>
-						<!-- 增加设置项目encoding的文件 -->
-						<additionalConfig>
-							<file>
-								<name>.settings/org.eclipse.core.resources.prefs</name>
-								<content>
-						                <![CDATA[eclipse.preferences.version=1${line.separator}encoding/<project>=${project.build.sourceEncoding}${line.separator}]]>
-								</content>
-							</file>
-						</additionalConfig>						
-					</configuration>
-				</plugin>
-
 				<!-- jetty插件 -->
 				<plugin>
 					<groupId>org.mortbay.jetty</groupId>
diff --git a/modules/test/pom.xml b/modules/test/pom.xml
index 32bec7c9..c805b1d9 100644
--- a/modules/test/pom.xml
+++ b/modules/test/pom.xml
@@ -33,7 +33,7 @@
 
 		<!-- CACHE -->
 		<dependency>
-			<groupId>spy</groupId>
+			<groupId>net.spy</groupId>
 			<artifactId>spymemcached</artifactId>
 			<optional>true</optional>
 		</dependency>
@@ -160,12 +160,6 @@
 
 	<build>
 		<plugins>
-			<!-- eclipse plugin -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-			</plugin>
-
 			<!-- source attach plugin -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/support/maven-scripts/display-dependency-updates.bat b/support/maven-scripts/display-dependency-updates.bat
deleted file mode 100644
index 100e87bd..00000000
--- a/support/maven-scripts/display-dependency-updates.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-
-cd ../../
-call mvn versions:display-dependency-updates
-pause
\ No newline at end of file
diff --git a/support/maven-scripts/install-modules.bat b/support/maven-scripts/install-modules.bat
deleted file mode 100644
index b886b2a5..00000000
--- a/support/maven-scripts/install-modules.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-
-cd ../../modules
-call mvn clean install -Dmaven.test.skip=true
-pause
\ No newline at end of file