sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1394914 - in /sis/branches/JDK7: ./ ide-project/NetBeans/nbproject/ sis-app/ sis-build-helper/ sis-build-helper/src/main/java/org/apache/sis/internal/taglet/ sis-metadata/ sis-referencing/ sis-utility/ sis-webapp/ src/main/docbook/
Date Sat, 06 Oct 2012 03:57:57 GMT
Author: desruisseaux
Date: Sat Oct  6 03:57:56 2012
New Revision: 1394914

URL: http://svn.apache.org/viewvc?rev=1394914&view=rev
Log:
Switch platform from JDK6 to JDK7.

Modified:
    sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
    sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
    sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
    sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
    sis/branches/JDK7/pom.xml
    sis/branches/JDK7/sis-app/pom.xml
    sis/branches/JDK7/sis-build-helper/pom.xml
    sis/branches/JDK7/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
    sis/branches/JDK7/sis-metadata/pom.xml
    sis/branches/JDK7/sis-referencing/pom.xml
    sis/branches/JDK7/sis-utility/pom.xml
    sis/branches/JDK7/sis-webapp/pom.xml
    sis/branches/JDK7/src/main/docbook/book.entities

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml Sat Oct  6 03:57:56 2012
@@ -19,7 +19,7 @@ is divided into following sections:
   - cleanup
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"
xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default"
name="Apache_SIS_for_JDK6-impl">
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"
xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default"
name="Apache_SIS_for_JDK7-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
@@ -54,6 +54,43 @@ is divided into following sections:
         <property file="nbproject/project.properties"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property"
name="-do-init">
+        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
+        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
+        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
+        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
+        <condition property="platform.javac" value="${platform.home}/bin/javac">
+            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
+        </condition>
+        <property name="platform.javac" value="${platform.javac.tmp}"/>
+        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
+        <condition property="platform.java" value="${platform.home}/bin/java">
+            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
+        </condition>
+        <property name="platform.java" value="${platform.java.tmp}"/>
+        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
+        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
+            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
+        </condition>
+        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
+        <condition property="platform.invalid" value="true">
+            <or>
+                <contains string="${platform.javac}" substring="$${platforms."/>
+                <contains string="${platform.java}" substring="$${platforms."/>
+                <contains string="${platform.javadoc}" substring="$${platforms."/>
+            </or>
+        </condition>
+        <fail unless="platform.home">Must set platform.home</fail>
+        <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+        <fail unless="platform.java">Must set platform.java</fail>
+        <fail unless="platform.javac">Must set platform.javac</fail>
+        <fail if="platform.invalid">
+ The J2SE Platform is not correctly set up.
+ Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home"
is not found in the project's properties files. 
+ Either open the project in the IDE and setup the Platform with the same name or add it manually.
+ For example like this:
+     ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put
the property "platforms.${platform.active}.home" in a .properties file)
+  or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where
no properties file is used) 
+  </fail>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
             <and>
@@ -194,15 +231,6 @@ is divided into following sections:
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
             <length length="0" string="${endorsed.classpath}" when="greater"/>
         </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <property name="javac.fork" value="${jdkBug6558476}"/>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
         <property name="copylibs.rebase" value="true"/>
@@ -277,7 +305,7 @@ is divided into following sections:
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
                 <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}"
encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false"
includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}"
target="${javac.target}" tempdir="${java.io.tmpdir}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}"
encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes"
includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}"
srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -316,7 +344,7 @@ is divided into following sections:
             <sequential>
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}"
encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false"
includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}"
target="${javac.target}" tempdir="${java.io.tmpdir}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}"
encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes"
includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}"
srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -391,7 +419,7 @@ is divided into following sections:
             <element name="customize" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed"
fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed"
fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
                     <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -414,7 +442,7 @@ is divided into following sections:
             <element name="customize" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed"
fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed"
fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
                     <batchtest todir="${build.test.results.dir}">
                         <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
                             <filename name="@{testincludes}"/>
@@ -456,7 +484,7 @@ is divided into following sections:
                     </fileset>
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}"
name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}"
mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Apache_SIS_for_JDK6"
testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}"
methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}"
suitename="Apache_SIS_for_JDK7" testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -536,7 +564,7 @@ is divided into following sections:
             <element name="customize" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed"
fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed"
fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
                     <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -561,7 +589,7 @@ is divided into following sections:
             <element name="customize" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed"
fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed"
fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
                     <batchtest todir="${build.test.results.dir}">
                         <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
                             <filename name="@{testincludes}"/>
@@ -607,7 +635,7 @@ is divided into following sections:
                 <condition else="-testclass @{testClass}" property="test.class.or.method"
value="-methods @{testClass}.@{testMethod}">
                     <isset property="test.method"/>
                 </condition>
-                <condition else="-suitename Apache_SIS_for_JDK6 -testname @{testClass}
${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                <condition else="-suitename Apache_SIS_for_JDK7 -testname @{testClass}
${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
                     <matches pattern=".*\.xml" string="@{testClass}"/>
                 </condition>
                 <delete dir="${build.test.results.dir}" quiet="true"/>
@@ -741,6 +769,9 @@ is divided into following sections:
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
+                    <bootclasspath>
+                        <path path="${platform.bootcp}"/>
+                    </bootclasspath>
                 </nbjpdastart>
             </sequential>
         </macrodef>
@@ -756,7 +787,9 @@ is divided into following sections:
         </macrodef>
     </target>
     <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <exec executable="${platform.java}" outputproperty="version-output">
+            <arg value="-version"/>
+        </exec>
         <condition property="have-jdk-older-than-1.4">
             <or>
                 <contains string="${version-output}" substring="java version &quot;1.0"/>
@@ -781,7 +814,7 @@ is divided into following sections:
             <attribute default="${debug.classpath}" name="classpath"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg line="${debug-args-line}"/>
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
@@ -808,7 +841,7 @@ is divided into following sections:
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}"
outputencoding="${runtime.encoding}"/>
@@ -899,7 +932,7 @@ is divided into following sections:
         <delete file="${built-jar.properties}" quiet="true"/>
     </target>
     <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: Apache SIS for JDK6 was already built"/>
+        <echo level="warn" message="Cycle detected: Apache SIS for JDK7 was already built"/>
     </target>
     <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
         <mkdir dir="${build.dir}"/>
@@ -1000,7 +1033,7 @@ is divided into following sections:
             <path path="${run.classpath}"/>
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
         </pathconvert>
-        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+        <echo level="info">${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
     </target>
     <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest"
unless="manifest.available">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
@@ -1027,7 +1060,7 @@ is divided into following sections:
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant,
try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+        <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
     </target>
     <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
         <delete>
@@ -1218,7 +1251,7 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}"
charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}"
failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}"
private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}"
useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}"
charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}"
executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}"
notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}"
use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
@@ -1416,7 +1449,7 @@ is divided into following sections:
         <delete file="${built-clean.properties}" quiet="true"/>
     </target>
     <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: Apache SIS for JDK6 was already built"/>
+        <echo level="warn" message="Cycle detected: Apache SIS for JDK7 was already built"/>
     </target>
     <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
         <mkdir dir="${build.dir}"/>

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties Sat Oct  6 03:57:56
2012
@@ -3,6 +3,6 @@
 build.xml.data.CRC32=58e6b21c
 build.xml.script.CRC32=462eaba0
 build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=885115bc
-nbproject/build-impl.xml.script.CRC32=5fe86ff5
+nbproject/build-impl.xml.data.CRC32=faf8c177
+nbproject/build-impl.xml.script.CRC32=61cb3eb8
 nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties Sat Oct  6 03:57:56
2012
@@ -17,7 +17,7 @@ manifest.file        = manifest.mf
 source.encoding      = UTF-8
 javac.source         = 1.6
 javac.target         = 1.6
-platform.active      = default_platform
+platform.active      = JDK_1.7
 run.jvmargs          = -ea
 
 #

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml Sat Oct  6 03:57:56 2012
@@ -3,7 +3,8 @@
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>Apache SIS for JDK6</name>
+            <name>Apache SIS for JDK7</name>
+            <explicit-platform explicit-source-supported="true"/>
             <source-roots>
                 <root id="src.local-src.dir" name="Local sources (unversioned)"/>
                 <root id="src.webapp.dir" name="Web application"/>

