|
a/pom.xml |
|
b/pom.xml |
|
... |
|
... |
| 12 |
<virgo.home>C:/Users/munterberger/virgo-jetty-server-3.6.2</virgo.home>
|
12 |
<virgo.home>C:/Users/munterberger/virgo-jetty-server-3.6.2</virgo.home>
|
| 13 |
<!--<osgi.scope>compile</osgi.scope> --><!-- for local packaging -->
|
13 |
<!--<osgi.scope>compile</osgi.scope> --><!-- for local packaging -->
|
| 14 |
<osgi.scope>provided</osgi.scope>
|
14 |
<osgi.scope>provided</osgi.scope>
|
| 15 |
|
15 |
|
| 16 |
<compiler.version>1.7</compiler.version>
|
16 |
<compiler.version>1.7</compiler.version>
|
| 17 |
<!--<springframework.version>2.5.6.SEC03</springframework.version>-->
|
|
|
| 18 |
<springframework.version>3.2.3.RELEASE</springframework.version>
|
17 |
<springframework.version>3.2.3.RELEASE</springframework.version>
|
| 19 |
<osgi.version>4.3.1</osgi.version>
|
18 |
<osgi.version>4.3.1</osgi.version>
|
|
|
19 |
<jettison.version>1.3.4</jettison.version>
|
|
|
20 |
<jcraft.version>0.1.41</jcraft.version>
|
| 20 |
<maven-bundle-plugin.version>2.4.0</maven-bundle-plugin.version>
|
21 |
<maven-bundle-plugin.version>2.4.0</maven-bundle-plugin.version>
|
| 21 |
<t2.core.version>1.4</t2.core.version>
|
22 |
<t2.core.version>1.4</t2.core.version>
|
| 22 |
<t2.ui.api.version>1.4</t2.ui.api.version>
|
23 |
<t2.ui.api.version>1.4</t2.ui.api.version>
|
| 23 |
<t2.taverna-commandline.version>1.4</t2.taverna-commandline.version>
|
24 |
<t2.taverna-commandline.version>1.4</t2.taverna-commandline.version>
|
| 24 |
<t2.ui.activities.version>1.4</t2.ui.activities.version>
|
25 |
<t2.ui.activities.version>1.4</t2.ui.activities.version>
|
|
... |
|
... |
| 63 |
</dependency>
|
64 |
</dependency>
|
| 64 |
|
65 |
|
| 65 |
<dependency>
|
66 |
<dependency>
|
| 66 |
<groupId>org.codehaus.jettison</groupId>
|
67 |
<groupId>org.codehaus.jettison</groupId>
|
| 67 |
<artifactId>jettison</artifactId>
|
68 |
<artifactId>jettison</artifactId>
|
| 68 |
<version>1.3.4</version>
|
69 |
<version>${jettison.version}</version>
|
| 69 |
<scope>${osgi.scope}</scope>
|
70 |
<scope>${osgi.scope}</scope>
|
| 70 |
</dependency>
|
71 |
</dependency>
|
| 71 |
|
72 |
|
| 72 |
<dependency>
|
73 |
<dependency>
|
| 73 |
<groupId>com.jcraft.jsch</groupId>
|
74 |
<groupId>com.jcraft.jsch</groupId>
|
| 74 |
<artifactId>com.springsource.com.jcraft.jsch</artifactId>
|
75 |
<artifactId>com.springsource.com.jcraft.jsch</artifactId>
|
| 75 |
<version>0.1.41</version>
|
76 |
<version>${jcraft.version}</version>
|
| 76 |
<scope>${osgi.scope}</scope>
|
77 |
<!--<scope>${osgi.scope}</scope>-->
|
|
|
78 |
<!-- is it provided -->
|
| 77 |
</dependency>
|
79 |
</dependency>
|
| 78 |
<!-- END OSGi relevant dependencies -->
|
80 |
<!-- END OSGi relevant dependencies -->
|
| 79 |
|
81 |
|
| 80 |
<dependency>
|
82 |
<dependency>
|
| 81 |
<groupId>org.hibernate</groupId>
|
83 |
<groupId>org.hibernate</groupId>
|
| 82 |
<artifactId>hibernate-commons-annotations</artifactId>
|
84 |
<artifactId>hibernate-commons-annotations</artifactId>
|
|
... |
|
... |
| 413 |
|
415 |
|
| 414 |
</dependencies>
|
416 |
</dependencies>
|
| 415 |
|
417 |
|
| 416 |
<build>
|
418 |
<build>
|
| 417 |
|
419 |
|
| 418 |
<!-- copy property file -->
|
|
|
| 419 |
<resources>
|
|
|
| 420 |
<resource>
|
|
|
| 421 |
<directory>.</directory>
|
|
|
| 422 |
<includes>
|
|
|
| 423 |
<include>TavernaExtractor.properties</include>
|
|
|
| 424 |
</includes>
|
|
|
| 425 |
</resource>
|
|
|
| 426 |
</resources>
|
|
|
| 427 |
|
|
|
| 428 |
<plugins>
|
420 |
<plugins>
|
| 429 |
<plugin>
|
421 |
<plugin>
|
| 430 |
<groupId>org.apache.maven.plugins</groupId>
|
422 |
<groupId>org.apache.maven.plugins</groupId>
|
| 431 |
<artifactId>maven-compiler-plugin</artifactId>
|
423 |
<artifactId>maven-compiler-plugin</artifactId>
|
| 432 |
<version>3.1</version>
|
424 |
<version>3.1</version>
|
| 433 |
<configuration>
|
425 |
<configuration>
|
|
... |
|
... |
| 478 |
</goals>
|
470 |
</goals>
|
| 479 |
</execution>
|
471 |
</execution>
|
| 480 |
</executions>
|
472 |
</executions>
|
| 481 |
<configuration>
|
473 |
<configuration>
|
| 482 |
<manifestLocation>META-INF</manifestLocation>
|
474 |
<manifestLocation>META-INF</manifestLocation>
|
| 483 |
|
|
|
| 484 |
<!--
|
|
|
| 485 |
<instructions>
|
|
|
| 486 |
<Import-Package>!org.apache.commons.cli,*</Import-Package>
|
|
|
| 487 |
<Export-Package>net.timbusproject.extractors.modules.linuxhardware.*</Export-Package>
|
|
|
| 488 |
<Exclude-Resource>net/timbusproject/extractors/modules/linuxhardware/local/*</Exclude-Resource>
|
|
|
| 489 |
<Bundle-ClassPath>.,{maven-dependencies}</Bundle-ClassPath>
|
|
|
| 490 |
</instructions>
|
|
|
| 491 |
-->
|
|
|
| 492 |
<instructions>
|
475 |
<instructions>
|
| 493 |
<Import-Package>
|
476 |
<Import-Package>
|
| 494 |
net.timbusproject.extractors.core;version="[0.0,1)",
|
477 |
net.timbusproject.extractors.core;version="[0.0,1)",
|
| 495 |
org.osgi.framework;version="[1.6,2)",
|
478 |
org.osgi.framework;version="[1.6,2)",
|
| 496 |
<!-- javax.naming,
|
479 |
com.jcraft.jsch,
|
| 497 |
org.springframework.context.*;version="[3.0,4.0)"-->
|
480 |
org.codehaus.jettison
|
| 498 |
</Import-Package>
|
481 |
</Import-Package>
|
|
|
482 |
<Export-Package>
|
|
|
483 |
net.timbusproject.extractors.modules.tavernaextractor.TavernaExtractorOSGi
|
|
|
484 |
</Export-Package>
|
| 499 |
<Private-Package>net.timbusproject.extractors.modules.tavernaextractor</Private-Package>
|
485 |
<Private-Package>net.timbusproject.extractors.modules.tavernaextractor.*</Private-Package>
|
| 500 |
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
|
486 |
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
|
| 501 |
<Embed-Directory>OSGI-INF/lib</Embed-Directory>
|
487 |
<Embed-Directory>OSGI-INF/lib</Embed-Directory>
|
| 502 |
<Embed-Transitive>true</Embed-Transitive>
|
488 |
<Embed-Transitive>true</Embed-Transitive>
|
| 503 |
<Include-Resource>src/main/resources</Include-Resource>
|
489 |
<Include-Resource>src/main/resources</Include-Resource>
|
| 504 |
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
|
490 |
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
|
|
... |
|
... |
| 521 |
<properties>
|
507 |
<properties>
|
| 522 |
<packaging.type>jar</packaging.type>
|
508 |
<packaging.type>jar</packaging.type>
|
| 523 |
<packaging.name>TavernaExtractor</packaging.name>
|
509 |
<packaging.name>TavernaExtractor</packaging.name>
|
| 524 |
</properties>
|
510 |
</properties>
|
| 525 |
<build>
|
511 |
<build>
|
|
|
512 |
<resources>
|
|
|
513 |
<resource>
|
|
|
514 |
<directory>.</directory>
|
|
|
515 |
<includes>
|
|
|
516 |
<include>TavernaExtractor.properties</include>
|
|
|
517 |
</includes>
|
|
|
518 |
</resource>
|
|
|
519 |
</resources>
|
| 526 |
<plugins>
|
520 |
<plugins>
|
| 527 |
<plugin>
|
521 |
<plugin>
|
| 528 |
<groupId>org.apache.maven.plugins</groupId>
|
522 |
<groupId>org.apache.maven.plugins</groupId>
|
| 529 |
<artifactId>maven-assembly-plugin</artifactId>
|
523 |
<artifactId>maven-assembly-plugin</artifactId>
|
| 530 |
<version>2.4</version>
|
524 |
<version>2.4</version>
|