Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Commit 308dc08

Browse files
author
Hai Nguyen
committed
* Remove redudant classes
* Upgrade project version to 4.1.1
1 parent 34c9c2d commit 308dc08

34 files changed

Lines changed: 102 additions & 658 deletions

File tree

‎mycollab-app-community/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.esofthead.mycollab</groupId>
99
<artifactId>parent-community</artifactId>
10-
<version>4.1.0</version>
10+
<version>4.1.1</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>war</packaging>
@@ -16,7 +16,7 @@
1616
<dependency>
1717
<groupId>com.esofthead.mycollab</groupId>
1818
<artifactId>mycollab-server-runner</artifactId>
19-
<version>4.1.0</version>
19+
<version>4.1.1</version>
2020
<exclusions>
2121
<exclusion>
2222
<groupId>com.esofthead.mycollab</groupId>
@@ -27,19 +27,19 @@
2727
<dependency>
2828
<groupId>com.esofthead.mycollab</groupId>
2929
<artifactId>mycollab-services-community</artifactId>
30-
<version>4.1.0</version>
30+
<version>4.1.1</version>
3131
</dependency>
3232

3333
<dependency>
3434
<groupId>com.esofthead.mycollab</groupId>
3535
<artifactId>mycollab-mobile</artifactId>
36-
<version>4.1.0</version>
36+
<version>4.1.1</version>
3737
</dependency>
3838

3939
<dependency>
4040
<groupId>com.esofthead.mycollab</groupId>
4141
<artifactId>mycollab-web-community</artifactId>
42-
<version>4.1.0</version>
42+
<version>4.1.1</version>
4343
</dependency>
4444
<!-- <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-client-compiler</artifactId>
4545
<version>${vaadinVersion}</version> <scope>provided</scope> </dependency> -->

‎mycollab-caching/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,33 @@
77
<parent>
88
<groupId>com.esofthead.mycollab</groupId>
99
<artifactId>parent-community</artifactId>
10-
<version>4.1.0</version>
10+
<version>4.1.1</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>
1414
<dependencies>
1515
<dependency>
1616
<groupId>com.esofthead.mycollab</groupId>
1717
<artifactId>mycollab-core</artifactId>
18-
<version>4.1.0</version>
18+
<version>4.1.1</version>
1919
</dependency>
2020

2121
<dependency>
2222
<groupId>com.esofthead.mycollab</groupId>
2323
<artifactId>mycollab-dao</artifactId>
24-
<version>4.1.0</version>
24+
<version>4.1.1</version>
2525
</dependency>
2626

2727
<dependency>
2828
<groupId>com.esofthead.mycollab</groupId>
2929
<artifactId>mycollab-config</artifactId>
30-
<version>4.1.0</version>
30+
<version>4.1.1</version>
3131
</dependency>
3232

3333
<dependency>
3434
<groupId>com.esofthead.mycollab</groupId>
3535
<artifactId>mycollab-test</artifactId>
36-
<version>4.1.0</version>
36+
<version>4.1.1</version>
3737
<scope>test</scope>
3838
</dependency>
3939

‎mycollab-config/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<parent>
88
<groupId>com.esofthead.mycollab</groupId>
99
<artifactId>parent-community</artifactId>
10-
<version>4.1.0</version>
10+
<version>4.1.1</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>
1414
<dependencies>
1515
<dependency>
1616
<groupId>com.esofthead.mycollab</groupId>
1717
<artifactId>mycollab-core</artifactId>
18-
<version>4.1.0</version>
18+
<version>4.1.1</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.jasypt</groupId>

‎mycollab-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<parent>
88
<groupId>com.esofthead.mycollab</groupId>
99
<artifactId>parent-community</artifactId>
10-
<version>4.1.0</version>
10+
<version>4.1.1</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>
1414
<dependencies>
1515
<dependency>
1616
<groupId>com.esofthead.mycollab</groupId>
1717
<artifactId>mycollab-test</artifactId>
18-
<version>4.1.0</version>
18+
<version>4.1.1</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>com.mortennobel</groupId>

‎mycollab-dao/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<parent>
88
<groupId>com.esofthead.mycollab</groupId>
99
<artifactId>parent-community</artifactId>
10-
<version>4.1.0</version>
10+
<version>4.1.1</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>
1414
<dependencies>
1515
<dependency>
1616
<groupId>com.esofthead.mycollab</groupId>
1717
<artifactId>mycollab-core</artifactId>
18-
<version>4.1.0</version>
18+
<version>4.1.1</version>
1919
</dependency>
2020

2121
<dependency>

‎mycollab-esb/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,33 @@
77
<parent>
88
<groupId>com.esofthead.mycollab</groupId>
99
<artifactId>parent-community</artifactId>
10-
<version>4.1.0</version>
10+
<version>4.1.1</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>
1414
<dependencies>
1515
<dependency>
1616
<groupId>com.esofthead.mycollab</groupId>
1717
<artifactId>mycollab-core</artifactId>
18-
<version>4.1.0</version>
18+
<version>4.1.1</version>
1919
</dependency>
2020

2121
<dependency>
2222
<groupId>com.esofthead.mycollab</groupId>
2323
<artifactId>mycollab-config</artifactId>
24-
<version>4.1.0</version>
24+
<version>4.1.1</version>
2525
</dependency>
2626

2727
<dependency>
2828
<groupId>com.esofthead.mycollab</groupId>
2929
<artifactId>mycollab-services</artifactId>
30-
<version>4.1.0</version>
30+
<version>4.1.1</version>
3131
</dependency>
3232

