pom.xml

Changed the POM and Java source to eliminate the dependency on JCIP annotations. ModeShape

was using only 4 of the annotations (number of corresponding import statements is listed in parentheses):

net.jcip.annotations.GuardedBy (10)

net.jcip.annotations.Immutable (310)

net.jcip.annotations.NotThreadSafe (95)

net.jcip.annotations.ThreadSafe (97)

These were replaced with new annotations in 'org.modeshape.common.annotation' that are semantically

and lexically the same as the JCIP annotations.

The 'net.jcip' dependency was removed from all POMs. This change should be backward compatible.

If user code is explicitly using these annotations within Maven projects, they will have to have explicit

dependencies, and when upgrading to 2.5.0.Beta2 they will not have any issues. Similarly, non-Maven

projects will already have the JCIP JAR on their classpath, and can remove the library if they are not

explicitly using it.

All unit and integration tests continue to pass with these changes.

Created a 'modeshape-parent' project that contains just the information that all other

modules inherit, while leaving the set of modules and module-related profiles in the

top-level build POM. Since almost all of the other projects were inheriting from the

top-level POM, they were changed to reference the new parent (including the new relative

location).

With these changes, the build works as expected. No Java code was harmed or changed.

Prior to this change, someone running a ModeShape build for the first time had to run two separate commands:

'mvn -Pintegration install' and 'mvn -Passembly install'. It also used aggregator goals for JavaDoc and

assemblies, which fork a new build process for each invocation and which can result in a build that does

double work (if they're included in the main build process). Plus, because the JavaDoc and assembly usages

were in the parent POM, the JavaDoc and assemblies were produced before the modules were compiled; on a machine

in which 'mvn install' was not yet run, this caused an error.

Now, the assembly operation is defined in a child module called 'modeshape-distribution' and the assembly

descriptors are referenced as being on the classpath since they're now defined in a new

'modeshape-assembly-descriptors' module. The end result is that, on a fresh machine on which ModeShape

has not yet been built, the source for ModeShape can be downloaded and completely built using a single

command: 'mvn -Passembly install'.

This commit moves quite a few files around and restructures a number of the POM files, but does not affect

any of the Java source code.

git-svn-id: https://svn.jboss.org/repos/modeshape/trunk@2671 76366958-4244-0410-ad5e-bbfabb93f86b

git-svn-id: https://svn.jboss.org/repos/modeshape/trunk@2476 76366958-4244-0410-ad5e-bbfabb93f86b

git-svn-id: https://svn.jboss.org/repos/modeshape/branches/2.2.x@2273 76366958-4244-0410-ad5e-bbfabb93f86b

git-svn-id: https://svn.jboss.org/repos/modeshape/branches/2.2.1-dev@2200 76366958-4244-0410-ad5e-bbfabb93f86b

git-svn-id: https://svn.jboss.org/repos/modeshape/trunk@2198 76366958-4244-0410-ad5e-bbfabb93f86b

git-svn-id: https://svn.jboss.org/repos/modeshape/trunk@2099 76366958-4244-0410-ad5e-bbfabb93f86b

git-svn-id: https://svn.jboss.org/repos/modeshape/trunk@1964 76366958-4244-0410-ad5e-bbfabb93f86b

git-svn-id: https://svn.jboss.org/repos/modeshape/trunk@1864 76366958-4244-0410-ad5e-bbfabb93f86b

git-svn-id: https://svn.jboss.org/repos/modeshape/trunk@1841 76366958-4244-0410-ad5e-bbfabb93f86b

git-svn-id: https://svn.jboss.org/repos/modeshape/trunk@1820 76366958-4244-0410-ad5e-bbfabb93f86b

git-svn-id: https://svn.jboss.org/repos/modeshape/trunk@1819 76366958-4244-0410-ad5e-bbfabb93f86b

git-svn-id: https://svn.jboss.org/repos/modeshape/trunk@1744 76366958-4244-0410-ad5e-bbfabb93f86b