Switch to unified view

a/pom.xml b/pom.xml
...
...
3
    <modelVersion>4.0.0</modelVersion>
3
    <modelVersion>4.0.0</modelVersion>
4
    <groupId>net.timbusproject</groupId>
4
    <groupId>net.timbusproject</groupId>
5
    <artifactId>tavernaextractor</artifactId>
5
    <artifactId>tavernaextractor</artifactId>
6
    <packaging>${packaging.type}</packaging>
6
    <packaging>${packaging.type}</packaging>
7
    <name>TavernaExtractor</name>
7
    <name>TavernaExtractor</name>
8
    <version>1.1</version>
8
    <version>1.3</version>
9
9
10
    <organization>
10
    <organization>
11
        <name>SBA Research gGmbH</name>
11
        <name>SBA Research gGmbH</name>
12
        <url>http://www.sba-research.org/</url>
12
        <url>http://www.sba-research.org/</url>
13
    </organization>
13
    </organization>
...
...
130
            <scope>${osgi.scope}</scope>
130
            <scope>${osgi.scope}</scope>
131
        </dependency>
131
        </dependency>
132
        <!-- END OSGi relevant dependencies -->
132
        <!-- END OSGi relevant dependencies -->
133
133
134
        <dependency>
134
        <dependency>
135
            <groupId>org.hibernate</groupId>
135
            <groupId>commons-collections</groupId>
136
            <artifactId>hibernate-commons-annotations</artifactId>
136
            <artifactId>commons-collections</artifactId>
137
            <version>${hibernate.commons.version}</version>
137
            <version>3.2.1</version>
138
        </dependency>
138
        </dependency>
139
139
140
        <dependency>
140
        <dependency>
141
            <groupId>uk.gov.nationalarchives</groupId>
141
            <groupId>uk.gov.nationalarchives</groupId>
142
            <artifactId>droid-command-line</artifactId>
142
            <artifactId>droid-command-line</artifactId>
...
...
151
                <exclusion>
151
                <exclusion>
152
                    <groupId>org.hibernate</groupId>
152
                    <groupId>org.hibernate</groupId>
153
                    <artifactId>hibernate-core</artifactId>
153
                    <artifactId>hibernate-core</artifactId>
154
                </exclusion>
154
                </exclusion>
155
                <exclusion>
155
                <exclusion>
156
                    <groupId>org.hibernate</groupId>
157
                    <artifactId>hibernate-annotations</artifactId>
158
                </exclusion>
159
                <exclusion>
156
                    <groupId>org.springframework</groupId>
160
                    <groupId>org.springframework</groupId>
157
                    <artifactId>spring</artifactId>
161
                    <artifactId>spring</artifactId>
158
                </exclusion>
162
                </exclusion>
159
                <exclusion>
163
                <exclusion>
160
                    <groupId>org.springframework</groupId>
164
                    <groupId>org.springframework</groupId>
161
                    <artifactId>spring-web</artifactId>
165
                    <artifactId>spring-web</artifactId>
162
                </exclusion>
166
                </exclusion>
163
            </exclusions>
167
            </exclusions>
164
        </dependency>
168
        </dependency>
165
169
170
171
        <!--
166
        <dependency>
172
        <dependency>
167
            <groupId>org.hibernate</groupId>
173
            <groupId>org.hibernate</groupId>
168
            <artifactId>hibernate-core</artifactId>
174
            <artifactId>hibernate-core</artifactId>
169
            <version>3.6.10.Final</version>
175
            <version>3.6.10.Final</version>
176
        </dependency>-->
177
178
        <dependency>
179
            <groupId>org.hibernate</groupId>
180
            <artifactId>hibernate-commons-annotations</artifactId>
181
            <version>${hibernate.commons.version}</version>
170
        </dependency>
182
        </dependency>
171
183
172
        <dependency>
184
        <dependency>
173
            <groupId>net.timbusproject.extractors</groupId>
185
            <groupId>net.timbusproject.extractors</groupId>
174
            <artifactId>helpers</artifactId>
186
            <artifactId>helpers</artifactId>
...
...
372
            <artifactId>hamcrest-all</artifactId>
384
            <artifactId>hamcrest-all</artifactId>
373
            <version>${hamcrest.version}</version>
385
            <version>${hamcrest.version}</version>
374
        </dependency>
386
        </dependency>
375
387
376
        <!-- !! DO NOT CHANGE ANYTHING OF THAT DEPENDENCY !! -->
388
        <!-- !! DO NOT CHANGE ANYTHING OF THAT DEPENDENCY !! -->
377
        <dependency>
389
       <dependency>
378
            <groupId>org.hibernate</groupId>
390
            <groupId>org.hibernate</groupId>
379
            <artifactId>hibernate</artifactId>
391
            <artifactId>hibernate</artifactId>
380
            <version>3.2.5.ga.raven</version>
392
            <version>3.2.5.ga.raven</version>
381
382
            <exclusions>
393
            <exclusions>
383
                <exclusion>
394
                <exclusion>
384
                    <groupId>javax.transaction</groupId>
395
                    <groupId>javax.transaction</groupId>
385
                    <artifactId>jta</artifactId>
396
                    <artifactId>jta</artifactId>
386
                </exclusion>
397
                </exclusion>
...
...
532
                    </resource>
543
                    </resource>
533
                </resources>
544
                </resources>
534
                <plugins>
545
                <plugins>
535
                    <plugin>
546
                    <plugin>
536
                        <groupId>org.apache.maven.plugins</groupId>
547
                        <groupId>org.apache.maven.plugins</groupId>
548
                        <artifactId>maven-shade-plugin</artifactId>
549
                        <version>2.3</version>
550
                        <configuration>
551
                            <filters>
552
                                <filter>
553
                                    <artifact>*:*</artifact>
554
                                    <excludes>
555
                                        <exclude>META-INF/*.SF</exclude>
556
                                        <exclude>META-INF/*.DSA</exclude>
557
                                        <exclude>META-INF/*.RSA</exclude>
558
                                    </excludes>
559
                                </filter>
560
                            </filters>
561
                            <transformers>
562
                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
563
                                    <mainClass>net.timbusproject.extractors.modules.tavernaextractor.Main</mainClass>
564
                                </transformer>
565
                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
566
                                    <resource>META-INF/spring.handlers</resource>
567
                                </transformer>
568
                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
569
                                    <resource>META-INF/spring.schemas</resource>
570
                                </transformer>
571
                            </transformers>
572
                        </configuration>
573
                        <executions>
574
                            <execution>
575
                                <phase>package</phase>
576
                                <goals>
577
                                    <goal>shade</goal>
578
                                </goals>
579
                            </execution>
580
                        </executions>
581
                    </plugin>
582
583
                    <!--
584
                    <plugin>
585
                        <groupId>org.apache.maven.plugins</groupId>
537
                        <artifactId>maven-assembly-plugin</artifactId>
586
                        <artifactId>maven-assembly-plugin</artifactId>
538
                        <version>2.4</version>
587
                        <version>2.4</version>
539
                        <configuration>
588
                        <configuration>
540
                            <archive>
589
                            <archive>
541
                                <manifest>
590
                                <manifest>
...
...
555
                                    <goal>single</goal>
604
                                    <goal>single</goal>
556
                                </goals>
605
                                </goals>
557
                            </execution>
606
                            </execution>
558
                        </executions>
607
                        </executions>
559
                    </plugin>
608
                    </plugin>
609
                    -->
560
                </plugins>
610
                </plugins>
561
            </build>
611
            </build>
562
        </profile>
612
        </profile>
563
613
564
    </profiles>
614
    </profiles>