diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-11-03 11:13:38 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-11-03 11:13:38 +0100 |
| commit | a3e59e5011e16271dab6cc8299a1d1241b4a7fb2 (patch) | |
| tree | aae2f450b7296a286c09a8c51d423aec4bedd0dd /id/server/moa-id-commons/pom.xml | |
| parent | 83dc74e60a4d9031285ac27aa0661fe0c26485e0 (diff) | |
| parent | 1fbff5f5a86733bc6a75c8ae901153baa0963441 (diff) | |
| download | moa-id-spss-a3e59e5011e16271dab6cc8299a1d1241b4a7fb2.tar.gz moa-id-spss-a3e59e5011e16271dab6cc8299a1d1241b4a7fb2.tar.bz2 moa-id-spss-a3e59e5011e16271dab6cc8299a1d1241b4a7fb2.zip | |
Merge branch 'moa-2.1-Snapshot'MOA-SPSS-2.0.3MOA-ID-2.1.2
Conflicts:
.gitignore
Diffstat (limited to 'id/server/moa-id-commons/pom.xml')
| -rw-r--r-- | id/server/moa-id-commons/pom.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index e6d708eca..2ca351e81 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -82,7 +82,7 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> - <version>2.2.7</version> + <version>2.2.11</version> </dependency> <dependency> @@ -118,7 +118,7 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.32</version> + <version>5.1.33</version> </dependency> </dependencies> @@ -175,7 +175,8 @@ <artifactId>maven-hyperjaxb3-plugin</artifactId> <version>0.5.6</version> <executions> - <execution> + <execution> + <phase>generate-sources</phase> <goals> <goal>generate</goal> </goals> |