Switch to unified view

a/pom.xml b/pom.xml
...
...
19
            <email>munterberger@sba-research.org</email>
19
            <email>munterberger@sba-research.org</email>
20
        </developer>
20
        </developer>
21
    </developers>
21
    </developers>
22
22
23
    <properties>
23
    <properties>
24
        <!--<osgi.scope></osgi.scope> --><!-- set in OSGi profile -->
25
        <compiler.version>1.7</compiler.version>
24
        <compiler.version>1.7</compiler.version>
26
        <timbus.extractor.version>0.0.4-RELEASE</timbus.extractor.version>
25
        <timbus.extractor.version>0.0.4-RELEASE</timbus.extractor.version>
27
        <springframework.version>3.2.3.RELEASE</springframework.version>
26
        <springframework.version>3.2.3.RELEASE</springframework.version>
28
        <osgi.version>4.3.1</osgi.version>
27
        <osgi.version>4.3.1</osgi.version>
29
        <jettison.version>1.3.4</jettison.version>
28
        <jettison.version>1.3.4</jettison.version>
...
...
136
            <artifactId>hibernate-commons-annotations</artifactId>
135
            <artifactId>hibernate-commons-annotations</artifactId>
137
            <version>${hibernate.commons.version}</version>
136
            <version>${hibernate.commons.version}</version>
138
        </dependency>
137
        </dependency>
139
138
140
        <dependency>
139
        <dependency>
141
            <groupId>org.hibernate</groupId>
142
            <artifactId>hibernate-commons-annotations</artifactId>
143
            <version>3.0.0.ga</version>
144
        </dependency>
145
146
        <dependency>
147
            <groupId>net.timbusproject.extractors</groupId>
140
            <groupId>net.timbusproject.extractors</groupId>
148
            <artifactId>helpers</artifactId>
141
            <artifactId>helpers</artifactId>
149
            <version>0.1</version>
142
            <version>0.1</version>
150
        </dependency>
143
        </dependency>
151
144
...
...
216
        </dependency>
209
        </dependency>
217
210
218
        <dependency>
211
        <dependency>
219
            <groupId>net.sf.taverna.t2.activities</groupId>
212
            <groupId>net.sf.taverna.t2.activities</groupId>
220
            <artifactId>wsdl-activity</artifactId>
213
            <artifactId>wsdl-activity</artifactId>
214
            <version>${t2.core.version}</version>
215
        </dependency>
216
217
        <dependency>
218
            <groupId>net.sf.taverna.t2.activities</groupId>
219
            <artifactId>xpath-activity</artifactId>
220
            <version>${t2.core.version}</version>
221
        </dependency>
222
223
        <dependency>
224
            <groupId>net.sf.taverna.t2.activities</groupId>
225
            <artifactId>localworker-activity</artifactId>
221
            <version>${t2.core.version}</version>
226
            <version>${t2.core.version}</version>
222
        </dependency>
227
        </dependency>
223
228
224
        <dependency>
229
        <dependency>
225
            <groupId>net.sf.taverna.t2.activities</groupId>
230
            <groupId>net.sf.taverna.t2.activities</groupId>
...
...
540
                                </goals>
545
                                </goals>
541
                            </execution>
546
                            </execution>
542
                        </executions>
547
                        </executions>
543
                    </plugin>
548
                    </plugin>
544
549
545
                    <!--
546
                    <plugin>
547
                        <groupId>org.apache.maven.plugins</groupId>
548
                        <artifactId>maven-assembly-plugin</artifactId>
549
                        <version>2.4</version>
550
                        <configuration>
551
                            <archive>
552
                                <manifest>
553
                                    <mainClass>net.timbusproject.extractors.modules.tavernaextractor.Main</mainClass>
554
                                </manifest>
555
                            </archive>
556
                            <descriptorRefs>
557
                                <descriptorRef>jar-with-dependencies</descriptorRef>
558
                            </descriptorRefs>
559
                            <appendAssemblyId>false</appendAssemblyId>
560
                        </configuration>
561
                        <executions>
562
                            <execution>
563
                                <id>make-assembly</id>
564
                                <phase>package</phase>
565
                                <goals>
566
                                    <goal>single</goal>
567
                                </goals>
568
                            </execution>
569
                        </executions>
570
                    </plugin>
571
                    -->
572
                </plugins>
550
                </plugins>
573
            </build>
551
            </build>
574
        </profile>
552
        </profile>
575
553
576
    </profiles>
554
    </profiles>