New project conventions

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index b974816e065d15bbbfaa7cbf310f27acb637351d..536dd3e1023553dbbdc052dc41fb09c6c0fdb806 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
                <module>org.argeo.server.jcr</module>
                <!-- Eclipse -->
                <module>org.argeo.eclipse.ui</module>
-               <module>org.argeo.eclipse.ui.jcr</module>
                <module>org.argeo.eclipse.ui.rap</module>
                <module>org.argeo.eclipse.ui.rcp</module>
                <!-- Security -->
@@ -50,6 +49,7 @@
                <module>org.argeo.server.rap.webapp</module>
                <!-- Node -->
                <module>org.argeo.node.repo.jackrabbit</module>
+               <module>org.argeo.cms</module>
                <!-- Standard Workbench Perspectives -->
                <module>org.argeo.osgi.ui.explorer</module>
                <module>org.argeo.jcr.ui.explorer</module>
@@ -60,7 +60,6 @@
                <module>org.argeo.security.ui.rap</module>
                <module>org.argeo.security.ui.rcp</module>
                <!-- Legacy -->
-               <module>org.argeo.support.junit</module>
                <module>org.argeo.server.core</module>
                <module>org.argeo.ext.jdbm</module>
                <!-- Dependencies and Distributions -->
@@ -137,7 +136,18 @@ limitations under the License.
                                        <configuration>
                                                <source>1.6</source>
                                                <target>1.6</target>
+                                               <compilerId>eclipse</compilerId>
+                                               <!-- Hack to work around issues with generated annotations : -->
+                                               <generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
+                                               <generatedTestSourcesDirectory>target/classes</generatedTestSourcesDirectory>
                                        </configuration>
+                                       <dependencies>
+                                               <dependency>
+                                                       <groupId>org.codehaus.plexus</groupId>
+                                                       <artifactId>plexus-compiler-eclipse</artifactId>
+                                                       <version>2.3</version>
+                                               </dependency>
+                                       </dependencies>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-source-plugin</artifactId>
@@ -383,6 +393,15 @@ limitations under the License.
                        </plugin>
                </plugins>
        </build>
+       <!-- <dependencies> -->
+       <!-- <dependency> -->
+       <!-- <groupId>org.argeo.tp</groupId> -->
+       <!-- <artifactId>binaries</artifactId> -->
+       <!-- <type>pom</type> -->
+       <!-- <version>${version.argeo-distribution}</version> -->
+       <!-- <scope>compile</scope> -->
+       <!-- </dependency> -->
+       <!-- </dependencies> -->
        <dependencyManagement>
                <dependencies>
                        <dependency>