Skip to content

Commit

Permalink
[build] fixes on the extended tests of the jars
Browse files Browse the repository at this point in the history
  • Loading branch information
mkristian committed Nov 20, 2014
1 parent 2a9ccce commit 2976e13
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 88 deletions.
2 changes: 2 additions & 0 deletions maven/jruby-complete/src/it/extended/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
# unit tests
jar 'junit:junit', '4.8.2', :scope => :test

properties 'tesla.dump.pom' => 'pom.xml', 'tesla.dump.readOnly' => true

plugin :surefire, '2.15', :additionalClasspathElements => [ '${basedir}/../../../../../core/target/test-classes', '${basedir}/../../../../../test/target/test-classes' ]
28 changes: 16 additions & 12 deletions maven/jruby-complete/src/it/extended/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>app</artifactId>
<artifactId>extended</artifactId>
<version>0.0.0</version>
<name>app</name>
<name>extended</name>
<properties>
<tesla.dump.readOnly>true</tesla.dump.readOnly>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
</properties>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>1.7.17-SNAPSHOT</version>
<type>pom</type>
<artifactId>jruby-complete</artifactId>
<version>@project.version@</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -23,13 +26,14 @@
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>../../../../../core/target/test-classes</additionalClasspathElement>
<additionalClasspathElement>../../../../../test/target/test-classes</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.15</version>
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../../../../../core/target/test-classes</additionalClasspathElement>
<additionalClasspathElement>${basedir}/../../../../../test/target/test-classes</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
51 changes: 0 additions & 51 deletions maven/jruby-complete/src/it/extended/pom.xml-

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

public class SimpleTest {

private final String basedir = "/home/christian/projects/active/maven/jruby17/";//new File( "../../../../../" ).getAbsolutePath();
private final String basedir = new File( "../../../../../" ).getAbsolutePath();

private ScriptingContainer newScriptingContainer() {
ScriptingContainer container = new ScriptingContainer(LocalContextScope.SINGLETHREAD);
Expand Down
2 changes: 2 additions & 0 deletions maven/jruby-jars/src/it/extended/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@
# unit tests
jar 'junit:junit', '4.8.2', :scope => :test

properties 'tesla.dump.pom' => 'pom.xml', 'tesla.dump.readOnly' => true

plugin :surefire, '2.15', :additionalClasspathElements => [ '${basedir}/../../../../../core/target/test-classes', '${basedir}/../../../../../test/target/test-classes' ]
33 changes: 21 additions & 12 deletions maven/jruby-jars/src/it/extended/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,23 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>app</artifactId>
<artifactId>extended</artifactId>
<version>0.0.0</version>
<name>app</name>
<name>extended</name>
<properties>
<tesla.dump.readOnly>true</tesla.dump.readOnly>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
</properties>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>1.7.17-SNAPSHOT</version>
<type>pom</type>
<artifactId>jruby-core</artifactId>
<version>@project.version@</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-stdlib</artifactId>
<version>@project.version@</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -23,13 +31,14 @@
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>../../../../../core/target/test-classes</additionalClasspathElement>
<additionalClasspathElement>../../../../../test/target/test-classes</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.15</version>
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../../../../../core/target/test-classes</additionalClasspathElement>
<additionalClasspathElement>${basedir}/../../../../../test/target/test-classes</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

public class SimpleTest {

private final String basedir = "/home/christian/projects/active/maven/jruby17/";//new File( "../../../../../" ).getAbsolutePath();
private final String basedir = new File( "../../../../../" ).getAbsolutePath();

private ScriptingContainer newScriptingContainer() {
ScriptingContainer container = new ScriptingContainer(LocalContextScope.SINGLETHREAD);
Expand Down
2 changes: 2 additions & 0 deletions maven/jruby/src/it/extended/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
# unit tests
jar 'junit:junit', '4.8.2', :scope => :test

properties 'tesla.dump.pom' => 'pom.xml', 'tesla.dump.readOnly' => true

plugin :surefire, '2.15', :additionalClasspathElements => [ '${basedir}/../../../../../core/target/test-classes', '${basedir}/../../../../../test/target/test-classes' ]
25 changes: 15 additions & 10 deletions maven/jruby/src/it/extended/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>app</artifactId>
<artifactId>extended</artifactId>
<version>0.0.0</version>
<name>app</name>
<name>extended</name>
<properties>
<tesla.dump.readOnly>true</tesla.dump.readOnly>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
</properties>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>1.7.17-SNAPSHOT</version>
<version>@project.version@</version>
<type>pom</type>
</dependency>
<dependency>
Expand All @@ -23,13 +27,14 @@
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>../../../../../core/target/test-classes</additionalClasspathElement>
<additionalClasspathElement>../../../../../test/target/test-classes</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.15</version>
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../../../../../core/target/test-classes</additionalClasspathElement>
<additionalClasspathElement>${basedir}/../../../../../test/target/test-classes</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

public class SimpleTest {

private final String basedir = "/home/christian/projects/active/maven/jruby17/";//new File( "../../../../../" ).getAbsolutePath();
private final String basedir = new File( "../../../../../" ).getAbsolutePath();

private ScriptingContainer newScriptingContainer() {
ScriptingContainer container = new ScriptingContainer(LocalContextScope.SINGLETHREAD);
Expand Down

0 comments on commit 2976e13

Please sign in to comment.