Skip to content

Commit 35b42eb

Browse files
committed
#71 - Switched the order of Spring 4 and Spring 4 Next profile.
This was necessary to be able to run the build against to-be-released Spring versions. Previously the default activation registered for the Spring 4 profile trumped the version number that should've been activated if you manually select a profile.
1 parent ec541e1 commit 35b42eb

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

parent/pom.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -543,10 +543,14 @@
543543

544544
<profile>
545545

546-
<id>spring4-next</id>
546+
<id>spring4</id>
547+
548+
<activation>
549+
<jdk>1.8</jdk>
550+
</activation>
547551

548552
<properties>
549-
<spring>4.0.5.BUILD-SNAPSHOT</spring>
553+
<spring>4.0.4.RELEASE</spring>
550554
</properties>
551555

552556
<dependencies>
@@ -558,25 +562,14 @@
558562
</dependency>
559563
</dependencies>
560564

561-
<repositories>
562-
<repository>
563-
<id>spring-libs-snapshot</id>
564-
<url>http://repo.spring.io/libs-snapshot</url>
565-
</repository>
566-
</repositories>
567-
568565
</profile>
569566

570567
<profile>
571568

572-
<id>spring4</id>
573-
574-
<activation>
575-
<jdk>1.8</jdk>
576-
</activation>
569+
<id>spring4-next</id>
577570

578571
<properties>
579-
<spring>4.0.4.RELEASE</spring>
572+
<spring>4.0.5.BUILD-SNAPSHOT</spring>
580573
</properties>
581574

582575
<dependencies>
@@ -588,6 +581,13 @@
588581
</dependency>
589582
</dependencies>
590583

584+
<repositories>
585+
<repository>
586+
<id>spring-libs-snapshot</id>
587+
<url>http://repo.spring.io/libs-snapshot</url>
588+
</repository>
589+
</repositories>
590+
591591
</profile>
592592

593593
<profile>

0 commit comments

Comments
 (0)