Skip to content

Commit 6e05d71

Browse files
minervaopsminervaops
committed
bug fix
1 parent 8f12c09 commit 6e05d71

File tree

5 files changed

+184
-335
lines changed

5 files changed

+184
-335
lines changed

‎pom.xml

Lines changed: 184 additions & 180 deletions
Original file line numberDiff line numberDiff line change
@@ -1,194 +1,198 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
45

5-
<modelVersion>4.0.0</modelVersion>
6-
<parent>
7-
<groupId>org.springframework.data.build</groupId>
8-
<artifactId>spring-data-parent</artifactId>
9-
<version>1.9.5.RELEASE</version>
10-
</parent>
6+
<modelVersion>4.0.0</modelVersion>
7+
<parent>
8+
<groupId>org.springframework.data.build</groupId>
9+
<artifactId>spring-data-parent</artifactId>
10+
<version>1.9.5.RELEASE</version>
11+
</parent>
1112

12-
<groupId>com.ifrabbit</groupId>
13-
<artifactId>spring-data-mybatis</artifactId>
14-
<version>1.0.16.RELEASE</version>
13+
<groupId>com.ifrabbit</groupId>
14+
<artifactId>spring-data-mybatis</artifactId>
15+
<version>1.0.17.BUILD-SNAPSHOT</version>
1516

16-
<name>Spring Data MyBatis</name>
17-
<description>The primary goal of the Spring Data project is to make it easier to build Spring-powered applications
18-
that use data access technologies. This module deals with enhanced support for MyBatis based data access layers.
19-
</description>
20-
<url>https://github.com/hatunet/spring-data-mybatis</url>
21-
<developers>
22-
<developer>
23-
<id>jarvis</id>
24-
<name>Jarvis Song</name>
25-
<email>[email protected]</email>
26-
</developer>
27-
</developers>
28-
29-
<licenses>
30-
<license>
31-
<name>Apache License, Version 2.0</name>
32-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
33-
</license>
34-
</licenses>
35-
36-
<scm>
37-
<url>https://github.com/hatunet/spring-data-mybatis</url>
38-
<connection>scm:git:git://github.com/hatunet/spring-data-mybatis.git</connection>
39-
<developerConnection>scm:git:ssh://[email protected]/hatunet/spring-data-mybatis.git</developerConnection>
40-
</scm>
17+
<name>Spring Data MyBatis</name>
18+
<description>The primary goal of the Spring Data project is to make it easier to build
19+
Spring-powered applications
20+
that use data access technologies. This module deals with enhanced support for MyBatis based
21+
data access layers.
22+
</description>
23+
<url>https://github.com/hatunet/spring-data-mybatis</url>
24+
<developers>
25+
<developer>
26+
<id>jarvis</id>
27+
<name>Jarvis Song</name>
28+
<email>[email protected]</email>
29+
</developer>
30+
</developers>
4131

42-
<properties>
43-
<springdata.commons.version>1.13.5.RELEASE</springdata.commons.version>
44-
<mybatis.version>3.4.4</mybatis.version>
45-
</properties>
32+
<licenses>
33+
<license>
34+
<name>Apache License, Version 2.0</name>
35+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
36+
</license>
37+
</licenses>
4638

47-
<profiles>
48-
<profile>
49-
<id>release</id>
50-
<build>
51-
<plugins>
52-
<plugin>
53-
<groupId>org.apache.maven.plugins</groupId>
54-
<artifactId>maven-source-plugin</artifactId>
55-
<executions>
56-
<execution>
57-
<phase>package</phase>
58-
<goals>
59-
<goal>jar-no-fork</goal>
60-
</goals>
61-
</execution>
62-
</executions>
63-
</plugin>
64-
<plugin>
65-
<groupId>org.apache.maven.plugins</groupId>
66-
<artifactId>maven-javadoc-plugin</artifactId>
67-
<executions>
68-
<execution>
69-
<phase>package</phase>
70-
<goals>
71-
<goal>jar</goal>
72-
</goals>
73-
</execution>
74-
</executions>
75-
</plugin>
76-
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-gpg-plugin</artifactId>
79-
<executions>
80-
<execution>
81-
<phase>verify</phase>
82-
<goals>
83-
<goal>sign</goal>
84-
</goals>
85-
</execution>
86-
</executions>
87-
</plugin>
88-
</plugins>
89-
</build>
90-
<distributionManagement>
91-
<snapshotRepository>
92-
<id>oss</id>
93-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
94-
</snapshotRepository>
95-
<repository>
96-
<id>oss</id>
97-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
98-
</repository>
99-
</distributionManagement>
100-
</profile>
101-
</profiles>
39+
<scm>
40+
<url>https://github.com/hatunet/spring-data-mybatis</url>
41+
<connection>scm:git:git://github.com/hatunet/spring-data-mybatis.git</connection>
42+
<developerConnection>scm:git:ssh://[email protected]/hatunet/spring-data-mybatis.git
43+
</developerConnection>
44+
</scm>
10245

