]> git.argeo.org Git - gpl/argeo-slc.git/blobdiff - org.argeo.slc/pom.xml
Change bundle structure
[gpl/argeo-slc.git] / org.argeo.slc / pom.xml
index f6092a1ff4d055243fbdbec221fb5a470175ccfe..7dbcd53cd4eed76685d1ad64619b97a9d6664a59 100644 (file)
        <properties>
                <version.spring>2.5.6.A</version.spring>
                <version.spring-ws>1.5.5.A</version.spring-ws>
+               <version.spring-osgi>1.1.3.RELEASE</version.spring-osgi>
                <version.maven>2.0.9</version.maven>
                <version.ant>1.7.0</version.ant>
                <version.jetty>6.1.14</version.jetty>
-               <version.maven-bundle-plugin>1.4.3</version.maven-bundle-plugin>
-               <version.activemq>5.2.0</version.activemq>
+               <version.tomcat>6.0.18</version.tomcat>
+               <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
+               <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
+               <version.activemq>5.2.0.0006</version.activemq>
+               <version.activemq-web>5.2.0.0005</version.activemq-web>
+               <version.maven-argeo-osgi>0.1.7</version.maven-argeo-osgi>
        </properties>
        <scm>
                <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc</connection>
@@ -48,7 +53,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ]]>
-               </comments>
+                       </comments>
                </license>
        </licenses>
        <organization>
@@ -80,14 +85,6 @@ limitations under the License.
                                                <target>1.5</target>
                                        </configuration>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <archive>
-                                                       <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
-                                               </archive>
-                                       </configuration>
-                               </plugin>
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-source-plugin</artifactId>
@@ -162,53 +159,12 @@ limitations under the License.
                                                        <artifactId>com.springsource.javax.mail</artifactId>
                                                        <version>1.4.1</version>
                                                </dependency>
-
-                                               <!--
-                                                       Required by ActiveMQ admin <dependency>
-                                                       <groupId>org.springframework</groupId>
-                                                       <artifactId>org.springframework.web</artifactId>
-                                                       <version>${version.spring}</version> </dependency> <dependency>
-                                                       <groupId>org.springframework</groupId>
-                                                       <artifactId>org.springframework.web.servlet</artifactId>
-                                                       <version>${version.spring}</version> </dependency> <dependency>
-                                                       <groupId>org.apache.activemq</groupId>
-                                                       <artifactId>com.springsource.org.apache.activemq.web</artifactId>
-                                                       <version>${version.activemq}</version> </dependency> <dependency>
-                                                       <groupId>javax.jms</groupId>
-                                                       <artifactId>com.springsource.javax.jms</artifactId>
-                                                       <version>1.1.0</version> </dependency> <dependency>
-                                                       <groupId>org.apache.geronimo.specs</groupId>
-                                                       <artifactId>com.springsource.javax.management.j2ee</artifactId>
-                                                       <version>1.0.1</version> </dependency> <dependency>
-                                                       <groupId>com.opensymphony.sitemesh</groupId>
-                                                       <artifactId>com.springsource.com.opensymphony.sitemesh</artifactId>
-                                                       <version>2.3.0</version> </dependency>
-                                               -->
                                        </dependencies>
                                </plugin>
                                <plugin>
-                                       <groupId>org.apache.felix</groupId>
-                                       <artifactId>maven-bundle-plugin</artifactId>
-                                       <version>${version.maven-bundle-plugin}</version>
-                                       <extensions>true</extensions>
-                                       <configuration>
-                                               <manifestLocation>target/classes/META-INF</manifestLocation>
-                                               <instructions>
-                                                       <Bundle-SymbolicName>
-                                                               ${pom.artifactId}
-                                                       </Bundle-SymbolicName>
-                                                       <_removeheaders>Bnd-LastModified</_removeheaders>
-                                               </instructions>
-                                       </configuration>
-                                       <executions>
-                                               <execution>
-                                                       <id>bundle-manifest</id>
-                                                       <phase>process-classes</phase>
-                                                       <goals>
-                                                               <goal>manifest</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
+                                       <groupId>org.argeo.slc.maven</groupId>
+                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                       <version>${version.maven-argeo-osgi}</version>
                                </plugin>
                        </plugins>
                </pluginManagement>
@@ -266,6 +222,12 @@ limitations under the License.
                                <artifactId>org.argeo.slc.support.simple</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.support.simple</artifactId>