Modified: sis/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Sat Oct  6 03:57:56 2012
@@ -39,7 +39,7 @@
        ============================================================== -->
   <groupId>org.apache.sis</groupId>
   <artifactId>sis-parent</artifactId>
-  <version>0.3-jdk6-SNAPSHOT</version>
+  <version>0.3-jdk7-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache SIS</name>
@@ -280,8 +280,8 @@ Apache SIS is a toolkit for describing l
        ============================================================== -->
   <properties>
     <geoapi.version>3.1-M03</geoapi.version>
-    <maven.compile.source>1.6</maven.compile.source>
-    <maven.compile.target>1.6</maven.compile.target>
+    <maven.compile.source>1.7</maven.compile.source>
+    <maven.compile.target>1.7</maven.compile.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <website.encoding>UTF-8</website.encoding>
     <website.locale>en</website.locale>

Modified: sis/branches/JDK7/sis-app/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-app/pom.xml?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/sis-app/pom.xml (original)
+++ sis/branches/JDK7/sis-app/pom.xml Sat Oct  6 03:57:56 2012
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-jdk6-SNAPSHOT</version>
+    <version>0.3-jdk7-SNAPSHOT</version>
   </parent>
 
   <artifactId>sis-app</artifactId>

Modified: sis/branches/JDK7/sis-build-helper/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-build-helper/pom.xml?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/sis-build-helper/pom.xml (original)
+++ sis/branches/JDK7/sis-build-helper/pom.xml Sat Oct  6 03:57:56 2012
@@ -44,7 +44,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-jdk6-SNAPSHOT</version>
+    <version>0.3-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
(original)
+++ sis/branches/JDK7/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
Sat Oct  6 03:57:56 2012
@@ -36,7 +36,7 @@ public final class Module implements Tag
     /**
      * SIS version to be referenced by this taglet.
      */
-    private static final String VERSION = "0.3-jdk6-SNAPSHOT";
+    private static final String VERSION = "0.3-jdk7-SNAPSHOT";
 
     /**
      * Register this taglet.

Modified: sis/branches/JDK7/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/pom.xml?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/pom.xml (original)
+++ sis/branches/JDK7/sis-metadata/pom.xml Sat Oct  6 03:57:56 2012
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-jdk6-SNAPSHOT</version>
+    <version>0.3-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-referencing/pom.xml?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/sis-referencing/pom.xml (original)
+++ sis/branches/JDK7/sis-referencing/pom.xml Sat Oct  6 03:57:56 2012
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-jdk6-SNAPSHOT</version>
+    <version>0.3-jdk7-SNAPSHOT</version>
   </parent>
 
   <artifactId>sis-referencing</artifactId>

Modified: sis/branches/JDK7/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/pom.xml?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/pom.xml (original)
+++ sis/branches/JDK7/sis-utility/pom.xml Sat Oct  6 03:57:56 2012
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-jdk6-SNAPSHOT</version>
+    <version>0.3-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-webapp/pom.xml?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/sis-webapp/pom.xml (original)
+++ sis/branches/JDK7/sis-webapp/pom.xml Sat Oct  6 03:57:56 2012
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-jdk6-SNAPSHOT</version>
+    <version>0.3-jdk7-SNAPSHOT</version>
   </parent>
 
   <artifactId>sis-webapp</artifactId>

Modified: sis/branches/JDK7/src/main/docbook/book.entities
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/src/main/docbook/book.entities?rev=1394914&r1=1394913&r2=1394914&view=diff
==============================================================================
--- sis/branches/JDK7/src/main/docbook/book.entities (original)
+++ sis/branches/JDK7/src/main/docbook/book.entities Sat Oct  6 03:57:56 2012
@@ -1,5 +1,5 @@
 <!ENTITY geoapi-version "3.1-M03">
 <!ENTITY geoapi-release "3.0.0">
-<!ENTITY sis-release    "0.3-jdk6-SNAPSHOT">
+<!ENTITY sis-release    "0.3-jdk7-SNAPSHOT">
 <!ENTITY gml-version    "3.3">
 <!ENTITY geoapi-javadoc "http://www.geoapi.org/snapshot/javadoc">



Mime
View raw message