diff options
Diffstat (limited to 'ecomp-sdk/epsdk-music')
-rw-r--r-- | ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4.1/core-2.4.4.1.jar | bin | 0 -> 22223316 bytes | |||
-rw-r--r-- | ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4/core-2.4.4.jar | bin | 132593 -> 0 bytes | |||
-rw-r--r-- | ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml | 6 | ||||
-rw-r--r-- | ecomp-sdk/epsdk-music/pom.xml | 78 |
4 files changed, 52 insertions, 32 deletions
diff --git a/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4.1/core-2.4.4.1.jar b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4.1/core-2.4.4.1.jar Binary files differnew file mode 100644 index 00000000..c87ed1c4 --- /dev/null +++ b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4.1/core-2.4.4.1.jar diff --git a/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4/core-2.4.4.jar b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4/core-2.4.4.jar Binary files differdeleted file mode 100644 index c2dd2dba..00000000 --- a/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4/core-2.4.4.jar +++ /dev/null diff --git a/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml index 01c2b2bf..9e953565 100644 --- a/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml +++ b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml @@ -3,10 +3,10 @@ <groupId>org.onap.music</groupId> <artifactId>core</artifactId> <versioning> - <release>2.4.4</release> + <release>2.4.4.1</release> <versions> - <version>2.4.4</version> + <version>2.4.4.1</version> </versions> - <lastUpdated>20180302203455</lastUpdated> + <lastUpdated>20180302703455</lastUpdated> </versioning> </metadata> diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml index 3b188176..2c2a7e1b 100644 --- a/ecomp-sdk/epsdk-music/pom.xml +++ b/ecomp-sdk/epsdk-music/pom.xml @@ -7,7 +7,7 @@ <artifactId>epsdk-project</artifactId> <version>2.2.0-SNAPSHOT</version> </parent> - + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-music</artifactId> <version>2.2.0-SNAPSHOT</version> @@ -18,7 +18,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <springframework.version>4.2.0.RELEASE</springframework.version> + <springframework.version>4.2.3.RELEASE</springframework.version> <jersey1.version>1.19.4</jersey1.version> <jaxrs.version>2.0.1</jaxrs.version> <cassandra.version>3.0.0</cassandra.version> @@ -108,35 +108,45 @@ <groupId>com.att.eelf</groupId> <artifactId>eelf-core</artifactId> <version>1.0.0</version> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Music --> <dependency> <groupId>org.onap.music</groupId> <artifactId>core</artifactId> - <version>2.4.4</version> - </dependency> - <dependency> + <version>2.4.4.1</version> + </dependency> + <!-- <dependency> <groupId>org.onap.music</groupId> <artifactId>dependency</artifactId> <version>2.4.4</version> - </dependency> + </dependency> --> <!-- Mapper --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.3</version> + <version>2.8.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.3</version> + <version>2.8.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.3</version> + <version>2.8.10</version> </dependency> <dependency> <groupId>org.springframework.session</groupId> @@ -148,6 +158,16 @@ <artifactId>json</artifactId> <version>20160212</version> </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>1.2.3</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.2.3</version> + </dependency> </dependencies> <profiles> <!-- disable doclint, a new feature in Java 8, when generating javadoc --> @@ -186,26 +206,26 @@ </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <archive> - <manifest> - </manifest> - </archive> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> - <executions> - <execution> - <id>make-assembly</id> <!-- this is used for inheritance merges --> - <phase>package</phase> <!-- bind to the packaging phase --> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <archive> + <manifest> + </manifest> + </archive> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + <executions> + <execution> + <id>make-assembly</id> <!-- this is used for inheritance merges --> + <phase>package</phase> <!-- bind to the packaging phase --> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> |