--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,8 @@
<osgi.scope>provided</osgi.scope>
<compiler.version>1.7</compiler.version>
- <springframework.version>2.5.6.SEC03</springframework.version>
+ <!--<springframework.version>2.5.6.SEC03</springframework.version>-->
+ <springframework.version>3.1.0.RELEASE</springframework.version>
<osgi.version>4.3.1</osgi.version>
<maven-bundle-plugin.version>2.4.0</maven-bundle-plugin.version>
<t2.core.version>1.4</t2.core.version>
@@ -36,13 +37,6 @@
</properties>
<dependencies>
- <!--Also imports: org.springframework:spring-beans; org.springframework:spring-core-->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${springframework.version}</version>
- <scope>${osgi.scope}</scope>
- </dependency>
<!-- BEGIN OSGi relevant dependencies -->
<dependency>
@@ -66,19 +60,22 @@
<scope>${osgi.scope}</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.3.4</version>
<scope>${osgi.scope}</scope>
</dependency>
-
- <dependency>
+ -->
+
+ <!--<dependency>
<groupId>com.jcraft.jsch</groupId>
<artifactId>com.springsource.com.jcraft.jsch</artifactId>
<version>0.1.41</version>
<scope>${osgi.scope}</scope>
</dependency>
+ -->
<!-- END OSGi relevant dependencies -->
<dependency>
@@ -87,40 +84,53 @@
<version>${hibernate.commons.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${springframework.version}</version>
+ <scope>${osgi.scope}</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${springframework.version}</version>
+ <scope>${osgi.scope}</scope>
+ </dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${springframework.version}</version>
+ <scope>${osgi.scope}</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${springframework.version}</version>
+ <scope>${osgi.scope}</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${springframework.version}</version>
+ <scope>${osgi.scope}</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${springframework.version}</version>
+ <scope>${osgi.scope}</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${springframework.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons.collections.version}</version>
+ <scope>${osgi.scope}</scope>
</dependency>
<dependency>
@@ -138,6 +148,14 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -149,13 +167,6 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-parent</artifactId>
- <version>${org.slf4j.version}</version>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
@@ -173,9 +184,9 @@
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.taverna-commandline</groupId>
- <artifactId>taverna-commandline-common</artifactId>
- <version>${t2.taverna-commandline.version}</version>
+ <groupId>net.sf.taverna.t2.taverna-commandline</groupId>
+ <artifactId>taverna-commandline-common</artifactId>
+ <version>${t2.taverna-commandline.version}</version>
</dependency>
<dependency>
@@ -200,12 +211,6 @@
<groupId>net.sf.taverna.t2.core</groupId>
<artifactId>provenance-mysql</artifactId>
<version>${t2.core.provenance.derby.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.4</version>
</dependency>
<dependency>
@@ -288,13 +293,6 @@
<dependency>
<groupId>net.sf.jung</groupId>
- <artifactId>jung2</artifactId>
- <version>${jung.version}</version>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.jung</groupId>
<artifactId>jung-algorithms</artifactId>
<version>${jung.version}</version>
</dependency>
@@ -407,11 +405,6 @@
<groupId>uk.ac.bolton.archimate</groupId>
<artifactId>editor</artifactId>
<version>${archimate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5.6.SEC03</version>
</dependency>
</dependencies>
@@ -464,20 +457,36 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <!--Optional arguments: Default values for (Export/Import)-Package are "*" - Everything-->
- <Export-Package>!*</Export-Package>
- <!--<Import-Package>*</Import-Package>-->
- <Embed-Dependency>dependencies</Embed-Dependency>
- <!--
- add ,plugin.xml if it's present i.e.
- src/main/resources,plugin.xml
- -->
+ <Import-Package>
+ net.timbusproject.extractors.core;version="[0.0,1)",
+ org.osgi.framework;version="[1.6,2)",
+ javax.naming,
+ org.springframework.context.*;version="[3.0,4.0)"
+ </Import-Package>
+ <Private-Package>net.timbusproject.extractors.modules.tavernaextractor</Private-Package>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Embed-Directory>OSGI-INF/lib</Embed-Directory>
+ <Embed-Transitive>true</Embed-Transitive>
<Include-Resource>src/main/resources</Include-Resource>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ <Bundle-Activator>net.timbusproject.extractors.modules.tavernaextractor.Activator</Bundle-Activator>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>net.flybyte.virgo</groupId>
+ <artifactId>virgo-maven-plugin</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <configuration>
+ <virgoRoot>C:/Users/munterberger/virgo-jetty-server-3.6.2</virgoRoot>
+ </configuration>
+ </plugin>
+
<!-- assembly -->
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -502,11 +511,18 @@
</execution>
</executions>
</plugin>
+ -->
</plugins>
</build>
<repositories>
+ <repository>
+ <id>com.springsource.repository.bundles.release</id>
+ <name>EBR Spring Release Repository</name>
+ <url>http:// repository.springsource.com/maven/bundles/release</url>
+ </repository>
+
<repository>
<id>com.springsource.repository.bundles.external</id>
<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>