Commit 58b14ac4 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '2-eclipse-swt' into 'master'

changed pom.xml for build

Closes #2

See merge request !1
parents 98d79130 4e4834c7
......@@ -5,3 +5,4 @@
*/.settings
*/.classpath
hs_err_pid*.log
target/
......@@ -7,12 +7,7 @@
</parent>
<artifactId>anno-gui-macosx</artifactId>
<name>Anno for MacOSX</name>
<repositories>
<repository>
<id>swt-repo</id>
<url>https://swt-repo.googlecode.com/svn/repo/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.genesys-pgr</groupId>
......@@ -22,7 +17,7 @@
<dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.cocoa.macosx.x86_64</artifactId>
<version>4.4</version>
<version>4.3</version>
</dependency>
</dependencies>
......@@ -84,4 +79,4 @@
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
</project>
......@@ -39,11 +39,7 @@
<repositories>
<repository>
<id>swt-repo</id>
<url>https://swt-repo.googlecode.com/svn/repo/</url>
</repository>
<repository>
<id>thingml</id>
<id>thirdparty</id>
<name>3rd Party Eclipse</name>
<url>http://maven.thingml.org/thirdparty/</url>
</repository>
......@@ -58,23 +54,23 @@
<dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
<version>4.3.2</version>
<version>4.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
<version>4.3.2</version>
<version>4.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
<version>4.3.2</version>
<version>4.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
<version>4.3.2</version>
<version>4.3</version>
</dependency>
</dependencies>
<name>Anno for Windows, Linux</name>
</project>
\ No newline at end of file
</project>
......@@ -21,10 +21,6 @@
<id>my-local-repo</id>
<url>file://${basedir}/lib</url>
</repository>
<repository>
<id>swt-repo</id>
<url>https://swt-repo.googlecode.com/svn/repo/</url>
</repository>
<repository>
<id>thingml</id>
<name>3rd Party Eclipse</name>
......@@ -67,7 +63,7 @@
<dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.cocoa.macosx.x86_64</artifactId>
<version>4.4</version>
<version>4.3</version>
<scope>provided</scope>
</dependency>
<!--<dependency> -->
......@@ -76,176 +72,182 @@
<!--<version>3.3.0-v3346</version> -->
<!--</dependency> -->
<dependency>
<groupId>net.sf.supercsv</groupId>
<artifactId>super-csv</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>org.eclipse.core.databinding.beans</artifactId>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>org.eclipse.core.databinding</artifactId>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>
org.eclipse.core.databinding.observable
</artifactId>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>
org.eclipse.core.databinding.property
</artifactId>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>org.eclipse.jface.databinding</artifactId>
<version>3.8.0</version>
</dependency>
<!-- <dependency> <groupId>org.eclipse.maven</groupId> <artifactId>org.eclipse.jface</artifactId>
<version>3.8.0</version> </dependency> -->
<!-- <dependency> <groupId>org.eclipse.maven</groupId> <artifactId>org.eclipse.swt</artifactId>
<version>3.8.0</version> </dependency> -->
<!-- <dependency> <groupId>org.eclipse.maven</groupId> <artifactId>org.eclipse.equinox.common</artifactId>
<version>3.8.0</version> </dependency> <dependency> <groupId>org.eclipse.maven</groupId>
<artifactId>org.eclipse.core.commands</artifactId> <version>3.8.0</version>
</dependency> -->
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>com.ibm.icu</artifactId>
<version>3.8.0</version>
</dependency> <!-- <dependency> <groupId>org.eclipse.maven</groupId> <artifactId>org.eclipse.osgi.services</artifactId>
<dependency>
<groupId>net.sf.supercsv</groupId>
<artifactId>super-csv</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>org.eclipse.core.databinding.beans</artifactId>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>org.eclipse.core.databinding</artifactId>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>
org.eclipse.core.databinding.observable
</artifactId>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>
org.eclipse.core.databinding.property
</artifactId>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>org.eclipse.jface.databinding</artifactId>
<version>3.8.0</version>
</dependency>
<!-- <dependency> <groupId>org.eclipse.maven</groupId> <artifactId>org.eclipse.jface</artifactId>
<version>3.8.0</version> </dependency> -->
<!-- <dependency> <groupId>org.eclipse.maven</groupId> <artifactId>org.eclipse.swt</artifactId>
<version>3.8.0</version> </dependency> -->
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>org.eclipse.core.commands</artifactId>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>com.ibm.icu</artifactId>
<version>3.8.0</version>
</dependency> <!-- <dependency> <groupId>org.eclipse.maven</groupId> <artifactId>org.eclipse.osgi.services</artifactId>
<version>3.8.0</version> </dependency> <dependency> <groupId>org.eclipse.maven</groupId>
<artifactId>org.eclipse.osgi</artifactId> <version>3.8.0</version> </dependency> -->
<dependency>
<groupId>org.eclipse.jface</groupId>
<artifactId>org.eclipse.jface</artifactId>
<version>3.8.0.v20120521-2329</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.6.4</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20090211</version>
</dependency>
<dependency>
<groupId>org.genesys-pgr</groupId>
<artifactId>genesys-client-api</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>1.9.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.7</version>
</dependency>
<dependency>
<groupId>com.healthmarketscience.jackcess</groupId>
<artifactId>jackcess</artifactId>
<version>2.1.4</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.4</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<id>output-html</id>
<phase>generate-resources</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
<configuration>
<backend>html5</backend>
<doctype>book</doctype>
<sourceHighlighter>coderay</sourceHighlighter>
<attributes>
<copycss>true</copycss>
<!-- <linkcss /> -->
<toc>left</toc>
<icons>font</icons>
<sectanchors>true</sectanchors>
<idprefix />
<idseparator>-</idseparator>
<docinfo1>true</docinfo1>
</attributes>
</configuration>
</execution>
<!-- <execution>
<id>output-docbook</id>
<phase>generate-resources</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
<configuration>
<backend>docbook</backend>
<doctype>book</doctype>
</configuration>
</execution> -->
</executions>
<configuration>
<sourceDirectory>src/main/asciidoc</sourceDirectory>
<preserveDirectories>true</preserveDirectories>
<headerFooter>true</headerFooter>
<numbered>true</numbered>
<!-- <imagesDir>images</imagesDir> -->
<attributes>
<buildNumber>${buildNumber}</buildNumber>
<projectArtifact>${project.artifactId}</projectArtifact>
<projectVersion>${project.version}</projectVersion>
<snippets>${snippetsDirectory}</snippets>
</attributes>
</configuration>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
<dependency>
<groupId>org.eclipse.maven</groupId>
<artifactId>org.eclipse.jface</artifactId>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.6.4</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20090211</version>
</dependency>
<dependency>
<groupId>org.genesys-pgr</groupId>
<artifactId>genesys-client-api</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>1.9.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.7</version>
</dependency>
<dependency>
<groupId>com.healthmarketscience.jackcess</groupId>
<artifactId>jackcess</artifactId>
<version>2.1.4</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.4</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<id>output-html</id>
<phase>generate-resources</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
<configuration>
<backend>html5</backend>
<doctype>book</doctype>
<sourceHighlighter>coderay</sourceHighlighter>
<attributes>
<copycss>true</copycss>
<!-- <linkcss /> -->
<toc>left</toc>
<icons>font</icons>
<sectanchors>true</sectanchors>
<idprefix/>
<idseparator>-</idseparator>
<docinfo1>true</docinfo1>
</attributes>
</configuration>
</execution>
<!-- <execution>
<id>output-docbook</id>
<phase>generate-resources</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
<configuration>
<backend>docbook</backend>
<doctype>book</doctype>
</configuration>
</execution> -->
</executions>
<configuration>
<sourceDirectory>src/main/asciidoc</sourceDirectory>
<preserveDirectories>true</preserveDirectories>
<headerFooter>true</headerFooter>
<numbered>true</numbered>
<!-- <imagesDir>images</imagesDir> -->
<attributes>
<buildNumber>${buildNumber}</buildNumber>
<projectArtifact>${project.artifactId}</projectArtifact>
<projectVersion>${project.version}</projectVersion>
<snippets>${snippetsDirectory}</snippets>
</attributes>
</configuration>
</plugin>
</plugins>
</build>
</project>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment