Skip to content

Commit 37227ed

Browse files
committed
Moving to Java 1.7 for #91.
1 parent 7e077b5 commit 37227ed

File tree

7 files changed

+16
-22
lines changed

7 files changed

+16
-22
lines changed

samples/basic/project-build.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@
104104
destdir="${basedir}/target/classes"
105105
srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc"
106106
classpathref="compile.path"
107-
source="1.6"
108-
target="1.6">
107+
source="1.7"
108+
target="1.7">
109109
</javac>
110110
<copy todir="${basedir}/target/classes">
111111
<fileset dir="${basedir}/src/main/resources"/>
@@ -120,8 +120,8 @@
120120
destdir="${basedir}/target/test-classes"
121121
srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc"
122122
classpathref="test-compile.path"
123-
source="1.6"
124-
target="1.6">
123+
source="1.7"
124+
target="1.7">
125125
</javac>
126126
<copy todir="${basedir}/target/test-classes">
127127
<fileset dir="${basedir}/src/test/resources"/>

samples/basic/project-pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,10 @@
6565
</configuration>
6666
</plugin>
6767
<plugin>
68-
<inherited>true</inherited>
6968
<artifactId>maven-compiler-plugin</artifactId>
7069
<configuration>
71-
<source>1.6</source>
72-
<target>1.6</target>
70+
<source>1.7</source>
71+
<target>1.7</target>
7372
</configuration>
7473
</plugin>
7574
</plugins>

samples/po-simple/project-build.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
destdir="${basedir}/target/classes"
100100
srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc"
101101
classpathref="compile.path"
102-
source="1.6"
103-
target="1.6">
102+
source="1.7"
103+
target="1.7">
104104
</javac>
105105
<copy todir="${basedir}/target/classes">
106106
<fileset dir="${basedir}/src/main/resources"/>
@@ -115,8 +115,8 @@
115115
destdir="${basedir}/target/test-classes"
116116
srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc"
117117
classpathref="test-compile.path"
118-
source="1.6"
119-
target="1.6">
118+
source="1.7"
119+
target="1.7">
120120
</javac>
121121
<copy todir="${basedir}/target/test-classes">
122122
<fileset dir="${basedir}/src/test/resources"/>

samples/po-simple/project-pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
</configuration>
5757
</plugin>
5858
<plugin>
59-
<inherited>true</inherited>
6059
<artifactId>maven-compiler-plugin</artifactId>
6160
<configuration>
6261
<source>1.6</source>

samples/po/project-build.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@
104104
destdir="${basedir}/target/classes"
105105
srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc"
106106
classpathref="compile.path"
107-
source="1.6"
108-
target="1.6">
107+
source="1.7"
108+
target="1.7">
109109
</javac>
110110
<copy todir="${basedir}/target/classes">
111111
<fileset dir="${basedir}/src/main/resources"/>
@@ -120,8 +120,8 @@
120120
destdir="${basedir}/target/test-classes"
121121
srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc"
122122
classpathref="test-compile.path"
123-
source="1.6"
124-
target="1.6">
123+
source="1.7"
124+
target="1.7">
125125
</javac>
126126
<copy todir="${basedir}/target/test-classes">
127127
<fileset dir="${basedir}/src/test/resources"/>

samples/po/project-pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,10 @@
6565
</configuration>
6666
</plugin>
6767
<plugin>
68-
<inherited>true</inherited>
6968
<artifactId>maven-compiler-plugin</artifactId>
7069
<configuration>
71-
<source>1.6</source>
72-
<target>1.6</target>
70+
<source>1.7</source>
71+
<target>1.7</target>
7372
</configuration>
7473
</plugin>
7574
</plugins>

samples/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<plugin>
2424
<artifactId>maven-assembly-plugin</artifactId>
2525
<version>2.6</version>
26-
<inherited>true</inherited>
2726
<executions>
2827
<execution>
2928
<id>maven-assembly</id>
@@ -57,7 +56,6 @@
5756
</plugin>
5857
<plugin>
5958
<artifactId>maven-antrun-plugin</artifactId>
60-
<inherited>true</inherited>
6159
<executions>
6260
<execution>
6361
<id>maven-unpack</id>
@@ -103,7 +101,6 @@
103101
</plugin>
104102
<plugin>
105103
<artifactId>maven-invoker-plugin</artifactId>
106-
<inherited>true</inherited>
107104
<executions>
108105
<execution>
109106
<id>maven-integration-test</id>

0 commit comments

Comments
 (0)