f480333d31
Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:
git merge -s recursive -Xtheirs --no-commit env
No merge conflicts, but did need to
git rm spring-build
prior to committing.
With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch. 3.1.0 snapshots will be available
per the usual nightly CI build from trunk.
31 lines
1.5 KiB
XML
31 lines
1.5 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<module relativePaths="true" type="JAVA_MODULE" version="4">
|
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
|
<exclude-output />
|
|
<content url="file://$MODULE_DIR$">
|
|
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
|
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
|
|
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
|
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
|
|
<excludeFolder url="file://$MODULE_DIR$/target" />
|
|
</content>
|
|
<orderEntry type="sourceFolder" forTests="false" />
|
|
<orderEntry type="inheritedJdk" />
|
|
<orderEntry type="module" module-name="core" />
|
|
<orderEntry type="library" name="CGLIB" level="project" />
|
|
<orderEntry type="library" name="Commons Logging" level="project" />
|
|
<orderEntry type="library" name="EasyMock" level="project" />
|
|
<orderEntry type="library" name="javax.el" level="project" />
|
|
<orderEntry type="library" name="javax.inject" level="project" />
|
|
<orderEntry type="library" name="Hamcrest" level="project" />
|
|
<orderEntry type="library" name="JUnit" level="project" />
|
|
<orderEntry type="library" name="Log4j" level="project" />
|
|
</component>
|
|
<component name="copyright">
|
|
<Base>
|
|
<setting name="state" value="2" />
|
|
</Base>
|
|
</component>
|
|
</module>
|
|
|