File tree Expand file tree Collapse file tree 2 files changed +43
-3
lines changed Expand file tree Collapse file tree 2 files changed +43
-3
lines changed Original file line number Diff line number Diff line change 1212 <classpathentry kind =" var" path =" M2_REPO/org/springframework/spring-context/3.1.0.RELEASE/spring-context-3.1.0.RELEASE.jar" />
1313 <classpathentry kind =" var" path =" M2_REPO/org/springframework/spring-aop/3.1.0.RELEASE/spring-aop-3.1.0.RELEASE.jar" />
1414<<<<<<< HEAD
15- <classpathentry kind =" var" path =" M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath = " M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar " />
15+ <classpathentry kind =" var" path =" M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" />
1616 <classpathentry kind =" var" path =" M2_REPO/org/springframework/spring-expression/3.1.0.RELEASE/spring-expression-3.1.0.RELEASE.jar" />
1717 <classpathentry kind =" var" path =" M2_REPO/cglib/cglib/2.2.2/cglib-2.2.2.jar" />
1818 <classpathentry kind =" var" path =" M2_REPO/asm/asm/3.3.1/asm-3.3.1.jar" />
1919</classpath >
2020=======
21- <classpathentry kind =" var" path =" M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" />
21+ <classpathentry kind =" var" path =" M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath = " M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar " />
2222 <classpathentry kind =" var" path =" M2_REPO/org/springframework/spring-expression/3.1.0.RELEASE/spring-expression-3.1.0.RELEASE.jar" />
2323 <classpathentry kind =" var" path =" M2_REPO/cglib/cglib/2.2.2/cglib-2.2.2.jar" />
2424 <classpathentry kind =" var" path =" M2_REPO/asm/asm/3.3.1/asm-3.3.1.jar" />
2525</classpath >
26- >>>>>>> 18224c1a5333a6314661b3360a3f37e16c58412a
26+ >>>>>>> updated
Original file line number Diff line number Diff line change 1+ <project xmlns =" http://maven.apache.org/POM/4.0.0" xmlns : xsi =" http://www.w3.org/2001/XMLSchema-instance"
2+ xsi : schemaLocation =" http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" >
3+ <modelVersion >4.0.0</modelVersion >
4+
5+ <groupId >com.hmkcode</groupId >
6+ <artifactId >spring-core-container</artifactId >
7+ <version >1.0-SNAPSHOT</version >
8+ <packaging >jar</packaging >
9+
10+ <name >spring-core-container</name >
11+ <url >http://maven.apache.org</url >
12+
13+ <properties >
14+ <project .build.sourceEncoding>UTF-8</project .build.sourceEncoding>
15+ <org .springframework.version>3.1.0.RELEASE</org .springframework.version>
16+ </properties >
17+
18+ <dependencies >
19+ <dependency >
20+ <groupId >org.springframework</groupId >
21+ <artifactId >spring-core</artifactId >
22+ <version >${org.springframework.version} </version >
23+ </dependency >
24+ <dependency >
25+ <groupId >org.springframework</groupId >
26+ <artifactId >spring-beans</artifactId >
27+ <version >${org.springframework.version} </version >
28+ </dependency >
29+ <dependency >
30+ <groupId >org.springframework</groupId >
31+ <artifactId >spring-context</artifactId >
32+ <version >${org.springframework.version} </version >
33+ </dependency >
34+ <dependency >
35+ <groupId >cglib</groupId >
36+ <artifactId >cglib</artifactId >
37+ <version >2.2.2</version >
38+ </dependency >
39+ </dependencies >
40+ </project >
You can’t perform that action at this time.
0 commit comments