+                               <version>${project.version}</version>
+                               <classifier>tests</classifier>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.ant</artifactId>
@@ -293,7 +255,12 @@ limitations under the License.
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.execution</artifactId>
+                               <artifactId>org.argeo.slc.osgiboot</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.support.equinox</artifactId>
                                <version>${project.version}</version>
                        </dependency>
                        <dependency>
@@ -343,7 +310,6 @@ limitations under the License.
                                <artifactId>
                                        com.springsource.com.sun.xml.messaging.saaj
                                </artifactId>
-                               <scope>runtime</scope>
                                <version>1.3.0</version>
                        </dependency>
                        <dependency>
@@ -353,6 +319,26 @@ limitations under the License.
                                </artifactId>
                                <version>1.1.1</version>
                        </dependency>
+                       <dependency>
+                               <groupId>javax.annotation</groupId>
+                               <artifactId>com.springsource.javax.annotation</artifactId>
+                               <version>1.0.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.persistence</groupId>
+                               <artifactId>com.springsource.javax.persistence</artifactId>
+                               <version>1.0.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.xml.ws</groupId>
+                               <artifactId>com.springsource.javax.xml.ws</artifactId>
+                               <version>2.1.1</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.xml.bind</groupId>
+                               <artifactId>com.springsource.javax.xml.bind</artifactId>
+                               <version>2.1.7</version>
+                       </dependency>
 
                        <!-- Unit tests -->
                        <dependency>
@@ -396,6 +382,7 @@ limitations under the License.
                                <artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
                                <version>1.5.3</version>
                        </dependency>
+
                        <!-- Spring -->
                        <dependency>
                                <groupId>org.springframework</groupId>
@@ -469,7 +456,59 @@ limitations under the License.
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.extender</artifactId>
-                               <version>1.1.2.B</version>
+                               <version>${version.spring-osgi}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.osgi</groupId>
+                               <artifactId>org.springframework.osgi.core</artifactId>
+                               <version>${version.spring-osgi}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.osgi</groupId>
+                               <artifactId>org.springframework.osgi.web.extender</artifactId>
+                               <version>${version.spring-osgi}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.osgi</groupId>
+                               <artifactId>org.springframework.osgi.web</artifactId>
+                               <version>${version.spring-osgi}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+                               <version>1.0.0.argeo.2</version>
+                       </dependency>
+
+                       <!-- AOP -->
+                       <dependency>
+                               <groupId>org.aspectj</groupId>
+                               <artifactId>com.springsource.org.aspectj.runtime</artifactId>
+                               <version>1.6.2.RELEASE</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.aspectj</groupId>
+                               <artifactId>com.springsource.org.aspectj.weaver</artifactId>
+                               <version>1.6.2.RELEASE</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.aopalliance</groupId>
+                               <artifactId>com.springsource.org.aopalliance</artifactId>
+                               <version>1.0.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>net.sourceforge.cglib</groupId>
+                               <artifactId>com.springsource.net.sf.cglib</artifactId>
+                               <version>2.1.3</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.objectweb.asm</groupId>
+                               <artifactId>com.springsource.org.objectweb.asm</artifactId>
+                               <version>1.5.3</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.objectweb.asm</groupId>
+                               <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+                               <version>1.5.3</version>
                        </dependency>
 
                        <!-- Ant -->
@@ -519,7 +558,11 @@ limitations under the License.
                                <artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
                                <version>1.1</version>
                        </dependency>
-
+                       <dependency>
+                               <groupId>org.apache.commons</groupId>
+                               <artifactId>com.springsource.org.apache.commons.pool</artifactId>
+                               <version>1.4.0</version>
+                       </dependency>
                        <!-- DB Drivers -->
                        <dependency>
                                <groupId>org.hsqldb</groupId>
@@ -588,14 +631,6 @@ limitations under the License.
                                <artifactId>com.springsource.javax.activation</artifactId>
                                <version>1.1.1</version>
                        </dependency>
-
-                       <dependency>
-                               <groupId>org.aspectj</groupId>
-                               <artifactId>
-                                       com.springsource.org.aspectj.weaver
-                               </artifactId>
-                               <version>1.6.2.RELEASE</version>
-                       </dependency>
                        <dependency>
                                <groupId>com.lowagie.text</groupId>
                                <artifactId>
@@ -604,6 +639,22 @@ limitations under the License.
                                <version>2.0.8</version>
                        </dependency>
 
