#ODFTOOLKIT-440# Change Java base line to JDK 6 for next release
git-svn-id: https://svn.apache.org/repos/asf/incubator/odf/trunk@1759990 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/generator/pom.xml b/generator/pom.xml
index 29dc826..efbafff 100644
--- a/generator/pom.xml
+++ b/generator/pom.xml
@@ -27,8 +27,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <!-- defined in the parent pom.xml -->
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
<meminitial>512m</meminitial>
<maxmem>1024m</maxmem>
</configuration>
diff --git a/generator/schema2template-maven-plugin/pom.xml b/generator/schema2template-maven-plugin/pom.xml
index ac756e4..5744118 100644
--- a/generator/schema2template-maven-plugin/pom.xml
+++ b/generator/schema2template-maven-plugin/pom.xml
@@ -68,8 +68,9 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <!-- defined in the parent pom.xml -->
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
</configuration>
</plugin>
<plugin>
diff --git a/generator/schema2template/pom.xml b/generator/schema2template/pom.xml
index 0d2d8d0..370fd72 100644
--- a/generator/schema2template/pom.xml
+++ b/generator/schema2template/pom.xml
@@ -112,8 +112,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <!-- defined in the parent pom.xml -->
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
diff --git a/odfdom/pom.xml b/odfdom/pom.xml
index 88b1c6e..4b8a8f7 100644
--- a/odfdom/pom.xml
+++ b/odfdom/pom.xml
@@ -54,12 +54,12 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>2.13.0</version>
+ <version>2.11.2</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>2.13.0</version>
+ <version>2.11.2</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -91,8 +91,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <!-- defined in the parent pom.xml -->
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
<meminitial>512m</meminitial>
<maxmem>1024m</maxmem>
<showDeprecation>true</showDeprecation>
diff --git a/pom.xml b/pom.xml
index f6c673d..9efcb89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,11 @@
<artifactId>apache</artifactId>
<version>13</version>
</parent>
-
+
+ <properties>
+ <jdk.version>1.6</jdk.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -57,13 +61,13 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>2.13.0</version>
+ <version>2.11.2</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<classifier>tests</classifier>
- <version>2.13.0</version>
+ <version>2.11.2</version>
</dependency>
<dependency>
<groupId>net.rootdev</groupId>
diff --git a/simple/pom.xml b/simple/pom.xml
index 0f49a17..78fa735 100644
--- a/simple/pom.xml
+++ b/simple/pom.xml
@@ -63,8 +63,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <!-- defined in the parent pom.xml -->
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
<meminitial>512m</meminitial>
<maxmem>1024m</maxmem>
<showDeprecation>true</showDeprecation>
diff --git a/taglets/pom.xml b/taglets/pom.xml
index 52e4f0f..68120c6 100644
--- a/taglets/pom.xml
+++ b/taglets/pom.xml
@@ -42,8 +42,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <!-- defined in the parent pom.xml -->
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
</configuration>
</plugin>
<plugin>
diff --git a/validator/pom.xml b/validator/pom.xml
index 81bc978..550d14f 100644
--- a/validator/pom.xml
+++ b/validator/pom.xml
@@ -268,8 +268,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <!-- defined in the parent pom.xml -->
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
<meminitial>512m</meminitial>
<maxmem>1024m</maxmem>
<showDeprecation>true</showDeprecation>
diff --git a/xslt-runner-task/pom.xml b/xslt-runner-task/pom.xml
index 6f9f01c..0ff0bfe 100644
--- a/xslt-runner-task/pom.xml
+++ b/xslt-runner-task/pom.xml
@@ -57,8 +57,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <!-- defined in the parent pom.xml -->
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
<meminitial>512m</meminitial>
<maxmem>1024m</maxmem>
<showDeprecation>true</showDeprecation>
diff --git a/xslt-runner/pom.xml b/xslt-runner/pom.xml
index 01446e4..48e8cbc 100644
--- a/xslt-runner/pom.xml
+++ b/xslt-runner/pom.xml
@@ -57,8 +57,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <!-- defined in the parent pom.xml -->
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
<meminitial>512m</meminitial>
<maxmem>1024m</maxmem>
<showDeprecation>true</showDeprecation>
