Add spring-build 2.2.3 and ensure build succeeds.
spring-build was previously included via an svn:external. Adding directly to the source tree under Git to avoid the need for a git submodule. In order to build from any earlier commit, it is recommended to export spring-build or symlink an existing copy into the root of the spring-framework project and then build normally. $ svn export https://src.springsource.org/svn/spring-build/tags/project-build-2.2.3 spring-build
This commit is contained in:
@@ -1,12 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beansProjectDescription>
|
||||
<version>1</version>
|
||||
<pluginVersion><![CDATA[2.0.5.v200805032123]]></pluginVersion>
|
||||
<pluginVersion><![CDATA[2.8.1.201111220115-RELEASE]]></pluginVersion>
|
||||
<configSuffixes>
|
||||
<configSuffix><![CDATA[xml]]></configSuffix>
|
||||
</configSuffixes>
|
||||
<enableImports><![CDATA[true]]></enableImports>
|
||||
<configs>
|
||||
<config>src/main/webapp/WEB-INF/config/data-access-config.xml</config>
|
||||
<config>src/main/webapp/WEB-INF/config/security-config.xml</config>
|
||||
<config>src/main/webapp/WEB-INF/config/webflow-config.xml</config>
|
||||
<config>src/main/webapp/WEB-INF/config/webmvc-config.xml</config>
|
||||
</configs>
|
||||
<configSets>
|
||||
</configSets>
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
<dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="compile->runtime"/>
|
||||
<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->runtime"/>
|
||||
<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="latest.integration" conf="compile->mojarra20"/>
|
||||
<dependency org="org.primefaces" name="primefaces" rev="2.2.M1-SNAPSHOT" changing="true" conf="compile->default"/>
|
||||
<dependency org="org.primefaces" name="primefaces" rev="2.2.1" changing="true" conf="compile->default"/>
|
||||
|
||||
<!-- test-time only dependencies -->
|
||||
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->runtime" />
|
||||
|
||||
@@ -155,8 +155,8 @@
|
||||
<dependency>
|
||||
<groupId>org.primefaces</groupId>
|
||||
<artifactId>primefaces</artifactId>
|
||||
<version>2.2.M1-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<version>2.2.1</version>
|
||||
</dependency>
|
||||
<!-- build time only dependencies -->
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
|
||||
0
spring-webflow-samples/booking-faces/src/test/resources/.gitignore
vendored
Normal file
0
spring-webflow-samples/booking-faces/src/test/resources/.gitignore
vendored
Normal file
@@ -1,12 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beansProjectDescription>
|
||||
<version>1</version>
|
||||
<pluginVersion><![CDATA[2.0.5.v200805032123]]></pluginVersion>
|
||||
<pluginVersion><![CDATA[2.8.1.201111220115-RELEASE]]></pluginVersion>
|
||||
<configSuffixes>
|
||||
<configSuffix><![CDATA[xml]]></configSuffix>
|
||||
</configSuffixes>
|
||||
<enableImports><![CDATA[true]]></enableImports>
|
||||
<configs>
|
||||
<config>src/main/webapp/WEB-INF/config/data-access-config.xml</config>
|
||||
<config>src/main/webapp/WEB-INF/config/security-config.xml</config>
|
||||
<config>src/main/webapp/WEB-INF/config/webflow-config.xml</config>
|
||||
<config>src/main/webapp/WEB-INF/config/webmvc-config.xml</config>
|
||||
</configs>
|
||||
<configSets>
|
||||
</configSets>
|
||||
|
||||
0
spring-webflow-samples/booking-mvc/src/test/resources/.gitignore
vendored
Normal file
0
spring-webflow-samples/booking-mvc/src/test/resources/.gitignore
vendored
Normal file
0
spring-webflow-samples/booking-portlet-faces/src/test/java/.gitignore
vendored
Normal file
0
spring-webflow-samples/booking-portlet-faces/src/test/java/.gitignore
vendored
Normal file
0
spring-webflow-samples/booking-portlet-faces/src/test/resources/.gitignore
vendored
Normal file
0
spring-webflow-samples/booking-portlet-faces/src/test/resources/.gitignore
vendored
Normal file
0
spring-webflow-samples/booking-portlet-mvc/src/test/java/.gitignore
vendored
Normal file
0
spring-webflow-samples/booking-portlet-mvc/src/test/java/.gitignore
vendored
Normal file
0
spring-webflow-samples/jsf-booking/src/test/java/.gitignore
vendored
Normal file
0
spring-webflow-samples/jsf-booking/src/test/java/.gitignore
vendored
Normal file
0
spring-webflow-samples/jsf-booking/src/test/resources/.gitignore
vendored
Normal file
0
spring-webflow-samples/jsf-booking/src/test/resources/.gitignore
vendored
Normal file
Reference in New Issue
Block a user