summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2014-09-12 12:44:53 +0200
committerSimon Rettberg2014-09-12 12:44:53 +0200
commit79c8278ff3f5a232aa1720b4a47096e97e17cd7b (patch)
treee88282fe1e305dd81a372381a545e3e37371eabb
parentAdd linux_32 profile for building on 32bit (swt) (diff)
downloadtutor-module-79c8278ff3f5a232aa1720b4a47096e97e17cd7b.tar.gz
tutor-module-79c8278ff3f5a232aa1720b4a47096e97e17cd7b.tar.xz
tutor-module-79c8278ff3f5a232aa1720b4a47096e97e17cd7b.zip
[client] Fix jface dependency, generate build number in MANIFEST.MF (still to be used)
-rw-r--r--dozentenmodul/pom.xml11
-rw-r--r--pom.xml2
2 files changed, 10 insertions, 3 deletions
diff --git a/dozentenmodul/pom.xml b/dozentenmodul/pom.xml
index b6e2e755..63fdf5da 100644
--- a/dozentenmodul/pom.xml
+++ b/dozentenmodul/pom.xml
@@ -12,6 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.build.timestamp.format>yy.M.d.Hmm</maven.build.timestamp.format>
</properties>
<build>
@@ -40,6 +41,9 @@
<manifest>
<mainClass>gui.intro.Login_GUI</mainClass>
</manifest>
+ <manifestEntries>
+ <Version-Timestamp>${maven.build.timestamp}</Version-Timestamp>
+ </manifestEntries>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -70,6 +74,9 @@
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>gui.intro.Login_GUI</mainClass>
+ <manifestEntries>
+ <Version-Timestamp>${maven.build.timestamp}</Version-Timestamp>
+ </manifestEntries>
</transformer>
</transformers>
</configuration>
@@ -134,9 +141,9 @@
<dependencies>
<dependency>
- <groupId>org.eclipse.jface</groupId>
+ <groupId>org.mod4j.org.eclipse.jface</groupId>
<artifactId>text</artifactId>
- <version>3.3.0-v20070606-0010</version>
+ <version>3.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
diff --git a/pom.xml b/pom.xml
index 419cd119..e72eba4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<packaging>pom</packaging>
<name>bwSuite</name>
- <url>http://google.de/</url>
+ <url>http://git.openslx.org/tutor-module.git/</url>
<modules>
<module>dozentenmodul</module>