This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
The following commit(s) were added to refs/heads/master by this push:
new ae82860 back-out change to Spring dependency.
new 18e18f8 Merge pull request #74 from snoopdave/update-selenium-tests
ae82860 is described below
commit ae82860818ae6d8d0964c3b799b4285962bac151
Author: David M. Johnson <snoopd...@apache.org>
AuthorDate: Sat Jan 2 09:31:03 2021 -0500
back-out change to Spring dependency.
---
app/pom.xml | 1 +
pom.xml | 8 --------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/app/pom.xml b/app/pom.xml
index 53bf272..f667015 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -55,6 +55,7 @@ limitations under the License.
<maven-antrun.version>1.0b3</maven-antrun.version>
<rome.version>1.13.1</rome.version>
<slf4j.version>1.7.30</slf4j.version>
+ <spring.version>5.2.7.RELEASE</spring.version>
<spring.security.version>5.3.3.RELEASE</spring.security.version>
<struts.version>2.5.22</struts.version>
<velocity.version>2.2</velocity.version>
diff --git a/pom.xml b/pom.xml
index 6d404f8..1269eb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,6 @@ limitations under the License.
<jaxb.version>2.3.1</jaxb.version>
<jetty.version>10.0.0</jetty.version>
<roller.version>6.1.0-SNAPSHOT</roller.version>
- <spring.version>5.2.7.RELEASE</spring.version>
</properties>
<modules>
@@ -110,13 +109,6 @@ limitations under the License.
<version>5.6.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-framework-bom</artifactId>
- <version>${spring.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
</dependencies>
</dependencyManagement>
