You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/08/01 19:50:32 UTC
svn commit: r1754792 - in /maven/plugins/trunk/maven-shade-plugin/src/it:
component-descriptor-relocation/pom.xml reloc-abs-resource-path/pom.xml
reloc-anno/pom.xml reloc-class-from-string-pool/pom.xml
reloc-enum-ref-from-anno/pom.xml
Author: rfscholte
Date: Mon Aug 1 19:50:32 2016
New Revision: 1754792
URL: http://svn.apache.org/viewvc?rev=1754792&view=rev
Log:
Ensure that Maven and ITs use the same Java Runtime
Modified:
maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-abs-resource-path/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-class-from-string-pool/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml
Modified: maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml?rev=1754792&r1=1754791&r2=1754792&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml Mon Aug 1 19:50:32 2016
@@ -131,7 +131,7 @@ under the License.
<goal>exec</goal>
</goals>
<configuration>
- <executable>java</executable>
+ <executable>${JAVA_HOME}/bin/java</executable>
<arguments>
<argument>-classpath</argument>
<argument>${project.build.directory}/test-1.0.jar</argument>
Modified: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-abs-resource-path/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-abs-resource-path/pom.xml?rev=1754792&r1=1754791&r2=1754792&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-abs-resource-path/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-abs-resource-path/pom.xml Mon Aug 1 19:50:32 2016
@@ -75,7 +75,7 @@ under the License.
<goal>exec</goal>
</goals>
<configuration>
- <executable>java</executable>
+ <executable>${JAVA_HOME}/bin/java</executable>
<arguments>
<argument>-classpath</argument>
<argument>${project.build.directory}/reloc-abs-resource-path-1.0.jar</argument>
Modified: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml?rev=1754792&r1=1754791&r2=1754792&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml Mon Aug 1 19:50:32 2016
@@ -88,7 +88,7 @@ under the License.
<goal>exec</goal>
</goals>
<configuration>
- <executable>java</executable>
+ <executable>${JAVA_HOME}/bin/java</executable>
<arguments>
<argument>-classpath</argument>
<argument>${project.build.directory}/test-1.0.jar</argument>
Modified: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-class-from-string-pool/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-class-from-string-pool/pom.xml?rev=1754792&r1=1754791&r2=1754792&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-class-from-string-pool/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-class-from-string-pool/pom.xml Mon Aug 1 19:50:32 2016
@@ -84,7 +84,7 @@ under the License.
<goal>exec</goal>
</goals>
<configuration>
- <executable>java</executable>
+ <executable>${JAVA_HOME}/bin/java</executable>
<arguments>
<argument>-classpath</argument>
<argument>${project.build.directory}/test-1.0.jar</argument>
Modified: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml?rev=1754792&r1=1754791&r2=1754792&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml Mon Aug 1 19:50:32 2016
@@ -88,7 +88,7 @@ under the License.
<goal>exec</goal>
</goals>
<configuration>
- <executable>java</executable>
+ <executable>${JAVA_HOME}/bin/java</executable>
<arguments>
<argument>-classpath</argument>
<argument>${project.build.directory}/test-1.0.jar</argument>