--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<artifactId>tavernaextractor</artifactId>
<packaging>${packaging.type}</packaging>
<name>TavernaExtractor</name>
- <version>1.1</version>
+ <version>1.3</version>
<organization>
<name>SBA Research gGmbH</name>
@@ -132,9 +132,9 @@
<!-- END OSGi relevant dependencies -->
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- <version>${hibernate.commons.version}</version>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
</dependency>
<dependency>
@@ -153,6 +153,10 @@
<artifactId>hibernate-core</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</exclusion>
@@ -163,10 +167,18 @@
</exclusions>
</dependency>
+
+ <!--
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.6.10.Final</version>
+ </dependency>-->
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>${hibernate.commons.version}</version>
</dependency>
<dependency>
@@ -374,11 +386,10 @@
</dependency>
<!-- !! DO NOT CHANGE ANYTHING OF THAT DEPENDENCY !! -->
- <dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>3.2.5.ga.raven</version>
-
<exclusions>
<exclusion>
<groupId>javax.transaction</groupId>
@@ -534,6 +545,44 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>net.timbusproject.extractors.modules.tavernaextractor.Main</mainClass>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring.handlers</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring.schemas</resource>
+ </transformer>
+ </transformers>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
@@ -557,6 +606,7 @@
</execution>
</executions>
</plugin>
+ -->
</plugins>
</build>
</profile>