Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history 
* release/1.0.2:
  version is 1.0.2
  fixed version chaos and assembly
  maven-shade-plugin, 1.0.2-SNAPSHOT

# Conflicts:
#	pom.xml
  • Loading branch information
Nils Reiter committed Oct 20, 2016
2 parents 2be5d84 + 684e265 commit 345b215
Showing 1 changed file with 104 additions and 94 deletions.
198 changes: 104 additions & 94 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,108 +1,118 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>drama.Main</artifactId>
<dependencies>
<dependency>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>uimautil</artifactId>
<version>0.6.4</version>
</dependency>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>drama.Main</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
<version>2.9.0</version>
</dependency>

<dependency>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>de.unistuttgart.ims.drama.api</artifactId>
<version>0.3.1</version>
</dependency>
<dependency>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>uimautil</artifactId>
<version>0.6.4</version>
</dependency>

<dependency>
<groupId>com.lexicalscope.jewelcli</groupId>
<artifactId>jewelcli</artifactId>
<version>0.8.9</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>
<dependency>
<groupId>com.lexicalscope.jewelcli</groupId>
<artifactId>jewelcli</artifactId>
<version>0.8.9</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>
de.unistuttgart.ims.drama.io.tei.textgrid
</artifactId>
<version>0.3.0</version>
</dependency>
<dependency>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>de.unistuttgart.ims.drama.core</artifactId>
<version>0.3.0</version>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
<artifactId>
<version>0.3.1</version>
</dependency>
<dependency>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>de.unistuttgart.ims.drama.core</artifactId>
<version>0.3.1</version>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
<artifactId>
de.tudarmstadt.ukp.dkpro.core.io.xmi-asl
</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
<artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
<artifactId>
de.tudarmstadt.ukp.dkpro.core.tokit-asl
</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
<artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
<artifactId>
de.tudarmstadt.ukp.dkpro.core.stanfordnlp-gpl
</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
<artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
<artifactId>
de.tudarmstadt.ukp.dkpro.core.api.coref-asl
</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>de.unistuttgart.ims.drama.graph</artifactId>
<version>0.3.0</version>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
<artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>de.unistuttgart.ims.drama.graph</artifactId>
<version>0.3.1</version>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
<artifactId>
de.tudarmstadt.ukp.dkpro.core.matetools-gpl
</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>de.unistuttgart.ims</groupId>
<artifactId>de.unistuttgart.ims.drama.ui.json</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
</dependency>
</dependencies>
<version>1.0.1</version>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
</dependency>
</dependencies>
<version>1.0.2</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/org.apache.uima.fit/types.txt</resource>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 345b215

Please sign in to comment.