Skip to content

Commit dffbc5c

Browse files
Doha2012Doha2012
committed
upgrade and cleanup
1 parent 57b4201 commit dffbc5c

7 files changed

Lines changed: 75 additions & 35 deletions

File tree

‎couchbase-sdk/pom.xml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@
7979
<plugins>
8080
<plugin>
8181
<artifactId>maven-compiler-plugin</artifactId>
82-
<version>2.3.2</version>
82+
<version>${maven-compiler-plugin.version}</version>
8383
<configuration>
84-
<source>1.7</source>
85-
<target>1.7</target>
84+
<source>${java.version}</source>
85+
<target>${java.version}</target>
8686
</configuration>
8787
</plugin>
8888
<plugin>
@@ -100,14 +100,15 @@
100100
</build>
101101

102102
<properties>
103-
<java.version>1.7</java.version>
103+
<java.version>1.8</java.version>
104104
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
105-
<couchbase.client.version>2.2.6</couchbase.client.version>
106-
<spring-framework.version>4.2.4.RELEASE</spring-framework.version>
107-
<logback.version>1.1.3</logback.version>
108-
<org.slf4j.version>1.7.12</org.slf4j.version>
109-
<junit.version>4.11</junit.version>
110-
<commons-lang3.version>3.4</commons-lang3.version>
105+
<couchbase.client.version>2.3.6</couchbase.client.version>
106+
<spring-framework.version>4.3.4.RELEASE</spring-framework.version>
107+
<logback.version>1.1.7</logback.version>
108+
<org.slf4j.version>1.7.21</org.slf4j.version>
109+
<junit.version>4.12</junit.version>
110+
<commons-lang3.version>3.5</commons-lang3.version>
111+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
111112
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
112113
</properties>
113114

‎dozer/pom.xml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<plugin>
1414
<groupId>org.apache.maven.plugins</groupId>
1515
<artifactId>maven-compiler-plugin</artifactId>
16-
<version>3.3</version>
16+
<version>${maven-compiler-plugin.version}</version>
1717
<configuration>
1818
<source>7</source>
1919
<target>7</target>
@@ -26,33 +26,41 @@
2626
<dependency>
2727
<groupId>org.slf4j</groupId>
2828
<artifactId>slf4j-api</artifactId>
29-
<version>1.7.5</version>
29+
<version>${slf4j.version}</version>
3030
</dependency>
3131

3232
<dependency>
3333
<groupId>org.slf4j</groupId>
3434
<artifactId>jcl-over-slf4j</artifactId>
35-
<version>1.7.5</version>
35+
<version>${slf4j.version}</version>
3636
</dependency>
3737

3838
<dependency>
3939
<groupId>org.apache.commons</groupId>
4040
<artifactId>commons-lang3</artifactId>
41-
<version>3.2.1</version>
41+
<version>${commons-lang3.version}</version>
4242
</dependency>
4343

4444
<dependency>
4545
<groupId>net.sf.dozer</groupId>
4646
<artifactId>dozer</artifactId>
47-
<version>5.5.1</version>
47+
<version>${dozer.version}</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>junit</groupId>
5151
<artifactId>junit</artifactId>
52-
<version>4.3</version>
52+
<version>${junit.version}</version>
5353
<scope>test</scope>
5454
</dependency>
5555

5656
</dependencies>
5757

58+
<properties>
59+
<slf4j.version>1.7.21</slf4j.version>
60+
<commons-lang3.version>3.5</commons-lang3.version>
61+
<dozer.version>5.5.1</dozer.version>
62+
<junit.version>4.12</junit.version>
63+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
64+
</properties>
65+
5866
</project>

‎ejb/ejb-client/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,10 @@
4444
</plugin>
4545
</plugins>
4646
</build>
47+
48+
<properties>
49+
<junit.version>4.12</junit.version>
50+
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
51+
52+
</properties>
4753
</project>

‎ejb/ejb-remote/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>javax</groupId>
1717
<artifactId>javaee-api</artifactId>
18-
<version>7.0</version>
18+
<version>${javaee-api.version}</version>
1919
<scope>provided</scope>
2020
</dependency>
2121
</dependencies>
@@ -25,7 +25,7 @@
2525
<plugin>
2626
<groupId>org.wildfly.plugins</groupId>
2727
<artifactId>wildfly-maven-plugin</artifactId>
28-
<version>1.1.0.Alpha5</version>
28+
<version>${wildfly-maven-plugin.version}</version>
2929
<configuration>
3030
<hostname>127.0.0.1</hostname>
3131
<port>9990</port>
@@ -37,4 +37,9 @@
3737
</plugins>
3838
<!-- <finalName>ejb-remote</finalName> -->
3939
</build>
40+
41+
<properties>
42+
<javaee-api.version>7.0</javaee-api.version>
43+
<wildfly-maven-plugin.version>1.1.0.Beta1</wildfly-maven-plugin.version>
44+
</properties>
4045
</project>

‎ejb/pom.xml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
<dependency>
3939
<groupId>javax</groupId>
4040
<artifactId>javaee-api</artifactId>
41-
<version>7.0</version>
41+
<version>${javaee-api.version}</version>
4242
<scope>provided</scope>
4343
</dependency>
4444

