diff options
| -rw-r--r-- | reference/logging-demo/pom.xml | 7 | ||||
| -rw-r--r-- | reference/logging-demo/src/test/java/org/onap/logging/demo/ApplicationServiceTest.java | 2 | ||||
| -rw-r--r-- | reference/logging-library/.classpath | 6 | ||||
| -rw-r--r-- | reference/logging-library/pom.xml | 86 | ||||
| -rw-r--r-- | reference/logging-library/src/main/java/org/onap/logging/library/LoggingAspect.java (renamed from reference/logging-demo/src/main/java/org/onap/demo/logging/LoggingAspect.java) | 4 |
5 files changed, 96 insertions, 9 deletions
diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml index 60fbe98..9d8ae1f 100644 --- a/reference/logging-demo/pom.xml +++ b/reference/logging-demo/pom.xml @@ -11,7 +11,8 @@ <properties> <jackson-2-version>2.5.1</jackson-2-version> <spring.version>4.3.6.RELEASE</spring.version> - <logback.version>1.2.3</logback.version> + <logback.version>1.2.3</logback.version> + <onap.version>1.2.2-SNAPSHOT</onap.version> </properties> <build> <plugins> @@ -72,12 +73,12 @@ <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-library</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>${onap.version}</version> </dependency> <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-mock-service</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>${onap.version}</version> </dependency> diff --git a/reference/logging-demo/src/test/java/org/onap/logging/demo/ApplicationServiceTest.java b/reference/logging-demo/src/test/java/org/onap/logging/demo/ApplicationServiceTest.java index a263a1f..1835fd9 100644 --- a/reference/logging-demo/src/test/java/org/onap/logging/demo/ApplicationServiceTest.java +++ b/reference/logging-demo/src/test/java/org/onap/logging/demo/ApplicationServiceTest.java @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; import org.junit.Test; import org.onap.demo.logging.test.JoinPointMock; import org.onap.demo.logging.ApplicationService; -import org.onap.demo.logging.LoggingAspect; +import org.onap.logging.library.LoggingAspect; import org.onap.demo.logging.RestApplication; import org.onap.demo.logging.RestHealthServiceImpl; import org.onap.demo.logging.RestServiceImpl; diff --git a/reference/logging-library/.classpath b/reference/logging-library/.classpath index 16bf974..3304b94 100644 --- a/reference/logging-library/.classpath +++ b/reference/logging-library/.classpath @@ -1,6 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> + <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"> <attributes> <attribute name="owner.project.facets" value="java"/> diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml index ed07037..547ff43 100644 --- a/reference/logging-library/pom.xml +++ b/reference/logging-library/pom.xml @@ -9,6 +9,13 @@ <artifactId>logging-library</artifactId> <packaging>jar</packaging> <name>logging-library</name> + + <properties> + <spring.version>4.3.6.RELEASE</spring.version> + <logback.version>1.2.3</logback.version> + <onap.version>1.2.2-SNAPSHOT</onap.version> + </properties> + <build> <plugins> <plugin> @@ -57,13 +64,86 @@ </plugins> </pluginManagement> </build> - <properties> - </properties> + <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-SNAPSHOT</version> + <version>${onap.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-oxm</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <!--scope>test</scope--> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aspects</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <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> </project> diff --git a/reference/logging-demo/src/main/java/org/onap/demo/logging/LoggingAspect.java b/reference/logging-library/src/main/java/org/onap/logging/library/LoggingAspect.java index 2901ce1..46b1fa7 100644 --- a/reference/logging-demo/src/main/java/org/onap/demo/logging/LoggingAspect.java +++ b/reference/logging-library/src/main/java/org/onap/logging/library/LoggingAspect.java @@ -18,9 +18,9 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.demo.logging; +package org.onap.logging.library; -import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.After; |