3333
<dependency>
3434
<groupId>com.esofthead.mycollab</groupId>
3535
<artifactId>mycollab-test</artifactId>
36-
<version>4.1.0</version>
36+
<version>4.1.1</version>
3737
<scope>test</scope>
3838
</dependency>
3939
</dependencies>

‎mycollab-jackrabbit/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.esofthead.mycollab</groupId>
2121
<artifactId>parent-community</artifactId>
22-
<version>4.1.0</version>
22+
<version>4.1.1</version>
2323
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
2424
</parent>
2525

@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>com.esofthead.mycollab</groupId>
3030
<artifactId>mycollab-core</artifactId>
31-
<version>4.1.0</version>
31+
<version>4.1.1</version>
3232
</dependency>
3333

3434
<!-- ECM -->
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>org.apache.jackrabbit</groupId>
4949
<artifactId>jackrabbit-core</artifactId>
50-
<version>2.6.5</version>
50+
<version>2.8.0</version>
5151
<exclusions>
5252
<exclusion>
5353
<groupId>org.apache.derby</groupId>

‎mycollab-migration/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
<parent>
88
<groupId>com.esofthead.mycollab</groupId>
99
<artifactId>parent-community</artifactId>
10-
<version>4.1.0</version>
10+
<version>4.1.1</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>
1414
<dependencies>
1515
<dependency>
1616
<groupId>com.esofthead.mycollab</groupId>
1717
<artifactId>mycollab-core</artifactId>
18-
<version>4.1.0</version>
18+
<version>4.1.1</version>
1919
</dependency>
2020

2121
<dependency>
2222
<groupId>com.esofthead.mycollab</groupId>
2323
<artifactId>mycollab-dao</artifactId>
24-
<version>4.1.0</version>
24+
<version>4.1.1</version>
2525
</dependency>
2626

2727
<dependency>
2828
<groupId>com.esofthead.mycollab</groupId>
2929
<artifactId>mycollab-config</artifactId>
30-
<version>4.1.0</version>
30+
<version>4.1.1</version>
3131
</dependency>
3232

3333
<dependency>

‎mycollab-mobile/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.esofthead.mycollab</groupId>
99
<artifactId>parent-community</artifactId>
10-
<version>4.1.0</version>
10+
<version>4.1.1</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>
@@ -21,19 +21,19 @@
2121
<dependency>
2222
<groupId>com.esofthead.mycollab</groupId>
2323
<artifactId>mycollab-core</artifactId>
24-
<version>4.1.0</version>
24+
<version>4.1.1</version>
2525
</dependency>
2626

2727
<dependency>
2828
<groupId>com.esofthead.mycollab</groupId>
2929
<artifactId>mycollab-services</artifactId>
30-
<version>4.1.0</version>
30+
<version>4.1.1</version>
3131
</dependency>
3232

3333
<dependency>
3434
<groupId>com.esofthead.mycollab</groupId>
3535
<artifactId>mycollab-ui</artifactId>
36-
<version>4.1.0</version>
36+
<version>4.1.1</version>
3737
</dependency>
3838

3939
<dependency>

‎mycollab-parent-community/pom.xml‎

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
<name>mycollab-parent-community</name>
77
<groupId>com.esofthead.mycollab</groupId>
88
<artifactId>parent-community</artifactId>
9-
<version>4.1.0</version>
9+
<version>4.1.1</version>
1010
<packaging>pom</packaging>
1111
<properties>
12-
<springVersion>3.2.6.RELEASE</springVersion>
12+
<springVersion>4.0.5.RELEASE</springVersion>
1313
<aspectjVersion>1.7.4</aspectjVersion>
1414
<javaVersion>1.7</javaVersion>
1515
<slf4jVersion>1.6.4</slf4jVersion>
1616
<log4jVersion>1.2.16</log4jVersion>
1717
<servletVersion>3.1.0</servletVersion>
1818
<vaadinVersion>7.2.0</vaadinVersion>
19-
<jettyVersion>9.1.4.v20140401</jettyVersion>
19+
<jettyVersion>9.1.5.v20140505</jettyVersion>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.inceptionYear>2011</project.inceptionYear>
2222
</properties>
@@ -92,6 +92,11 @@
9292
<artifactId>spring-context</artifactId>
9393
<version>${springVersion}</version>
9494
</dependency>
95+
<dependency>
96+
<groupId>org.springframework</groupId>
97+
<artifactId>spring-context-support</artifactId>
98+
<version>${springVersion}</version>
99+
</dependency>
95100
<dependency>
96101
<groupId>org.springframework</groupId>
97102
<artifactId>spring-jdbc</artifactId>
@@ -186,32 +191,14 @@
186191
</dependency>
187192

188193
<dependency>
189-
<groupId>com.jolbox</groupId>
190-
<artifactId>bonecp</artifactId>
191-
<version>0.8.0.RELEASE</version>
194+
<groupId>com.zaxxer</groupId>
195+
<artifactId>HikariCP</artifactId>
196+
<version>1.3.8</version>
192197
</dependency>
193198

194-
<dependency>
195-
<groupId>com.jolbox</groupId>
196-
<artifactId>bonecp-spring</artifactId>
197-
<version>0.8.0.RELEASE</version>
198-
</dependency>
199199
</dependencies>
200200
<build>
201201
<plugins>
202-
<plugin>
203-
<groupId>org.reflections</groupId>
204-
<artifactId>reflections-maven</artifactId>
205-
<version>0.9.9-RC1</version>
206-
<executions>
207-
<execution>
208-
<goals>
209-
<goal>reflections</goal>
210-
</goals>
211-
<phase>process-classes</phase>
212-
</execution>
213-
</executions>
214-
</plugin>
215202

216203
<plugin>
217204
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)