Skip to content

Commit 178cd64

Browse files
emacarronemacarron
committed
Version -> 3.3.1-SNAPSHOT and port pom.xml updates to 3.3.x branch
1 parent b4527d1 commit 178cd64

File tree

1 file changed

+54
-80
lines changed

1 file changed

+54
-80
lines changed

‎pom.xml

Lines changed: 54 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
Copyright 2009-2015 the original author or authors.
44
@@ -20,16 +20,17 @@
2020
<parent>
2121
<groupId>org.mybatis</groupId>
2222
<artifactId>mybatis-parent</artifactId>
23-
<version>24</version>
23+
<version>26</version>
24+
<relativePath />
2425
</parent>
2526

2627
<artifactId>mybatis</artifactId>
27-
<version>3.3.0</version>
28+
<version>3.3.1-SNAPSHOT</version>
2829
<packaging>jar</packaging>
2930

3031
<name>mybatis</name>
3132
<description>
32-
The MyBatis data mapper framework makes it easier to use a relational database with object-oriented
33+
The MyBatis SQL mapper framework makes it easier to use a relational database with object-oriented
3334
applications. MyBatis couples objects with stored procedures or SQL statements using a XML descriptor or
3435
annotations. Simplicity is the biggest advantage of the MyBatis data mapper over object relational mapping
3536
tools.
@@ -107,7 +108,7 @@
107108
<url>http://github.com/mybatis/mybatis-3</url>
108109
<connection>scm:git:ssh://github.com/mybatis/mybatis-3.git</connection>
109110
<developerConnection>scm:git:ssh://[email protected]/mybatis/mybatis-3.git</developerConnection>
110-
<tag>mybatis-3.3.0</tag>
111+
<tag>HEAD</tag>
111112
</scm>
112113
<issueManagement>
113114
<system>GitHub Issue Management</system>
@@ -119,13 +120,14 @@
119120
</ciManagement>
120121
<distributionManagement>
121122
<site>
122-
<id>github</id>
123-
<url>gitsite:[email protected]/mybatis/mybatis-3.git</url>
123+
<id>gh-pages</id>
124+
<name>Mybatis GitHub Pages</name>
125+
<url>git:ssh://[email protected]/mybatis/mybatis-3.git?gh-pages#</url>
124126
</site>
125127
</distributionManagement>
126128

127129
<properties>
128-
<clirr.comparisonVersion>3.2.8</clirr.comparisonVersion>
130+
<clirr.comparisonVersion>3.3.0</clirr.comparisonVersion>
129131
<findbugs.onlyAnalyze>org.apache.ibatis.*</findbugs.onlyAnalyze>
130132
<osgi.export>org.apache.ibatis.*;version=${project.version};-noimport:=true</osgi.export>
131133
<osgi.import>*;resolution:=optional</osgi.import>
@@ -136,8 +138,8 @@
136138
<dependency>
137139
<groupId>ognl</groupId>
138140
<artifactId>ognl</artifactId>
139-
<version>3.0.11</version>
140-
<scope>provided</scope>
141+
<version>3.1.2</version>
142+
<scope>compile</scope>
141143
<optional>true</optional>
142144
<exclusions>
143145
<exclusion>
@@ -146,24 +148,23 @@
146148
</exclusion>
147149
</exclusions>
148150
</dependency>
149-
<!-- 3.19.0 causes significant failures in unit tests. Review why... -->
150151
<dependency>
151152
<groupId>org.javassist</groupId>
152153
<artifactId>javassist</artifactId>
153-
<version>3.18.2-GA</version>
154-
<scope>provided</scope>
154+
<version>3.20.0-GA</version>
155+
<scope>compile</scope>
155156
<optional>true</optional>
156157
</dependency>
157158
<dependency>
158159
<groupId>org.slf4j</groupId>
159160
<artifactId>slf4j-api</artifactId>
160-
<version>1.7.12</version>
161+
<version>1.7.14</version>
161162
<optional>true</optional>
162163
</dependency>
163164
<dependency>
164165
<groupId>org.slf4j</groupId>
165166
<artifactId>slf4j-log4j12</artifactId>
166-
<version>1.7.12</version>
167+
<version>1.7.14</version>
167168
<optional>true</optional>
168169
</dependency>
169170
<dependency>
@@ -172,10 +173,11 @@
172173
<version>1.2.17</version>
173174
<optional>true</optional>
174175
</dependency>
176+
<!-- Don't upgrade to 2.4+ until mybatis switches to java 7 -->
175177
<dependency>
176178
<groupId>org.apache.logging.log4j</groupId>
177179
<artifactId>log4j-core</artifactId>
178-
<version>2.2</version>
180+
<version>2.3</version>
179181
<optional>true</optional>
180182
</dependency>
181183
<dependency>
@@ -187,7 +189,7 @@
187189
<dependency>
188190
<groupId>cglib</groupId>
189191
<artifactId>cglib</artifactId>
190-
<version>3.1</version>
192+
<version>3.2.0</version>
191193
<optional>true</optional>
192194
</dependency>
193195

