diff options
| author |   root <frank.obrien@amdocs.com> | 2018-10-09 13:48:18 -0400 |
|---|---|---|
| committer | root <frank.obrien@amdocs.com> | 2018-10-09 16:59:12 -0400 |
| commit | 3a8de37e721b1e3e8e3e8b1c11c7c65cd49a3e9b (patch) | |
| tree | 2aa0e1a0186bbdeb5d33eba63691df4bbd62c5af /reference/logging-library | |
| parent | d44588b1f5b26d5a0795f676ce4e4cc0e3a374d0 (diff) | |
prep poms for branching post release
Change-Id: I755a3a24521be12735929beca76dff16f9c5d043
Issue-ID: LOG-749
Signed-off-by: root <frank.obrien@amdocs.com>
Diffstat (limited to 'reference/logging-library')
| -rw-r--r-- | reference/logging-library/.classpath | 1 | ||||
| -rw-r--r-- | reference/logging-library/pom.xml | 76 |
2 files changed, 34 insertions, 43 deletions
diff --git a/reference/logging-library/.classpath b/reference/logging-library/.classpath index 0fcb38f..7a80cdf 100644 --- a/reference/logging-library/.classpath +++ b/reference/logging-library/.classpath @@ -9,6 +9,7 @@ <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> </attributes> </classpathentry> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml index 75671a1..67b980e 100644 --- a/reference/logging-library/pom.xml +++ b/reference/logging-library/pom.xml @@ -1,26 +1,17 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- parent> + <parent> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-reference</artifactId> - <version>1.2.2-SNAPSHOT</version> - </parent--> - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>1.2.1</version> - </parent> - <groupId>org.onap.logging-analytics</groupId> + <version>1.2.6-SNAPSHOT</version> + </parent> <artifactId>logging-library</artifactId> - <version>1.2.2</version> <packaging>jar</packaging> <name>logging-library</name> - - <properties> - <spring.version>4.3.6.RELEASE</spring.version> - <logback.version>1.2.3</logback.version> + <properties> + <spring.version>4.3.6.RELEASE</spring.version> + <logback.version>1.2.3</logback.version> </properties> - <build> <plugins> <plugin> @@ -71,19 +62,19 @@ </build> <dependencies> - <!-- decouple HttpServlet parameters from both this project and slf4j later --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.logging-analytics</groupId> - <artifactId>logging-slf4j</artifactId> - <version>1.2.2</version> - </dependency> - <dependency> + <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-slf4j</artifactId> + <version>1.2.6-SNAPSHOT</version> + </dependency> + <!-- decouple HttpServlet parameters from both this project and slf4j later --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> <version>${spring.version}</version> @@ -115,9 +106,9 @@ <!--scope>test</scope--> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aspects</artifactId> - <version>${spring.version}</version> + <groupId>org.springframework</groupId> + <artifactId>spring-aspects</artifactId> + <version>${spring.version}</version> </dependency> <dependency> <groupId>org.aspectj</groupId> @@ -139,16 +130,15 @@ <artifactId>spring-webmvc</artifactId> <version>${spring.version}</version> </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>${logback.version}</version> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> - </dependency> - - </dependencies> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>${logback.version}</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> + </dependency> + </dependencies> </project> |