+                       <!-- Tomcat -->
+                       <dependency>
+                               <groupId>org.apache.catalina</groupId>
+                               <artifactId>com.springsource.org.apache.catalina</artifactId>
+                               <version>${version.tomcat}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.jasper</groupId>
+                               <artifactId>com.springsource.org.apache.jasper</artifactId>
+                               <version>${version.tomcat}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.el</groupId>
+                               <artifactId>com.springsource.org.apache.el</artifactId>
+                               <version>${version.tomcat}</version>
+                       </dependency>
 
                        <!-- Maven -->
                        <dependency>
@@ -631,20 +682,10 @@ limitations under the License.
                        </dependency>
 
                        <!-- OSGi -->
-                       <!--
-                               <dependency> <groupId>org.apache.felix</groupId>
-                               <artifactId>org.apache.felix.main</artifactId>
-                               <version>1.2.1</version> <exclusions> <exclusion>
-                               <groupId>org.apache.felix</groupId> <artifactId>
-                               org.apache.felix.framework </artifactId> </exclusion> </exclusions>
-                               </dependency> <dependency> <groupId>org.apache.felix</groupId>
-                               <artifactId>org.osgi.core</artifactId> <version>1.2.0</version>
-                               <scope>provided</scope> </dependency>
-                       -->
                        <dependency>
                                <groupId>org.eclipse.osgi</groupId>
                                <artifactId>org.eclipse.osgi</artifactId>
-                               <version>3.4.2.R34x_v20080826-1230</version>
+                               <version>${version.equinox}</version>
                        </dependency>
 
                        <!-- Auto UI -->
@@ -705,27 +746,41 @@ limitations under the License.
 
                        <!-- ActiveMQ -->
                        <dependency>
-                               <groupId>org.apache.activemq</groupId>
-                               <artifactId>com.springsource.org.apache.activemq</artifactId>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq</artifactId>
                                <version>${version.activemq}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.apache.activemq</groupId>
-                               <artifactId>com.springsource.org.apache.activemq.web</artifactId>
-                               <version>${version.activemq}</version>
+                               <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
+                               <version>5.2.0</version>
                        </dependency>
-                       <!--
-                               <dependency> <groupId>org.apache.activemq</groupId>
-                               <artifactId>activemq-pool</artifactId>
-                               <version>${version.activemq}</version> </dependency> <dependency>
-                               <groupId>org.apache.activemq</groupId>
-                               <artifactId>activemq-optional</artifactId>
-                               <version>${version.activemq}</version> </dependency>
-                       -->
                        <dependency>
-                               <groupId>org.apache.xbean</groupId>
-                               <artifactId>com.springsource.org.apache.xbean.spring</artifactId>
-                               <version>3.3.0</version>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
+                               <version>${version.activemq-web}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>javax.xml.soap</groupId>
+                               <artifactId>com.springsource.javax.xml.soap</artifactId>
+                               <version>1.3.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.xml.rpc</groupId>
+                               <artifactId>com.springsource.javax.xml.rpc</artifactId>
+                               <version>1.1.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.ejb</groupId>
+                               <artifactId>com.springsource.javax.ejb</artifactId>
+                               <version>3.0.0</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.apache.camel</groupId>
+                               <artifactId>com.springsource.org.apache.camel</artifactId>
+                               <version>1.3.0</version>
                        </dependency>
 
                </dependencies>
@@ -749,7 +804,8 @@ limitations under the License.
                        <id>com.springsource.repository.bundles.release</id>
                        <name>
                                SpringSource Enterprise Bundle Repository - SpringSource
-                               Bundle Releases
+                               Bundle
+                               Releases
                        </name>
                        <url>
                                http://repository.springsource.com/maven/bundles/release
@@ -769,7 +825,8 @@ limitations under the License.
                        <id>com.springsource.repository.bundles.external</id>
                        <name>
                                SpringSource Enterprise Bundle Repository - External
-                               Bundle Releases
+                               Bundle
+                               Releases
                        </name>
                        <url>
                                http://repository.springsource.com/maven/bundles/external
@@ -865,4 +922,17 @@ limitations under the License.
                        </url>
                </site>
        </distributionManagement>
+       <profiles>
+               <profile>
+                       <id>developer</id>
+                       <distributionManagement>
+                               <snapshotRepository>
+                                       <uniqueVersion>true</uniqueVersion>
+                                       <id>argeo-snapshots-restricted</id>
+                                       <name>Argeo FOSS Snapshots Repository</name>
+                                       <url>scpexe://argeo.org/var/argeo/maven2/argeo-snapshots</url>
+                               </snapshotRepository>
+                       </distributionManagement>
+               </profile>
+       </profiles>
 </project>