@@ -201,13 +203,13 @@
201203
<dependency>
202204
<groupId>org.hsqldb</groupId>
203205
<artifactId>hsqldb</artifactId>
204-
<version>2.3.2</version>
206+
<version>2.3.3</version>
205207
<scope>test</scope>
206208
</dependency>
207209
<dependency>
208210
<groupId>org.apache.derby</groupId>
209211
<artifactId>derby</artifactId>
210-
<version>10.11.1.1</version>
212+
<version>10.12.1.1</version>
211213
<scope>test</scope>
212214
</dependency>
213215
<dependency>
@@ -216,6 +218,7 @@
216218
<version>1.10.19</version>
217219
<scope>test</scope>
218220
</dependency>
221+
<!-- Do not go to 2.x until we are on jdk7 -->
219222
<dependency>
220223
<groupId>commons-dbcp</groupId>
221224
<artifactId>commons-dbcp</artifactId>
@@ -255,60 +258,44 @@
255258
<name>derby.stream.error.file</name>
256259
<value>target/derby.log</value>
257260
</property>
258-
</systemProperties>
261+
</systemProperties>
259262
</configuration>
260263
</plugin>
261264
<plugin>
262265
<groupId>org.apache.maven.plugins</groupId>
263266
<artifactId>maven-pdf-plugin</artifactId>
264267
</plugin>
265268
<plugin>
266-
<groupId>org.sonatype.plugins</groupId>
267-
<artifactId>jarjar-maven-plugin</artifactId>
268-
<configuration>
269-
<input>{classes}</input>
270-
<input>{test-classes}</input>
271-
<includes>
272-
<include>ognl:ognl</include>
273-
<include>org.javassist:javassist</include>
274-
</includes>
275-
<rules>
276-
<rule>
277-
<pattern>ognl.**</pattern>
278-
<result>org.apache.ibatis.ognl.@1</result>
279-
</rule>
280-
<rule>
281-
<pattern>javassist.**</pattern>
282-
<result>org.apache.ibatis.javassist.@1</result>
283-
</rule>
284-
<keep>
285-
<pattern>org.apache.ibatis.**</pattern>
286-
</keep>
287-
</rules>
288-
<overwrite>true</overwrite>
289-
</configuration>
269+
<groupId>org.apache.maven.plugins</groupId>
270+
<artifactId>maven-shade-plugin</artifactId>
290271
<executions>
291272
<execution>
292-
<id>jarjar-classes</id>
293-
<phase>process-test-classes</phase>
273+
<phase>package</phase>
294274
<goals>
295-
<goal>jarjar</goal>
275+
<goal>shade</goal>
296276
</goals>
297277
<configuration>
298-
<input>{classes}</input>
299-
</configuration>
300-
</execution>
301-
<execution>
302-
<id>jarjar-test-classes</id>
303-
<phase>process-test-classes</phase>
304-
<goals>
305-
<goal>jarjar</goal>
306-
</goals>
307-
<configuration>
308-
<input>{test-classes}</input>
309-
</configuration>
310-
</execution>
311-
</executions>
278+
<createDependencyReducedPom>false</createDependencyReducedPom>
279+
<artifactSet>
280+
<includes>
281+
<include>org.mybatis:mybatis</include>
282+
<include>ognl:ognl</include>
283+
<include>org.javassist:javassist</include>
284+
</includes>
285+
</artifactSet>
286+
<relocations>
287+
<relocation>
288+
<pattern>ognl</pattern>
289+
<shadedPattern>org.apache.ibatis.ognl</shadedPattern>
290+
</relocation>
291+
<relocation>
292+
<pattern>javassist</pattern>
293+
<shadedPattern>org.apache.ibatis.javassist</shadedPattern>
294+
</relocation>
295+
</relocations>
296+
</configuration>
297+
</execution>
298+
</executions>
312299
</plugin>
313300
<plugin>
314301
<groupId>org.apache.maven.plugins</groupId>
@@ -318,27 +305,14 @@
318305
</configuration>
319306
</plugin>
320307
<plugin>
321-
<groupId>org.codehaus.mojo</groupId>
322-
<artifactId>cobertura-maven-plugin</artifactId>
308+
<groupId>org.jacoco</groupId>
309+
<artifactId>jacoco-maven-plugin</artifactId>
323310
<configuration>
324-
<instrumentation>
325-
<ignores>
326-
<ignore>org.apache.ibatis.ognl.*</ignore>
327-
<ignore>org.apache.ibatis.javassist.*</ignore>
328-
</ignores>
329-
<excludes>
330-
<exclude>org/apache/ibatis/ognl/**/*.class</exclude>
331-
<exclude>org/apache/ibatis/javassist/**/*.class</exclude>
332-
</excludes>
333-
</instrumentation>
311+
<excludes>
312+
<exclude>org.apache.ibatis.ognl.*</exclude>
313+
<exclude>org.apache.ibatis.javassist.*</exclude>
314+
</excludes>
334315
</configuration>
335-
<executions>
336-
<execution>
337-
<goals>
338-
<goal>clean</goal>
339-
</goals>
340-
</execution>
341-
</executions>
342316
</plugin>
343317
</plugins>
344318

0 commit comments

Comments
 (0)