4545
<dependency>
4646
<groupId>org.wildfly</groupId>
4747
<artifactId>wildfly-ejb-client-bom</artifactId>
48-
<version>10.1.0.Final</version>
48+
<version>${wildfly.version}</version>
4949
<type>pom</type>
5050
<scope>import</scope>
5151
</dependency>
@@ -57,7 +57,7 @@
5757
<plugins>
5858
<plugin>
5959
<artifactId>maven-compiler-plugin</artifactId>
60-
<version>3.1</version>
60+
<version>${maven-compiler-plugin.version}</version>
6161
<configuration>
6262
<source>1.8</source>
6363
<target>1.8</target>
@@ -66,7 +66,7 @@
6666

6767
<plugin>
6868
<artifactId>maven-ejb-plugin</artifactId>
69-
<version>2.4</version>
69+
<version>${maven-ejb-plugin.version}</version>
7070
<configuration>
7171
<ejbVersion>3.2</ejbVersion>
7272
</configuration>
@@ -79,4 +79,11 @@
7979
<module>ejb-remote</module>
8080
<module>ejb-client</module>
8181
</modules>
82+
83+
<properties>
84+
<javaee-api.version>7.0</javaee-api.version>
85+
<wildfly.version>10.1.0.Final</wildfly.version>
86+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
87+
<maven-ejb-plugin.version>2.5.1</maven-ejb-plugin.version>
88+
</properties>
8289
</project>

‎enterprise-patterns/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>org.apache.maven.plugins</groupId>
2525
<artifactId>maven-compiler-plugin</artifactId>
26-
<version>3.5.1</version>
26+
<version>${maven-compiler-plugin.version}</version>
2727
<configuration>
2828
<source>1.8</source>
2929
<target>1.8</target>
@@ -32,4 +32,8 @@
3232
</plugins>
3333
</pluginManagement>
3434
</build>
35+
36+
<properties>
37+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
38+
</properties>
3539
</project>

‎feign/pom.xml‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,54 +16,62 @@
1616

1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19+
<feign.version>9.4.0</feign.version>
20+
<slf4j.version>1.7.21</slf4j.version>
21+
<log4j.version>2.7</log4j.version>
22+
<lombok.version>1.16.12</lombok.version>
23+
<junit.version>4.12</junit.version>
24+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
25+
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
26+
<spring-boot-maven-plugin.version>1.4.2.RELEASE</spring-boot-maven-plugin.version>
1927
</properties>
2028

2129
<dependencies>
2230
<dependency>
2331
<groupId>io.github.openfeign</groupId>
2432
<artifactId>feign-core</artifactId>
25-
<version>9.3.1</version>
33+
<version>${feign.version}</version>
2634
</dependency>
2735
<dependency>
2836
<groupId>io.github.openfeign</groupId>
2937
<artifactId>feign-okhttp</artifactId>
30-
<version>9.3.1</version>
38+
<version>${feign.version}</version>
3139
</dependency>
3240
<dependency>
3341
<groupId>io.github.openfeign</groupId>
3442
<artifactId>feign-gson</artifactId>
35-
<version>9.3.1</version>
43+
<version>${feign.version}</version>
3644
</dependency>
3745
<dependency>
3846
<groupId>io.github.openfeign</groupId>
3947
<artifactId>feign-slf4j</artifactId>
40-
<version>9.3.1</version>
48+
<version>${feign.version}</version>
4149
</dependency>
4250
<dependency>
4351
<groupId>org.slf4j</groupId>
4452
<artifactId>slf4j-api</artifactId>
45-
<version>1.7.21</version>
53+
<version>${slf4j.version}</version>
4654
</dependency>
4755
<dependency>
4856
<groupId>org.apache.logging.log4j</groupId>
4957
<artifactId>log4j-core</artifactId>
50-
<version>2.6.2</version>
58+
<version>${log4j.version}</version>
5159
</dependency>
5260
<dependency>
5361
<groupId>org.apache.logging.log4j</groupId>
5462
<artifactId>log4j-slf4j-impl</artifactId>
55-
<version>2.6.2</version>
63+
<version>${log4j.version}</version>
5664
</dependency>
5765
<dependency>
5866
<groupId>org.projectlombok</groupId>
5967
<artifactId>lombok</artifactId>
60-
<version>1.16.10</version>
68+
<version>${lombok.version}</version>
6169
<scope>provided</scope>
6270
</dependency>
6371
<dependency>
6472
<groupId>junit</groupId>
6573
<artifactId>junit</artifactId>
66-
<version>4.12</version>
74+
<version>${junit.version}</version>
6775
<scope>test</scope>
6876
</dependency>
6977
</dependencies>
@@ -74,7 +82,7 @@
7482
<plugin>
7583
<groupId>org.apache.maven.plugins</groupId>
7684
<artifactId>maven-compiler-plugin</artifactId>
77-
<version>3.5.1</version>
85+
<version>${maven-compiler-plugin.version}</version>
7886
<configuration>
7987
<source>1.8</source>
8088
<target>1.8</target>
@@ -83,17 +91,18 @@
8391
<plugin>
8492
<groupId>org.apache.maven.plugins</groupId>
8593
<artifactId>maven-surefire-plugin</artifactId>
86-
<version>2.19.1</version>
94+
<version>${maven-surefire-plugin.version}</version>
8795
<configuration>
8896
<skipTests>true</skipTests>
8997
</configuration>
9098
</plugin>
9199
<plugin>
92100
<groupId>org.springframework.boot</groupId>
93101
<artifactId>spring-boot-maven-plugin</artifactId>
94-
<version>1.4.0.RELEASE</version>
102+
<version>${spring-boot-maven-plugin.version}</version>
95103
</plugin>
96104
</plugins>
97105
</pluginManagement>
98106
</build>
107+
99108
</project>

0 commit comments

Comments
 (0)