diff options
| -rw-r--r-- | pom.xml | 8 | ||||
| -rw-r--r-- | pylog/pom.xml | 11 | ||||
| -rw-r--r-- | reference/logging-demo/pom.xml | 12 | ||||
| -rw-r--r-- | reference/logging-docker-root/pom.xml | 6 | ||||
| -rw-r--r-- | reference/logging-kubernetes/pom.xml | 6 | ||||
| -rw-r--r-- | reference/logging-library/.classpath | 15 | ||||
| -rw-r--r-- | reference/logging-library/pom.xml | 17 | ||||
| -rw-r--r-- | reference/logging-mock-service/.classpath | 21 | ||||
| -rw-r--r-- | reference/logging-mock-service/pom.xml | 13 | ||||
| -rw-r--r-- | reference/logging-slf4j-demo/pom.xml | 11 | ||||
| -rw-r--r-- | reference/logging-slf4j/pom.xml | 9 | ||||
| -rw-r--r-- | reference/pom.xml | 9 |
12 files changed, 104 insertions, 34 deletions
@@ -9,11 +9,15 @@ <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-analytics</artifactId> <packaging>pom</packaging> - <version>1.2.2</version> + <version>1.2.2-SNAPSHOT</version> <name>logging-analytics</name> <url>http://maven.apache.org</url> <modules> <module>reference</module> - <module>pylog</module> + <!-- temp 1 branch release at a time --> + <!-- module>pylog</module--> </modules> + <!-- + branches: root/reference/demo/ + --> </project> diff --git a/pylog/pom.xml b/pylog/pom.xml index e4518ed..83c8e04 100644 --- a/pylog/pom.xml +++ b/pylog/pom.xml @@ -14,13 +14,20 @@ <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"> - <parent> + <!-- parent> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-analytics</artifactId> <version>1.2.2-SNAPSHOT</version> - </parent> + </parent--> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.2.1</version> + </parent> + <groupId>org.onap.logging-analytics</groupId> <modelVersion>4.0.0</modelVersion> <artifactId>logging-pylog</artifactId> + <version>1.2.2-SNAPSHOT</version> <packaging>pom</packaging> <name>logging-pylog</name> <description>onap python logging library</description> diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml index 9d8ae1f..07d8ce6 100644 --- a/reference/logging-demo/pom.xml +++ b/reference/logging-demo/pom.xml @@ -11,8 +11,7 @@ <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> - <onap.version>1.2.2-SNAPSHOT</onap.version> + <logback.version>1.2.3</logback.version> </properties> <build> <plugins> @@ -21,7 +20,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.6</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -70,15 +68,15 @@ </pluginManagement> </build> <dependencies> - <dependency> + <!-- dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-library</artifactId> - <version>${onap.version}</version> - </dependency> + <version>1.2.2-SNAPSHOT</version> + </dependency--> <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-mock-service</artifactId> - <version>${onap.version}</version> + <version>1.2.2-SNAPSHOT</version> </dependency> diff --git a/reference/logging-docker-root/pom.xml b/reference/logging-docker-root/pom.xml index 42239a6..b045f4c 100644 --- a/reference/logging-docker-root/pom.xml +++ b/reference/logging-docker-root/pom.xml @@ -1,12 +1,14 @@ <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.logging-analytics</groupId> <artifactId>logging-docker-root</artifactId> + <version>1.2.2</version> <packaging>pom</packaging> <name>logging-docker-root</name> </project> diff --git a/reference/logging-kubernetes/pom.xml b/reference/logging-kubernetes/pom.xml index 1042811..d79d0db 100644 --- a/reference/logging-kubernetes/pom.xml +++ b/reference/logging-kubernetes/pom.xml @@ -1,12 +1,14 @@ <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.logging-analytics</groupId> <artifactId>logging-kubernetes</artifactId> + <version>1.2.2</version> <packaging>pom</packaging> <name>logging-kubernetes</name> </project> diff --git a/reference/logging-library/.classpath b/reference/logging-library/.classpath index 3304b94..7a80cdf 100644 --- a/reference/logging-library/.classpath +++ b/reference/logging-library/.classpath @@ -1,6 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" output="target/classes" path="src/main/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> @@ -9,7 +14,13 @@ </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"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> <classpathentry kind="output" path="target/classes"/> diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml index 547ff43..a54460d 100644 --- a/reference/logging-library/pom.xml +++ b/reference/logging-library/pom.xml @@ -1,19 +1,24 @@ <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--> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.2.1</version> + </parent> + <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-library</artifactId> + <version>1.2.2-SNAPSHOT</version> <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> + <logback.version>1.2.3</logback.version> </properties> <build> @@ -76,7 +81,7 @@ <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> - <version>${onap.version}</version> + <version>1.2.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/reference/logging-mock-service/.classpath b/reference/logging-mock-service/.classpath index 16bf974..f941705 100644 --- a/reference/logging-mock-service/.classpath +++ b/reference/logging-mock-service/.classpath @@ -1,9 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" output="target/classes" path="src/main/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </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"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry 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="output" path="target/classes"/> diff --git a/reference/logging-mock-service/pom.xml b/reference/logging-mock-service/pom.xml index f6264b1..88ee4fe 100644 --- a/reference/logging-mock-service/pom.xml +++ b/reference/logging-mock-service/pom.xml @@ -1,11 +1,18 @@ <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> <artifactId>logging-mock-service</artifactId> + <version>1.2.2-SNAPSHOT</version> <packaging>jar</packaging> <name>logging-mock-service</name> <build> @@ -64,10 +71,10 @@ <artifactId>logging-library</artifactId> <version>1.2.2-SNAPSHOT</version> </dependency> - <dependency> + <!-- dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> <version>1.2.2-SNAPSHOT</version> - </dependency> + </dependency--> </dependencies> </project> diff --git a/reference/logging-slf4j-demo/pom.xml b/reference/logging-slf4j-demo/pom.xml index 8565948..48d61db 100644 --- a/reference/logging-slf4j-demo/pom.xml +++ b/reference/logging-slf4j-demo/pom.xml @@ -1,12 +1,19 @@ <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> <relativePath>..</relativePath> - </parent> + </parent--> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.2.1</version> + </parent> + <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j-demo</artifactId> + <version>1.2.2-SNAPSHOT</version> <name>logging-slf4j-demo</name> <packaging>war</packaging> <properties> diff --git a/reference/logging-slf4j/pom.xml b/reference/logging-slf4j/pom.xml index 138f7de..f3bd500 100644 --- a/reference/logging-slf4j/pom.xml +++ b/reference/logging-slf4j/pom.xml @@ -1,12 +1,19 @@ <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> <relativePath>..</relativePath> + </parent--> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.2.1</version> </parent> + <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> + <version>1.2.2</version> <name>logging-slf4j</name> <packaging>jar</packaging> <dependencies> diff --git a/reference/pom.xml b/reference/pom.xml index 79daec0..7fcc241 100644 --- a/reference/pom.xml +++ b/reference/pom.xml @@ -6,18 +6,21 @@ <artifactId>logging-analytics</artifactId> <version>1.2.2-SNAPSHOT</version> </parent> + <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-reference</artifactId> <packaging>pom</packaging> + <version>1.2.2-SNAPSHOT</version> <name>logging-reference</name> <url>http://maven.apache.org</url> <modules> <module>logging-demo</module> <module>logging-library</module> <module>logging-mock-service</module> - <module>logging-docker-root</module> - <module>logging-kubernetes</module> + <!-- module>logging-docker-root</module> + <module>logging-kubernetes</module--> <module>logging-slf4j</module> - <module>logging-slf4j-demo</module> + <!-- one branch at a time --> + <!-- module>logging-slf4j-demo</module--> </modules> <build> <pluginManagement> |