Solving cyclic dependency by removing the launcher.http's dependency on emul-rt.jar
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Sat, 06 Dec 2014 11:11:45 +0100
changeset 174540d676c86a87
parent 1744 61179c5e56fe
child 1746 001275142bf7
Solving cyclic dependency by removing the launcher.http's dependency on emul-rt.jar
launcher/http/pom.xml
rt/aot-nb-test/pom.xml
rt/emul/brwsrtest/pom.xml
rt/emul/compacttest/pom.xml
     1.1 --- a/launcher/http/pom.xml	Sat Dec 06 09:25:22 2014 +0100
     1.2 +++ b/launcher/http/pom.xml	Sat Dec 06 11:11:45 2014 +0100
     1.3 @@ -68,12 +68,6 @@
     1.4        <scope>test</scope>
     1.5      </dependency>
     1.6      <dependency>
     1.7 -      <groupId>${project.groupId}</groupId>
     1.8 -      <artifactId>emul</artifactId>
     1.9 -      <version>${project.version}</version>
    1.10 -      <classifier>rt</classifier>
    1.11 -    </dependency>
    1.12 -    <dependency>
    1.13        <groupId>org.apidesign.bck2brwsr</groupId>
    1.14        <artifactId>aot</artifactId>
    1.15        <version>1.0-SNAPSHOT</version>
     2.1 --- a/rt/aot-nb-test/pom.xml	Sat Dec 06 09:25:22 2014 +0100
     2.2 +++ b/rt/aot-nb-test/pom.xml	Sat Dec 06 11:11:45 2014 +0100
     2.3 @@ -37,6 +37,13 @@
     2.4              <scope>test</scope>
     2.5          </dependency>
     2.6          <dependency>
     2.7 +            <groupId>${project.groupId}</groupId>
     2.8 +            <artifactId>emul</artifactId>
     2.9 +            <classifier>rt</classifier>
    2.10 +            <version>${project.version}</version>
    2.11 +            <scope>test</scope>
    2.12 +        </dependency>
    2.13 +        <dependency>
    2.14              <groupId>org.netbeans.api</groupId>
    2.15              <artifactId>org-openide-util-lookup</artifactId>
    2.16          </dependency>
     3.1 --- a/rt/emul/brwsrtest/pom.xml	Sat Dec 06 09:25:22 2014 +0100
     3.2 +++ b/rt/emul/brwsrtest/pom.xml	Sat Dec 06 11:11:45 2014 +0100
     3.3 @@ -51,6 +51,7 @@
     3.4      <dependency>
     3.5        <groupId>${project.groupId}</groupId>
     3.6        <artifactId>emul</artifactId>
     3.7 +      <classifier>rt</classifier>
     3.8        <version>${project.version}</version>
     3.9        <scope>test</scope>
    3.10      </dependency>
     4.1 --- a/rt/emul/compacttest/pom.xml	Sat Dec 06 09:25:22 2014 +0100
     4.2 +++ b/rt/emul/compacttest/pom.xml	Sat Dec 06 11:11:45 2014 +0100
     4.3 @@ -26,12 +26,13 @@
     4.4              <artifactId>launcher.http</artifactId>
     4.5              <version>${project.version}</version>
     4.6              <scope>test</scope>
     4.7 -            <exclusions>
     4.8 -                <exclusion>
     4.9 -                    <groupId>com.oracle</groupId>
    4.10 -                    <artifactId>javafx</artifactId>
    4.11 -                </exclusion>
    4.12 -            </exclusions>
    4.13 +        </dependency>
    4.14 +        <dependency>
    4.15 +            <groupId>${project.groupId}</groupId>
    4.16 +            <artifactId>emul</artifactId>
    4.17 +            <classifier>rt</classifier>
    4.18 +            <version>${project.version}</version>
    4.19 +            <scope>test</scope>
    4.20          </dependency>
    4.21          <dependency>
    4.22              <groupId>org.netbeans.api</groupId>