瀏覽代碼

Let Spring Boot do the dependency management

Prior to this commit some of the versions/dependencies had a
version which was already managed by Spring Boot or one of
the starters. The version of those dependencies have been
removed and either moved to the <properties> section or
removed all together.

The scope of spring-boot-starter-test has also been fixed
to have <scope>test</scope> to properly scope it. As
spring-boot-starter-test already managed jUnit the explicit
declaration has been removed.

Instead of declaring the JMS dependencies and using a
specific version of ActiveMQ the spring-boot-starter-
activemq has been used to cleanup the pom.

Were possible we removed versions and plugins already
declared in the parent project.
Marten Deinum 8 年之前
父節點
當前提交
a15f13976d
沒有帳戶連結到提交者的電子郵件
共有 1 個文件被更改,包括 10 次插入46 次删除
  1. 10
    46
      pom.xml

+ 10
- 46
pom.xml 查看文件

@@ -71,23 +71,11 @@
71 71
     </scm>
72 72
     <properties>
73 73
         <java.version>1.8</java.version>
74
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
75
-        <!-- Plugin versions -->
76
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
74
+        <assertj.version>3.8.0</assertj.version>
75
+        <hibernate.version>4.3.5.Final</hibernate.version>
77 76
     </properties>
78 77
     <build>
79 78
         <plugins>
80
-            <!-- Compiler -->
81
-            <plugin>
82
-                <artifactId>maven-compiler-plugin</artifactId>
83
-                <version>${maven-compiler-plugin.version}</version>
84
-                <configuration>
85
-                    <source>${java.version}</source>
86
-                    <target>${java.version}</target>
87
-                    <encoding>${project.build.sourceEncoding}</encoding>
88
-                </configuration>
89
-            </plugin>
90
-
91 79
             <plugin>
92 80
                 <groupId>org.springframework.boot</groupId>
93 81
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -96,12 +84,6 @@
96 84
     </build>
97 85
     <dependencies>
98 86
         <dependency>
99
-            <groupId>junit</groupId>
100
-            <artifactId>junit</artifactId>
101
-            <version>4.12</version>
102
-            <scope>test</scope>
103
-        </dependency>
104
-        <dependency>
105 87
             <groupId>org.springframework.boot</groupId>
106 88
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
107 89
         </dependency>
@@ -111,11 +93,7 @@
111 93
         </dependency>
112 94
         <dependency>
113 95
             <groupId>org.springframework.boot</groupId>
114
-            <artifactId>spring-boot-starter-test</artifactId>
115
-        </dependency>
116
-        <dependency>
117
-            <groupId>org.springframework</groupId>
118
-            <artifactId>spring-jms</artifactId>
96
+            <artifactId>spring-boot-starter-activemq</artifactId>
119 97
         </dependency>
120 98
         <dependency>
121 99
             <groupId>org.springframework</groupId>
@@ -129,14 +107,6 @@
129 107
         <dependency>
130 108
             <groupId>org.hibernate</groupId>
131 109
             <artifactId>hibernate-core</artifactId>
132
-            <version>4.3.5.Final</version>
133
-            <!-- God, what is it with Java and logging frameworks... http://forum.hibernate.org/viewtopic.php?p=2401380 -->
134
-            <exclusions>
135
-                <exclusion>
136
-                    <groupId>org.slf4j</groupId>
137
-                    <artifactId>slf4j-api</artifactId>
138
-                </exclusion>
139
-            </exclusions>
140 110
         </dependency>
141 111
         <dependency>
142 112
             <groupId>commons-collections</groupId>
@@ -156,29 +126,19 @@
156 126
         <dependency>
157 127
             <groupId>commons-dbcp</groupId>
158 128
             <artifactId>commons-dbcp</artifactId>
159
-            <version>1.2.2</version>
160 129
         </dependency>
161 130
         <dependency>
162 131
             <groupId>org.hsqldb</groupId>
163 132
             <artifactId>hsqldb</artifactId>
164
-            <version>2.3.3</version>
165 133
         </dependency>
166 134
         <dependency>
167 135
             <groupId>javax.servlet</groupId>
168 136
             <artifactId>javax.servlet-api</artifactId>
169
-            <version>3.1.0</version>
170 137
             <scope>provided</scope>
171 138
         </dependency>
172 139
         <dependency>
173 140
             <groupId>org.apache.activemq</groupId>
174
-            <artifactId>activemq-core</artifactId>
175
-            <version>5.2.0</version>
176
-            <exclusions>
177
-                <exclusion>
178
-                    <groupId>commons-logging</groupId>
179
-                    <artifactId>commons-logging-api</artifactId>
180
-                </exclusion>
181
-            </exclusions>
141
+            <artifactId>activemq-spring</artifactId>
182 142
         </dependency>
183 143
         <dependency>
184 144
             <groupId>org.apache.xbean</groupId>
@@ -186,6 +146,11 @@
186 146
             <version>3.4.3</version>
187 147
         </dependency>
188 148
         <dependency>
149
+            <groupId>org.springframework.boot</groupId>
150
+            <artifactId>spring-boot-starter-test</artifactId>
151
+            <scope>test</scope>
152
+        </dependency>
153
+        <dependency>
189 154
             <groupId>org.easymock</groupId>
190 155
             <artifactId>easymock</artifactId>
191 156
             <version>2.3</version>
@@ -194,12 +159,11 @@
194 159
         <dependency>
195 160
             <groupId>org.assertj</groupId>
196 161
             <artifactId>assertj-core</artifactId>
197
-            <version>3.8.0</version>
162
+            <scope>test</scope>
198 163
         </dependency>
199 164
         <dependency>
200 165
             <groupId>org.seleniumhq.selenium</groupId>
201 166
             <artifactId>selenium-java</artifactId>
202
-            <version>3.5.3</version>
203 167
             <scope>test</scope>
204 168
         </dependency>
205 169
     </dependencies>