<parent>
<groupId>org.opendaylight.dlux</groupId>
<artifactId>dlux-parent</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.9.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>loader.implementation</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
+ <dependency>
+ <groupId>org.opendaylight.dlux</groupId>
+ <artifactId>dlux-web</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<dependency>
<groupId>org.opendaylight.dlux</groupId>
<artifactId>loader</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.3.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.opendaylight.dlux</groupId>
<artifactId>dlux.loader.resources</artifactId>
<version>${loader.resources.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<resources>
</configuration>
</plugin>
<!--Copy resources from the dlux-web/build dir-->
- <!--<plugin>
+ <plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${project.basedir}/src/main/resources/dlux</outputDirectory>
+ <outputDirectory>${project.basedir}/target/generated-resources/dlux</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/../../dlux-web/build/</directory>
<include>src/main.js</include>
<include>src/app/app.controller.js</include>
<include>src/app/app.module.js</include>
- <include>src/app/app.routingConfig.js</include>
+ <include>src/app/routingConfig.js</include>
+ <include>src/common/config/env.module.js</include>
<include>vendor/**</include>
<include>assets/**</include>
</includes>
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${project.basedir}/src/main/resources/index</outputDirectory>
+ <outputDirectory>${project.basedir}/target/generated-resources/index</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/../../dlux-web/build/</directory>
</configuration>
</execution>
</executions>
- </plugin>-->
- <plugin>
+ </plugin>
+ <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.6</version>
<executions>
- <!--loader Resources-->
<execution>
<id>unpack-loader-resources</id>
<goals>
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<instructions>
<Import-Package>org.osgi.framework,
org.opendaylight.dlux.loader,
- org.opendaylight.dlux.loader.implementation,
org.osgi.service.http,
javax.servlet,
javax.servlet.http,*
</instructions>
</configuration>
</plugin>
+ <!-- Disable offline link detection which breaks the build here -->
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
+ </plugin>
</plugins>
</build>
<scm>