|
a/pom.xml |
|
b/pom.xml |
|
... |
|
... |
10 |
<properties>
|
10 |
<properties>
|
11 |
<!--<osgi.scope>compile</osgi.scope>--> <!-- for local packaging -->
|
11 |
<!--<osgi.scope>compile</osgi.scope>--> <!-- for local packaging -->
|
12 |
<osgi.scope>provided</osgi.scope>
|
12 |
<osgi.scope>provided</osgi.scope>
|
13 |
|
13 |
|
14 |
<compiler.version>1.7</compiler.version>
|
14 |
<compiler.version>1.7</compiler.version>
|
15 |
<springframework.version>2.5.6.SEC03</springframework.version>
|
15 |
<!--<springframework.version>2.5.6.SEC03</springframework.version>-->
|
|
|
16 |
<springframework.version>3.1.0.RELEASE</springframework.version>
|
16 |
<osgi.version>4.3.1</osgi.version>
|
17 |
<osgi.version>4.3.1</osgi.version>
|
17 |
<maven-bundle-plugin.version>2.4.0</maven-bundle-plugin.version>
|
18 |
<maven-bundle-plugin.version>2.4.0</maven-bundle-plugin.version>
|
18 |
<t2.core.version>1.4</t2.core.version>
|
19 |
<t2.core.version>1.4</t2.core.version>
|
19 |
<t2.ui.api.version>1.4</t2.ui.api.version>
|
20 |
<t2.ui.api.version>1.4</t2.ui.api.version>
|
20 |
<t2.taverna-commandline.version>1.4</t2.taverna-commandline.version>
|
21 |
<t2.taverna-commandline.version>1.4</t2.taverna-commandline.version>
|
|
... |
|
... |
34 |
<org.slf4j.version>1.7.4</org.slf4j.version>
|
35 |
<org.slf4j.version>1.7.4</org.slf4j.version>
|
35 |
<google.guava.version>17.0</google.guava.version>
|
36 |
<google.guava.version>17.0</google.guava.version>
|
36 |
</properties>
|
37 |
</properties>
|
37 |
|
38 |
|
38 |
<dependencies>
|
39 |
<dependencies>
|
39 |
<!--Also imports: org.springframework:spring-beans; org.springframework:spring-core-->
|
|
|
40 |
<dependency>
|
|
|
41 |
<groupId>org.springframework</groupId>
|
|
|
42 |
<artifactId>spring-context</artifactId>
|
|
|
43 |
<version>${springframework.version}</version>
|
|
|
44 |
<scope>${osgi.scope}</scope>
|
|
|
45 |
</dependency>
|
|
|
46 |
|
40 |
|
47 |
<!-- BEGIN OSGi relevant dependencies -->
|
41 |
<!-- BEGIN OSGi relevant dependencies -->
|
48 |
<dependency>
|
42 |
<dependency>
|
49 |
<groupId>net.timbusproject.extractors</groupId>
|
43 |
<groupId>net.timbusproject.extractors</groupId>
|
50 |
<artifactId>extractors-core</artifactId>
|
44 |
<artifactId>extractors-core</artifactId>
|
|
... |
|
... |
64 |
<artifactId>org.osgi.compendium</artifactId>
|
58 |
<artifactId>org.osgi.compendium</artifactId>
|
65 |
<version>${osgi.version}</version>
|
59 |
<version>${osgi.version}</version>
|
66 |
<scope>${osgi.scope}</scope>
|
60 |
<scope>${osgi.scope}</scope>
|
67 |
</dependency>
|
61 |
</dependency>
|
68 |
|
62 |
|
|
|
63 |
<!--
|
69 |
<dependency>
|
64 |
<dependency>
|
70 |
<groupId>org.codehaus.jettison</groupId>
|
65 |
<groupId>org.codehaus.jettison</groupId>
|
71 |
<artifactId>jettison</artifactId>
|
66 |
<artifactId>jettison</artifactId>
|
72 |
<version>1.3.4</version>
|
67 |
<version>1.3.4</version>
|
73 |
<scope>${osgi.scope}</scope>
|
68 |
<scope>${osgi.scope}</scope>
|
74 |
</dependency>
|
69 |
</dependency>
|
|
|
70 |
-->
|
75 |
|
71 |
|
76 |
<dependency>
|
72 |
<!--<dependency>
|
77 |
<groupId>com.jcraft.jsch</groupId>
|
73 |
<groupId>com.jcraft.jsch</groupId>
|
78 |
<artifactId>com.springsource.com.jcraft.jsch</artifactId>
|
74 |
<artifactId>com.springsource.com.jcraft.jsch</artifactId>
|
79 |
<version>0.1.41</version>
|
75 |
<version>0.1.41</version>
|
80 |
<scope>${osgi.scope}</scope>
|
76 |
<scope>${osgi.scope}</scope>
|
81 |
</dependency>
|
77 |
</dependency>
|
|
|
78 |
-->
|
82 |
<!-- END OSGi relevant dependencies -->
|
79 |
<!-- END OSGi relevant dependencies -->
|
83 |
|
80 |
|
84 |
<dependency>
|
81 |
<dependency>
|
85 |
<groupId>org.hibernate</groupId>
|
82 |
<groupId>org.hibernate</groupId>
|
86 |
<artifactId>hibernate-commons-annotations</artifactId>
|
83 |
<artifactId>hibernate-commons-annotations</artifactId>
|
87 |
<version>${hibernate.commons.version}</version>
|
84 |
<version>${hibernate.commons.version}</version>
|
88 |
</dependency>
|
85 |
</dependency>
|
89 |
|
86 |
|
|
|
87 |
<dependency>
|
|
|
88 |
<groupId>org.springframework</groupId>
|
|
|
89 |
<artifactId>spring-core</artifactId>
|
|
|
90 |
<version>${springframework.version}</version>
|
|
|
91 |
<scope>${osgi.scope}</scope>
|
|
|
92 |
</dependency>
|
|
|
93 |
|
|
|
94 |
<dependency>
|
|
|
95 |
<groupId>org.springframework</groupId>
|
|
|
96 |
<artifactId>spring-context</artifactId>
|
|
|
97 |
<version>${springframework.version}</version>
|
|
|
98 |
<scope>${osgi.scope}</scope>
|
|
|
99 |
</dependency>
|
|
|
100 |
|
90 |
<dependency>
|
101 |
<dependency>
|
91 |
<groupId>org.springframework</groupId>
|
102 |
<groupId>org.springframework</groupId>
|
92 |
<artifactId>spring-beans</artifactId>
|
103 |
<artifactId>spring-beans</artifactId>
|
93 |
<version>${springframework.version}</version>
|
104 |
<version>${springframework.version}</version>
|
|
|
105 |
<scope>${osgi.scope}</scope>
|
94 |
</dependency>
|
106 |
</dependency>
|
95 |
|
107 |
|
96 |
<dependency>
|
108 |
<dependency>
|
97 |
<groupId>org.springframework</groupId>
|
109 |
<groupId>org.springframework</groupId>
|
98 |
<artifactId>spring-tx</artifactId>
|
110 |
<artifactId>spring-tx</artifactId>
|
99 |
<version>${springframework.version}</version>
|
111 |
<version>${springframework.version}</version>
|
|
|
112 |
<scope>${osgi.scope}</scope>
|
100 |
</dependency>
|
113 |
</dependency>
|
101 |
|
114 |
|
102 |
<dependency>
|
115 |
<dependency>
|
103 |
<groupId>org.springframework</groupId>
|
116 |
<groupId>org.springframework</groupId>
|
104 |
<artifactId>spring-orm</artifactId>
|
117 |
<artifactId>spring-orm</artifactId>
|
105 |
<version>${springframework.version}</version>
|
118 |
<version>${springframework.version}</version>
|
|
|
119 |
<scope>${osgi.scope}</scope>
|
106 |
</dependency>
|
120 |
</dependency>
|
107 |
|
121 |
|
108 |
<dependency>
|
122 |
<dependency>
|
109 |
<groupId>org.springframework</groupId>
|
123 |
<groupId>org.springframework</groupId>
|
110 |
<artifactId>spring-jdbc</artifactId>
|
124 |
<artifactId>spring-jdbc</artifactId>
|
111 |
<version>${springframework.version}</version>
|
125 |
<version>${springframework.version}</version>
|
|
|
126 |
<scope>${osgi.scope}</scope>
|
112 |
</dependency>
|
127 |
</dependency>
|
113 |
|
128 |
|
114 |
<dependency>
|
129 |
<dependency>
|
115 |
<groupId>org.springframework</groupId>
|
130 |
<groupId>org.springframework</groupId>
|
116 |
<artifactId>spring-aop</artifactId>
|
131 |
<artifactId>spring-aop</artifactId>
|
117 |
<version>${springframework.version}</version>
|
132 |
<version>${springframework.version}</version>
|
118 |
</dependency>
|
133 |
<scope>${osgi.scope}</scope>
|
119 |
|
|
|
120 |
<dependency>
|
|
|
121 |
<groupId>commons-collections</groupId>
|
|
|
122 |
<artifactId>commons-collections</artifactId>
|
|
|
123 |
<version>${commons.collections.version}</version>
|
|
|
124 |
</dependency>
|
134 |
</dependency>
|
125 |
|
135 |
|
126 |
<dependency>
|
136 |
<dependency>
|
127 |
<groupId>uk.gov.nationalarchives</groupId>
|
137 |
<groupId>uk.gov.nationalarchives</groupId>
|
128 |
<artifactId>droid-command-line</artifactId>
|
138 |
<artifactId>droid-command-line</artifactId>
|
|
... |
|
... |
136 |
</exclusion>
|
146 |
</exclusion>
|
137 |
<exclusion>
|
147 |
<exclusion>
|
138 |
<groupId>org.hibernate</groupId>
|
148 |
<groupId>org.hibernate</groupId>
|
139 |
<artifactId>hibernate-core</artifactId>
|
149 |
<artifactId>hibernate-core</artifactId>
|
140 |
</exclusion>
|
150 |
</exclusion>
|
|
|
151 |
<exclusion>
|
|
|
152 |
<groupId>org.springframework</groupId>
|
|
|
153 |
<artifactId>spring</artifactId>
|
|
|
154 |
</exclusion>
|
|
|
155 |
<exclusion>
|
|
|
156 |
<groupId>org.springframework</groupId>
|
|
|
157 |
<artifactId>spring-web</artifactId>
|
|
|
158 |
</exclusion>
|
141 |
</exclusions>
|
159 |
</exclusions>
|
142 |
</dependency>
|
160 |
</dependency>
|
143 |
|
161 |
|
144 |
<dependency>
|
162 |
<dependency>
|
145 |
<groupId>org.hibernate</groupId>
|
163 |
<groupId>org.hibernate</groupId>
|
|
... |
|
... |
147 |
<version>3.6.10.Final</version>
|
165 |
<version>3.6.10.Final</version>
|
148 |
</dependency>
|
166 |
</dependency>
|
149 |
|
167 |
|
150 |
<dependency>
|
168 |
<dependency>
|
151 |
<groupId>org.slf4j</groupId>
|
169 |
<groupId>org.slf4j</groupId>
|
152 |
<artifactId>slf4j-parent</artifactId>
|
|
|
153 |
<version>${org.slf4j.version}</version>
|
|
|
154 |
<type>pom</type>
|
|
|
155 |
</dependency>
|
|
|
156 |
|
|
|
157 |
<dependency>
|
|
|
158 |
<groupId>org.slf4j</groupId>
|
|
|
159 |
<artifactId>slf4j-log4j12</artifactId>
|
170 |
<artifactId>slf4j-log4j12</artifactId>
|
160 |
<version>${org.slf4j.version}</version>
|
171 |
<version>${org.slf4j.version}</version>
|
161 |
</dependency>
|
172 |
</dependency>
|
162 |
|
173 |
|
163 |
<dependency>
|
174 |
<dependency>
|
|
... |
|
... |
171 |
<artifactId>activity-palette-api</artifactId>
|
182 |
<artifactId>activity-palette-api</artifactId>
|
172 |
<version>${t2.ui.api.version}</version>
|
183 |
<version>${t2.ui.api.version}</version>
|
173 |
</dependency>
|
184 |
</dependency>
|
174 |
|
185 |
|
175 |
<dependency>
|
186 |
<dependency>
|
176 |
<groupId>net.sf.taverna.t2.taverna-commandline</groupId>
|
187 |
<groupId>net.sf.taverna.t2.taverna-commandline</groupId>
|
177 |
<artifactId>taverna-commandline-common</artifactId>
|
188 |
<artifactId>taverna-commandline-common</artifactId>
|
178 |
<version>${t2.taverna-commandline.version}</version>
|
189 |
<version>${t2.taverna-commandline.version}</version>
|
179 |
</dependency>
|
190 |
</dependency>
|
180 |
|
191 |
|
181 |
<dependency>
|
192 |
<dependency>
|
182 |
<groupId>jaxen</groupId>
|
193 |
<groupId>jaxen</groupId>
|
183 |
<artifactId>jaxen</artifactId>
|
194 |
<artifactId>jaxen</artifactId>
|
|
... |
|
... |
198 |
|
209 |
|
199 |
<dependency>
|
210 |
<dependency>
|
200 |
<groupId>net.sf.taverna.t2.core</groupId>
|
211 |
<groupId>net.sf.taverna.t2.core</groupId>
|
201 |
<artifactId>provenance-mysql</artifactId>
|
212 |
<artifactId>provenance-mysql</artifactId>
|
202 |
<version>${t2.core.provenance.derby.version}</version>
|
213 |
<version>${t2.core.provenance.derby.version}</version>
|
203 |
</dependency>
|
|
|
204 |
|
|
|
205 |
<dependency>
|
|
|
206 |
<groupId>commons-discovery</groupId>
|
|
|
207 |
<artifactId>commons-discovery</artifactId>
|
|
|
208 |
<version>0.4</version>
|
|
|
209 |
</dependency>
|
214 |
</dependency>
|
210 |
|
215 |
|
211 |
<dependency>
|
216 |
<dependency>
|
212 |
<groupId>net.sf.taverna.t2</groupId>
|
217 |
<groupId>net.sf.taverna.t2</groupId>
|
213 |
<artifactId>provenance-client</artifactId>
|
218 |
<artifactId>provenance-client</artifactId>
|
|
... |
|
... |
286 |
<version>0.1</version>
|
291 |
<version>0.1</version>
|
287 |
</dependency>
|
292 |
</dependency>
|
288 |
|
293 |
|
289 |
<dependency>
|
294 |
<dependency>
|
290 |
<groupId>net.sf.jung</groupId>
|
295 |
<groupId>net.sf.jung</groupId>
|
291 |
<artifactId>jung2</artifactId>
|
|
|
292 |
<version>${jung.version}</version>
|
|
|
293 |
<type>pom</type>
|
|
|
294 |
</dependency>
|
|
|
295 |
|
|
|
296 |
<dependency>
|
|
|
297 |
<groupId>net.sf.jung</groupId>
|
|
|
298 |
<artifactId>jung-algorithms</artifactId>
|
296 |
<artifactId>jung-algorithms</artifactId>
|
299 |
<version>${jung.version}</version>
|
297 |
<version>${jung.version}</version>
|
300 |
</dependency>
|
298 |
</dependency>
|
301 |
|
299 |
|
302 |
<dependency>
|
300 |
<dependency>
|
|
... |
|
... |
405 |
|
403 |
|
406 |
<dependency>
|
404 |
<dependency>
|
407 |
<groupId>uk.ac.bolton.archimate</groupId>
|
405 |
<groupId>uk.ac.bolton.archimate</groupId>
|
408 |
<artifactId>editor</artifactId>
|
406 |
<artifactId>editor</artifactId>
|
409 |
<version>${archimate.version}</version>
|
407 |
<version>${archimate.version}</version>
|
410 |
</dependency>
|
|
|
411 |
<dependency>
|
|
|
412 |
<groupId>org.springframework</groupId>
|
|
|
413 |
<artifactId>spring</artifactId>
|
|
|
414 |
<version>2.5.6.SEC03</version>
|
|
|
415 |
</dependency>
|
408 |
</dependency>
|
416 |
|
409 |
|
417 |
</dependencies>
|
410 |
</dependencies>
|
418 |
|
411 |
|
419 |
<build>
|
412 |
<build>
|
|
... |
|
... |
462 |
</execution>
|
455 |
</execution>
|
463 |
</executions>
|
456 |
</executions>
|
464 |
<configuration>
|
457 |
<configuration>
|
465 |
<manifestLocation>META-INF</manifestLocation>
|
458 |
<manifestLocation>META-INF</manifestLocation>
|
466 |
<instructions>
|
459 |
<instructions>
|
467 |
<!--Optional arguments: Default values for (Export/Import)-Package are "*" - Everything-->
|
460 |
<Import-Package>
|
|
|
461 |
net.timbusproject.extractors.core;version="[0.0,1)",
|
|
|
462 |
org.osgi.framework;version="[1.6,2)",
|
|
|
463 |
javax.naming,
|
|
|
464 |
org.springframework.context.*;version="[3.0,4.0)"
|
468 |
<Export-Package>!*</Export-Package>
|
465 |
</Import-Package>
|
469 |
<!--<Import-Package>*</Import-Package>-->
|
466 |
<Private-Package>net.timbusproject.extractors.modules.tavernaextractor</Private-Package>
|
470 |
<Embed-Dependency>dependencies</Embed-Dependency>
|
467 |
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
|
471 |
<!--
|
468 |
<Embed-Directory>OSGI-INF/lib</Embed-Directory>
|
472 |
add ,plugin.xml if it's present i.e.
|
469 |
<Embed-Transitive>true</Embed-Transitive>
|
473 |
src/main/resources,plugin.xml
|
|
|
474 |
-->
|
|
|
475 |
<Include-Resource>src/main/resources</Include-Resource>
|
470 |
<Include-Resource>src/main/resources</Include-Resource>
|
|
|
471 |
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
|
|
|
472 |
<Bundle-Name>${project.name}</Bundle-Name>
|
|
|
473 |
<Bundle-Version>${project.version}</Bundle-Version>
|
|
|
474 |
<Bundle-Activator>net.timbusproject.extractors.modules.tavernaextractor.Activator</Bundle-Activator>
|
476 |
</instructions>
|
475 |
</instructions>
|
477 |
</configuration>
|
476 |
</configuration>
|
478 |
</plugin>
|
477 |
</plugin>
|
479 |
|
478 |
|
|
|
479 |
<plugin>
|
|
|
480 |
<groupId>net.flybyte.virgo</groupId>
|
|
|
481 |
<artifactId>virgo-maven-plugin</artifactId>
|
|
|
482 |
<version>1.0.1-SNAPSHOT</version>
|
|
|
483 |
<configuration>
|
|
|
484 |
<virgoRoot>C:/Users/munterberger/virgo-jetty-server-3.6.2</virgoRoot>
|
|
|
485 |
</configuration>
|
|
|
486 |
</plugin>
|
|
|
487 |
|
480 |
<!-- assembly -->
|
488 |
<!-- assembly -->
|
|
|
489 |
<!--
|
481 |
<plugin>
|
490 |
<plugin>
|
482 |
<groupId>org.apache.maven.plugins</groupId>
|
491 |
<groupId>org.apache.maven.plugins</groupId>
|
483 |
<artifactId>maven-assembly-plugin</artifactId>
|
492 |
<artifactId>maven-assembly-plugin</artifactId>
|
484 |
<version>2.4</version>
|
493 |
<version>2.4</version>
|
485 |
<configuration>
|
494 |
<configuration>
|
|
... |
|
... |
500 |
<goal>single</goal>
|
509 |
<goal>single</goal>
|
501 |
</goals>
|
510 |
</goals>
|
502 |
</execution>
|
511 |
</execution>
|
503 |
</executions>
|
512 |
</executions>
|
504 |
</plugin>
|
513 |
</plugin>
|
|
|
514 |
-->
|
505 |
|
515 |
|
506 |
</plugins>
|
516 |
</plugins>
|
507 |
</build>
|
517 |
</build>
|
508 |
|
518 |
|
509 |
<repositories>
|
519 |
<repositories>
|
|
|
520 |
<repository>
|
|
|
521 |
<id>com.springsource.repository.bundles.release</id>
|
|
|
522 |
<name>EBR Spring Release Repository</name>
|
|
|
523 |
<url>http:// repository.springsource.com/maven/bundles/release</url>
|
|
|
524 |
</repository>
|
|
|
525 |
|
510 |
<repository>
|
526 |
<repository>
|
511 |
<id>com.springsource.repository.bundles.external</id>
|
527 |
<id>com.springsource.repository.bundles.external</id>
|
512 |
<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
|
528 |
<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
|
513 |
<url>http://repository.springsource.com/maven/bundles/external</url>
|
529 |
<url>http://repository.springsource.com/maven/bundles/external</url>
|
514 |
<snapshots>
|
530 |
<snapshots>
|