Author: rombert Date: Thu Jun 25 13:14:53 2015 New Revision: 1687505 URL: http://svn.apache.org/r1687505 Log: Remove superflous sling.java.version=6 as it's the default now
Modified: sling/trunk/bundles/api/pom.xml sling/trunk/bundles/commons/compiler/pom.xml sling/trunk/bundles/commons/contentdetection/pom.xml sling/trunk/bundles/commons/log/pom.xml sling/trunk/bundles/engine/pom.xml sling/trunk/bundles/extensions/dea/pom.xml sling/trunk/bundles/extensions/event/pom.xml sling/trunk/bundles/extensions/feature-flags/pom.xml sling/trunk/bundles/extensions/healthcheck/annotations/pom.xml sling/trunk/bundles/extensions/healthcheck/core/pom.xml sling/trunk/bundles/extensions/healthcheck/it/pom.xml sling/trunk/bundles/extensions/healthcheck/junit-bridge/pom.xml sling/trunk/bundles/extensions/healthcheck/samples/pom.xml sling/trunk/bundles/extensions/healthcheck/support/pom.xml sling/trunk/bundles/extensions/healthcheck/webconsole/pom.xml sling/trunk/bundles/extensions/i18n/pom.xml sling/trunk/bundles/extensions/models/api/pom.xml sling/trunk/bundles/extensions/models/impl/pom.xml sling/trunk/bundles/extensions/models/validation-impl/pom.xml sling/trunk/bundles/extensions/validation/api/pom.xml sling/trunk/bundles/extensions/validation/core/pom.xml sling/trunk/bundles/extensions/validation/examples/pom.xml sling/trunk/bundles/extensions/validation/it-http/pom.xml sling/trunk/bundles/extensions/validation/test-services/pom.xml sling/trunk/bundles/extensions/xss/pom.xml sling/trunk/bundles/jcr/contentloader/pom.xml sling/trunk/bundles/jcr/oak-server/pom.xml sling/trunk/bundles/resourceaccesssecurity/core/pom.xml sling/trunk/bundles/resourceresolver/pom.xml sling/trunk/bundles/scripting/api/pom.xml sling/trunk/bundles/scripting/core/pom.xml sling/trunk/bundles/scripting/jsp/pom.xml sling/trunk/bundles/scripting/sightly/engine/pom.xml sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml sling/trunk/bundles/scripting/sightly/models-use-provider/pom.xml sling/trunk/bundles/scripting/sightly/repl/pom.xml sling/trunk/bundles/scripting/sightly/testing-content/pom.xml sling/trunk/launchpad/base/pom.xml sling/trunk/tooling/support/provisioning-model/pom.xml Modified: sling/trunk/bundles/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/api/pom.xml (original) +++ sling/trunk/bundles/api/pom.xml Thu Jun 25 13:14:53 2015 @@ -51,7 +51,6 @@ <properties> <site.jira.version.id>12314252</site.jira.version.id> - <sling.java.version>6</sling.java.version> </properties> <dependencies> Modified: sling/trunk/bundles/commons/compiler/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/compiler/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/commons/compiler/pom.xml (original) +++ sling/trunk/bundles/commons/compiler/pom.xml Thu Jun 25 13:14:53 2015 @@ -43,10 +43,6 @@ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/commons/compiler</url> </scm> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <build> <plugins> <plugin> Modified: sling/trunk/bundles/commons/contentdetection/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/contentdetection/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/commons/contentdetection/pom.xml (original) +++ sling/trunk/bundles/commons/contentdetection/pom.xml Thu Jun 25 13:14:53 2015 @@ -39,7 +39,6 @@ <exam.version>3.5.0</exam.version> <url.version>1.5.2</url.version> <bundle.file.name>${basedir}/target/${project.build.finalName}.jar</bundle.file.name> - <sling.java.version>6</sling.java.version> <sling.launchpad.version>7</sling.launchpad.version> <powermock.version>1.6.2</powermock.version> <pax.vm.options>-Xmx256M -XX:MaxPermSize=256m</pax.vm.options> Modified: sling/trunk/bundles/commons/log/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/commons/log/pom.xml (original) +++ sling/trunk/bundles/commons/log/pom.xml Thu Jun 25 13:14:53 2015 @@ -47,7 +47,6 @@ <properties> <slf4j.version>1.6.4</slf4j.version> <logback.version>1.1.2</logback.version> - <sling.java.version>6</sling.java.version> <pax-exam.version>3.5.0</pax-exam.version> <bundle.build.dir> Modified: sling/trunk/bundles/engine/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/engine/pom.xml (original) +++ sling/trunk/bundles/engine/pom.xml Thu Jun 25 13:14:53 2015 @@ -45,7 +45,6 @@ <properties> <site.jira.version.id>12314287</site.jira.version.id> <site.javadoc.exclude>**.impl.**</site.javadoc.exclude> - <sling.java.version>6</sling.java.version> </properties> <build> Modified: sling/trunk/bundles/extensions/dea/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/dea/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/dea/pom.xml (original) +++ sling/trunk/bundles/extensions/dea/pom.xml Thu Jun 25 13:14:53 2015 @@ -42,11 +42,6 @@ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/dea</url> </scm> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - - <build> <plugins> <plugin> Modified: sling/trunk/bundles/extensions/event/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/event/pom.xml (original) +++ sling/trunk/bundles/extensions/event/pom.xml Thu Jun 25 13:14:53 2015 @@ -44,7 +44,6 @@ <properties> <site.jira.version.id>12315369</site.jira.version.id> - <sling.java.version>6</sling.java.version> <exam.version>4.4.0</exam.version> <url.version>2.3.0</url.version> <bundle.build.dir>${basedir}/target</bundle.build.dir> Modified: sling/trunk/bundles/extensions/feature-flags/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/feature-flags/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/feature-flags/pom.xml (original) +++ sling/trunk/bundles/extensions/feature-flags/pom.xml Thu Jun 25 13:14:53 2015 @@ -31,10 +31,6 @@ <packaging>bundle</packaging> <name>Apache Sling Feature Flags</name> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/feature-flags</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/feature-flags</developerConnection> Modified: sling/trunk/bundles/extensions/healthcheck/annotations/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/annotations/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/healthcheck/annotations/pom.xml (original) +++ sling/trunk/bundles/extensions/healthcheck/annotations/pom.xml Thu Jun 25 13:14:53 2015 @@ -40,10 +40,6 @@ Sling Health Check Annotations </description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/annotations</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/annotations</developerConnection> Modified: sling/trunk/bundles/extensions/healthcheck/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/healthcheck/core/pom.xml (original) +++ sling/trunk/bundles/extensions/healthcheck/core/pom.xml Thu Jun 25 13:14:53 2015 @@ -40,10 +40,6 @@ The Sling Health Check Core </description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/core</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/core</developerConnection> Modified: sling/trunk/bundles/extensions/healthcheck/it/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/it/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/healthcheck/it/pom.xml (original) +++ sling/trunk/bundles/extensions/healthcheck/it/pom.xml Thu Jun 25 13:14:53 2015 @@ -41,7 +41,6 @@ <url.version>1.5.2</url.version> <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level> <felix.shell>false</felix.shell> - <sling.java.version>6</sling.java.version> <sling.hc.samples.version>1.0.7-SNAPSHOT</sling.hc.samples.version> <sling.hc.core.version>1.2.3-SNAPSHOT</sling.hc.core.version> </properties> Modified: sling/trunk/bundles/extensions/healthcheck/junit-bridge/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/junit-bridge/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/healthcheck/junit-bridge/pom.xml (original) +++ sling/trunk/bundles/extensions/healthcheck/junit-bridge/pom.xml Thu Jun 25 13:14:53 2015 @@ -41,10 +41,6 @@ allow them to be used as part of integration tests. </description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/junit-bridge</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/junit-bridge</developerConnection> Modified: sling/trunk/bundles/extensions/healthcheck/samples/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/samples/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/healthcheck/samples/pom.xml (original) +++ sling/trunk/bundles/extensions/healthcheck/samples/pom.xml Thu Jun 25 13:14:53 2015 @@ -40,10 +40,6 @@ Sling Health Check sample content and configurations </description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/samples</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/samples</developerConnection> Modified: sling/trunk/bundles/extensions/healthcheck/support/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/support/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/healthcheck/support/pom.xml (original) +++ sling/trunk/bundles/extensions/healthcheck/support/pom.xml Thu Jun 25 13:14:53 2015 @@ -40,10 +40,6 @@ Default Sling Health Check Support Components </description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/support</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/support</developerConnection> Modified: sling/trunk/bundles/extensions/healthcheck/webconsole/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/webconsole/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/healthcheck/webconsole/pom.xml (original) +++ sling/trunk/bundles/extensions/healthcheck/webconsole/pom.xml Thu Jun 25 13:14:53 2015 @@ -40,10 +40,6 @@ Webconsole plugin for Sling Health Check Services </description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/webconsole</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/webconsole</developerConnection> Modified: sling/trunk/bundles/extensions/i18n/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/i18n/pom.xml (original) +++ sling/trunk/bundles/extensions/i18n/pom.xml Thu Jun 25 13:14:53 2015 @@ -41,7 +41,6 @@ <url.version>1.5.2</url.version> <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level> <bundle.file.name>${basedir}/target/${project.build.finalName}.jar</bundle.file.name> - <sling.java.version>6</sling.java.version> <sling.launchpad.version>7</sling.launchpad.version> </properties> Modified: sling/trunk/bundles/extensions/models/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/models/api/pom.xml (original) +++ sling/trunk/bundles/extensions/models/api/pom.xml Thu Jun 25 13:14:53 2015 @@ -37,10 +37,6 @@ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api</url> </scm> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <build> <plugins> <plugin> Modified: sling/trunk/bundles/extensions/models/impl/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/models/impl/pom.xml (original) +++ sling/trunk/bundles/extensions/models/impl/pom.xml Thu Jun 25 13:14:53 2015 @@ -31,9 +31,7 @@ <version>1.2.1-SNAPSHOT</version> <name>Apache Sling Models Implementation</name> <description>Apache Sling Models Implementation</description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/impl</connection> <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/impl</developerConnection> Modified: sling/trunk/bundles/extensions/models/validation-impl/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/validation-impl/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/models/validation-impl/pom.xml (original) +++ sling/trunk/bundles/extensions/models/validation-impl/pom.xml Thu Jun 25 13:14:53 2015 @@ -31,9 +31,7 @@ <version>1.0.0-SNAPSHOT</version> <name>Apache Sling Models Validation Implementation</name> <description>Validation Implementation which leverages Sling Validation</description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/validation-impl</connection> <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/validation-impl</developerConnection> Modified: sling/trunk/bundles/extensions/validation/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/api/pom.xml (original) +++ sling/trunk/bundles/extensions/validation/api/pom.xml Thu Jun 25 13:14:53 2015 @@ -35,10 +35,6 @@ <name>Apache Sling Validation Framework API</name> <description>The Apache Sling Validation Framework API</description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/api</connection> <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/api</developerConnection> Modified: sling/trunk/bundles/extensions/validation/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/pom.xml (original) +++ sling/trunk/bundles/extensions/validation/core/pom.xml Thu Jun 25 13:14:53 2015 @@ -39,10 +39,6 @@ <name>Apache Sling Validation Framework Core Implementation</name> <description>Provides Validation services to Apache Sling</description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <build> <plugins> <plugin> Modified: sling/trunk/bundles/extensions/validation/examples/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/examples/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/examples/pom.xml (original) +++ sling/trunk/bundles/extensions/validation/examples/pom.xml Thu Jun 25 13:14:53 2015 @@ -35,10 +35,6 @@ <name>Apache Sling Validation Framework Examples</name> <description>Demo Examples for the Apache Sling Validation Framework</description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/examples</connection> <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/examples</developerConnection> Modified: sling/trunk/bundles/extensions/validation/it-http/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/it-http/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/it-http/pom.xml (original) +++ sling/trunk/bundles/extensions/validation/it-http/pom.xml Thu Jun 25 13:14:53 2015 @@ -47,7 +47,6 @@ optionally using -Dmaven.surefire.debug to enable debugging. --> <properties> - <sling.java.version>6</sling.java.version> <!-- Set this to run the server on a specific port <http.port></http.port> --> Modified: sling/trunk/bundles/extensions/validation/test-services/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/test-services/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/test-services/pom.xml (original) +++ sling/trunk/bundles/extensions/validation/test-services/pom.xml Thu Jun 25 13:14:53 2015 @@ -34,10 +34,6 @@ <name>Apache Sling Validation Framework Testing Services</name> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/test-services</connection> <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/test-services</developerConnection> Modified: sling/trunk/bundles/extensions/xss/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/extensions/xss/pom.xml (original) +++ sling/trunk/bundles/extensions/xss/pom.xml Thu Jun 25 13:14:53 2015 @@ -45,9 +45,6 @@ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss</url> </scm> - <properties> - <sling.java.version>6</sling.java.version> - </properties> <!-- ======================================================================= --> <!-- B U I L D --> Modified: sling/trunk/bundles/jcr/contentloader/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/jcr/contentloader/pom.xml (original) +++ sling/trunk/bundles/jcr/contentloader/pom.xml Thu Jun 25 13:14:53 2015 @@ -39,7 +39,6 @@ <exam.version>3.5.0</exam.version> <url.version>1.5.2</url.version> <bundle.file.name>${basedir}/target/${project.build.finalName}.jar</bundle.file.name> - <sling.java.version>6</sling.java.version> <sling.launchpad.version>7</sling.launchpad.version> <pax.vm.options>-Xmx256M -XX:MaxPermSize=256m</pax.vm.options> <dump.test.bundles>false</dump.test.bundles> Modified: sling/trunk/bundles/jcr/oak-server/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/jcr/oak-server/pom.xml (original) +++ sling/trunk/bundles/jcr/oak-server/pom.xml Thu Jun 25 13:14:53 2015 @@ -37,8 +37,6 @@ </description> <properties> - <sling.java.version>6</sling.java.version> - <!-- WARNING make sure oak.version and sling.oak.server.version are in sync with bundles/jcr/it-jackrabbit-oak Modified: sling/trunk/bundles/resourceaccesssecurity/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceaccesssecurity/core/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/resourceaccesssecurity/core/pom.xml (original) +++ sling/trunk/bundles/resourceaccesssecurity/core/pom.xml Thu Jun 25 13:14:53 2015 @@ -49,7 +49,6 @@ <properties> <site.javadoc.exclude>**.internal.**</site.javadoc.exclude> - <sling.java.version>6</sling.java.version> </properties> <build> Modified: sling/trunk/bundles/resourceresolver/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/resourceresolver/pom.xml (original) +++ sling/trunk/bundles/resourceresolver/pom.xml Thu Jun 25 13:14:53 2015 @@ -50,7 +50,6 @@ <properties> <site.jira.version.id>12314286</site.jira.version.id> <site.javadoc.exclude>**.internal.**</site.javadoc.exclude> - <sling.java.version>6</sling.java.version> </properties> <build> Modified: sling/trunk/bundles/scripting/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/scripting/api/pom.xml (original) +++ sling/trunk/bundles/scripting/api/pom.xml Thu Jun 25 13:14:53 2015 @@ -42,10 +42,6 @@ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api</url> </scm> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <build> <plugins> <plugin> Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Thu Jun 25 13:14:53 2015 @@ -40,7 +40,6 @@ <exam.version>3.5.0</exam.version> <url.version>2.1.0</url.version> <bundle.file.name>${basedir}/target/${project.build.finalName}.jar</bundle.file.name> - <sling.java.version>6</sling.java.version> </properties> <scm> Modified: sling/trunk/bundles/scripting/jsp/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/scripting/jsp/pom.xml (original) +++ sling/trunk/bundles/scripting/jsp/pom.xml Thu Jun 25 13:14:53 2015 @@ -40,9 +40,6 @@ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp</url> </scm> - <properties> - <sling.java.version>6</sling.java.version> - </properties> <build> <plugins> <plugin> Modified: sling/trunk/bundles/scripting/sightly/engine/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/scripting/sightly/engine/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/engine/pom.xml Thu Jun 25 13:14:53 2015 @@ -51,7 +51,6 @@ <properties> <antlr.version>4.1</antlr.version> - <sling.java.version>6</sling.java.version> </properties> <!-- ======================================================================= --> Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Thu Jun 25 13:14:53 2015 @@ -48,10 +48,6 @@ <url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider</url> </scm> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <!-- ======================================================================= --> <!-- B U I L D --> <!-- ======================================================================= --> Modified: sling/trunk/bundles/scripting/sightly/models-use-provider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/models-use-provider/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/scripting/sightly/models-use-provider/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/models-use-provider/pom.xml Thu Jun 25 13:14:53 2015 @@ -48,10 +48,6 @@ <url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</url> </scm> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <!-- ======================================================================= --> <!-- B U I L D --> <!-- ======================================================================= --> Modified: sling/trunk/bundles/scripting/sightly/repl/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/repl/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/scripting/sightly/repl/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/repl/pom.xml Thu Jun 25 13:14:53 2015 @@ -39,10 +39,6 @@ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/repl</url> </scm> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <build> <pluginManagement> <plugins> Modified: sling/trunk/bundles/scripting/sightly/testing-content/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/bundles/scripting/sightly/testing-content/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/testing-content/pom.xml Thu Jun 25 13:14:53 2015 @@ -50,10 +50,6 @@ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content</url> </scm> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <!-- ======================================================================= --> <!-- B U I L D --> Modified: sling/trunk/launchpad/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/launchpad/base/pom.xml (original) +++ sling/trunk/launchpad/base/pom.xml Thu Jun 25 13:14:53 2015 @@ -43,7 +43,6 @@ <properties> <felix.httpservice.version>2.3.2</felix.httpservice.version> - <sling.java.version>6</sling.java.version> </properties> <scm> Modified: sling/trunk/tooling/support/provisioning-model/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/pom.xml?rev=1687505&r1=1687504&r2=1687505&view=diff ============================================================================== --- sling/trunk/tooling/support/provisioning-model/pom.xml (original) +++ sling/trunk/tooling/support/provisioning-model/pom.xml Thu Jun 25 13:14:53 2015 @@ -30,10 +30,6 @@ The provisioning model for Apache Sling </description> - <properties> - <sling.java.version>6</sling.java.version> - </properties> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model</developerConnection>