diff options
| author |   Tschaen, Brendan <ctschaen@att.com> | 2020-03-02 15:52:00 -0500 |
|---|---|---|
| committer | Tschaen, Brendan <ctschaen@att.com> | 2020-03-02 15:53:31 -0500 |
| commit | 14bd1b0fdf2f494b420623d1b5f7a7d966ec7ad9 (patch) | |
| tree | c3c402734d269d21db484612a8d36194bb09110c | |
| parent | 9399b2eed91169c719acd9a966b4c5ed560897a8 (diff) | |
Migrate servlet libraries
music-core does not need these libraries, only music-rest does.
Therefore, the dependencies should be in music-rest pom
Issue-ID: MUSIC-574
Signed-off-by: Tschaen, Brendan <ctschaen@att.com>
Change-Id: I4479bb158b7a1b498f4abb5ca52450ee2e5245bf
| -rwxr-xr-x | music-core/pom.xml | 57 | ||||
| -rwxr-xr-x | music-rest/pom.xml | 6 |
2 files changed, 8 insertions, 55 deletions
diff --git a/music-core/pom.xml b/music-core/pom.xml index 687ec743..cd1930ec 100755 --- a/music-core/pom.xml +++ b/music-core/pom.xml @@ -46,31 +46,6 @@ <java.version>1.8</java.version> <jaxrs.version>2.0.1</jaxrs.version> <cassandra.version>3.6.0</cassandra.version> - <!--nexus --> -<!-- - <nexusproxy>https://nexus.onap.org</nexusproxy> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> - <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath> - <releaseNexusPath>/content/repositories/releases/</releaseNexusPath> - <stagingNexusPath>/content/repositories/staging/</stagingNexusPath> - <sitePath>/content/sites/site/org/onap/music/${project.version}</sitePath> ---> - <!--maven --> -<!-- - <timestamp>${maven.build.timestamp}</timestamp> - <maven.build.timestamp.format>yyyy.MM.dd.HH.mm</maven.build.timestamp.format> ---> - <!--skip checkstyle --> -<!-- - <maven.check.skip>false</maven.check.skip> ---> - <!--docker --> -<!-- - <docker.tag>${project.version}-${timestamp}</docker.tag> - <docker.latest.tag>${project.version}-latest</docker.latest.tag> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> ---> </properties> <repositories> @@ -118,21 +93,8 @@ <testResource> <directory>${project.basedir}/src/test/resources</directory> </testResource> - <!-- <testResource> - <directory>${project.basedir}/src/main/resources</directory> - </testResource> --> </testResources> <plugins> -<!-- - <plugin> - <artifactId>maven-war-plugin</artifactId> - <version>2.4</version> - <configuration> - <warSourceDirectory>WebContent</warSourceDirectory> - <failOnMissingWebXml>false</failOnMissingWebXml> - </configuration> - </plugin> ---> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> @@ -154,8 +116,6 @@ </goals> <configuration> <excludes> - <!--<exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude>--> <exclude>**/Sample*</exclude> </excludes> </configuration> @@ -187,20 +147,6 @@ </build> <dependencies> - <!-- Development --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> - <scope>provided</scope> - </dependency> - <!-- /Development --> <!-- Logging --> <dependency> <groupId>ch.qos.logback</groupId> @@ -255,7 +201,8 @@ <groupId>com.datastax.cassandra</groupId> <artifactId>cassandra-driver-extras</artifactId> <version>${cassandra.version}</version> - </dependency> <!-- /Cassandra --> + </dependency> + <!-- /Cassandra --> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jcs-core</artifactId> diff --git a/music-rest/pom.xml b/music-rest/pom.xml index f949ae5c..9a5ad214 100755 --- a/music-rest/pom.xml +++ b/music-rest/pom.xml @@ -83,6 +83,12 @@ </dependencyManagement> <dependencies> + <!-- Development --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + </dependency> <!-- Springboot --> <dependency> <groupId>org.springframework.boot</groupId> |