103-
<dependencies>
104-
<dependency>
105-
<groupId>org.springframework.data</groupId>
106-
<artifactId>spring-data-commons</artifactId>
107-
<version>${springdata.commons.version}</version>
108-
</dependency>
109-
<dependency>
110-
<groupId>org.springframework</groupId>
111-
<artifactId>spring-context</artifactId>
112-
</dependency>
113-
<dependency>
114-
<groupId>org.springframework</groupId>
115-
<artifactId>spring-orm</artifactId>
116-
</dependency>
117-
<dependency>
118-
<groupId>org.mybatis</groupId>
119-
<artifactId>mybatis</artifactId>
120-
<version>${mybatis.version}</version>
121-
</dependency>
122-
<dependency>
123-
<groupId>org.mybatis</groupId>
124-
<artifactId>mybatis-spring</artifactId>
125-
<version>1.3.1</version>
126-
</dependency>
46+
<properties>
47+
<springdata.commons.version>1.13.5.RELEASE</springdata.commons.version>
48+
<mybatis.version>3.4.4</mybatis.version>
49+
</properties>
12750

128-
<dependency>
129-
<groupId>com.querydsl</groupId>
130-
<artifactId>querydsl-core</artifactId>
131-
<version>4.1.4</version>
132-
<optional>true</optional>
133-
</dependency>
134-
<dependency>
135-
<groupId>com.h2database</groupId>
136-
<artifactId>h2</artifactId>
137-
<version>1.4.194</version>
138-
<scope>test</scope>
139-
</dependency>
140-
<dependency>
141-
<groupId>mysql</groupId>
142-
<artifactId>mysql-connector-java</artifactId>
143-
<version>5.1.41</version>
144-
<scope>test</scope>
145-
</dependency>
146-
<!--<dependency>-->
147-
<!--<groupId>com.oracle</groupId>-->
148-
<!--<artifactId>ojdbc14</artifactId>-->
149-
<!--<version>10.2.0.4.0</version>-->
150-
<!--<scope>test</scope>-->
151-
<!--</dependency>-->
152-
<dependency>
153-
<groupId>net.sourceforge.jtds</groupId>
154-
<artifactId>jtds</artifactId>
155-
<version>1.3.1</version>
156-
<scope>test</scope>
157-
</dependency>
158-
<dependency>
159-
<groupId>org.postgresql</groupId>
160-
<artifactId>postgresql</artifactId>
161-
<version>9.4.1212</version>
162-
<scope>test</scope>
163-
</dependency>
164-
</dependencies>
165-
<build>
51+
<profiles>
52+
<profile>
53+
<id>release</id>
54+
<build>
16655
<plugins>
167-
<plugin>
168-
<groupId>org.apache.maven.plugins</groupId>
169-
<artifactId>maven-assembly-plugin</artifactId>
170-
</plugin>
171-
<plugin>
172-
<groupId>org.codehaus.mojo</groupId>
173-
<artifactId>wagon-maven-plugin</artifactId>
174-
</plugin>
175-
<plugin>
176-
<groupId>org.asciidoctor</groupId>
177-
<artifactId>asciidoctor-maven-plugin</artifactId>
178-
</plugin>
56+
<plugin>
57+
<groupId>org.apache.maven.plugins</groupId>
58+
<artifactId>maven-source-plugin</artifactId>
59+
<executions>
60+
<execution>
61+
<phase>package</phase>
62+
<goals>
63+
<goal>jar-no-fork</goal>
64+
</goals>
65+
</execution>
66+
</executions>
67+
</plugin>
68+
<plugin>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-javadoc-plugin</artifactId>
71+
<executions>
72+
<execution>
73+
<phase>package</phase>
74+
<goals>
75+
<goal>jar</goal>
76+
</goals>
77+
</execution>
78+
</executions>
79+
</plugin>
80+
<plugin>
81+
<groupId>org.apache.maven.plugins</groupId>
82+
<artifactId>maven-gpg-plugin</artifactId>
83+
<executions>
84+
<execution>
85+
<phase>verify</phase>
86+
<goals>
87+
<goal>sign</goal>
88+
</goals>
89+
</execution>
90+
</executions>
91+
</plugin>
17992
</plugins>
180-
</build>
181-
<repositories>
93+
</build>
94+
<distributionManagement>
95+
<snapshotRepository>
96+
<id>oss</id>
97+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
98+
</snapshotRepository>
18299
<repository>
183-
<id>spring-libs-milestone</id>
184-
<url>https://repo.spring.io/libs-milestone</url>
100+
<id>oss</id>
101+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
185102
</repository>
186-
</repositories>
103+
</distributionManagement>
104+
</profile>
105+
</profiles>
106+
107+
<dependencies>
108+
<dependency>
109+
<groupId>org.springframework.data</groupId>
110+
<artifactId>spring-data-commons</artifactId>
111+
<version>${springdata.commons.version}</version>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.springframework</groupId>
115+
<artifactId>spring-context</artifactId>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.springframework</groupId>
119+
<artifactId>spring-orm</artifactId>
120+
</dependency>
121+
<dependency>
122+
<groupId>org.mybatis</groupId>
123+
<artifactId>mybatis</artifactId>
124+
<version>${mybatis.version}</version>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.mybatis</groupId>
128+
<artifactId>mybatis-spring</artifactId>
129+
<version>1.3.1</version>
130+
</dependency>
131+
132+
<dependency>
133+
<groupId>com.querydsl</groupId>
134+
<artifactId>querydsl-core</artifactId>
135+
<version>4.1.4</version>
136+
<optional>true</optional>
137+
</dependency>
138+
<dependency>
139+
<groupId>com.h2database</groupId>
140+
<artifactId>h2</artifactId>
141+
<version>1.4.194</version>
142+
<scope>test</scope>
143+
</dependency>
144+
<dependency>
145+
<groupId>mysql</groupId>
146+
<artifactId>mysql-connector-java</artifactId>
147+
<version>5.1.41</version>
148+
<scope>test</scope>
149+
</dependency>
150+
<!--<dependency>-->
151+
<!--<groupId>com.oracle</groupId>-->
152+
<!--<artifactId>ojdbc14</artifactId>-->
153+
<!--<version>10.2.0.4.0</version>-->
154+
<!--<scope>test</scope>-->
155+
<!--</dependency>-->
156+
<dependency>
157+
<groupId>net.sourceforge.jtds</groupId>
158+
<artifactId>jtds</artifactId>
159+
<version>1.3.1</version>
160+
<scope>test</scope>
161+
</dependency>
162+
<dependency>
163+
<groupId>org.postgresql</groupId>
164+
<artifactId>postgresql</artifactId>
165+
<version>9.4.1212</version>
166+
<scope>test</scope>
167+
</dependency>
168+
</dependencies>
169+
<build>
170+
<plugins>
171+
<plugin>
172+
<groupId>org.apache.maven.plugins</groupId>
173+
<artifactId>maven-assembly-plugin</artifactId>
174+
</plugin>
175+
<plugin>
176+
<groupId>org.codehaus.mojo</groupId>
177+
<artifactId>wagon-maven-plugin</artifactId>
178+
</plugin>
179+
<plugin>
180+
<groupId>org.asciidoctor</groupId>
181+
<artifactId>asciidoctor-maven-plugin</artifactId>
182+
</plugin>
183+
</plugins>
184+
</build>
185+
<repositories>
186+
<repository>
187+
<id>spring-libs-milestone</id>
188+
<url>https://repo.spring.io/libs-milestone</url>
189+
</repository>
190+
</repositories>
187191

188-
<pluginRepositories>
189-
<pluginRepository>
190-
<id>spring-plugins-snapshot</id>
191-
<url>https://repo.spring.io/plugins-snapshot</url>
192-
</pluginRepository>
193-
</pluginRepositories>
192+
<pluginRepositories>
193+
<pluginRepository>
194+
<id>spring-plugins-snapshot</id>
195+
<url>https://repo.spring.io/plugins-snapshot</url>
196+
</pluginRepository>
197+
</pluginRepositories>
194198
</project>

‎src/main/java/org/springframework/data/mybatis/repository/support/MybatisEntityInformation.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public interface MybatisEntityInformation<T, ID extends Serializable>
3636
void setVersion(T entity, int version);
3737

3838
boolean hasVersion();
39-
40-
void setIdValue(T entity, ID id);
4139

4240
void setCreatedDate(T entity);
4341

0 commit comments

Comments
 (0)