Skip to content

Commit c0c77d6

Browse files
ChristophEichhornChristophEichhorn
committed
Format XML files
Change-Id: I4936c9c0a7a952951298eac9e5d3f32eafd99478
1 parent de4453f commit c0c77d6

File tree

10 files changed

+695
-699
lines changed

10 files changed

+695
-699
lines changed

‎cf-java-logging-support-core/pom.xml

Lines changed: 118 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,123 @@
1-
<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">
2-
<modelVersion>4.0.0</modelVersion>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
34

4-
<artifactId>cf-java-logging-support-core</artifactId>
5-
<packaging>jar</packaging>
5+
<artifactId>cf-java-logging-support-core</artifactId>
6+
<packaging>jar</packaging>
67

7-
<name>cf-java-logging-support-core</name>
8+
<name>cf-java-logging-support-core</name>
89

9-
<dependencies>
10-
<dependency>
11-
<groupId>com.fasterxml.jackson.jr</groupId>
12-
<artifactId>jackson-jr-objects</artifactId>
13-
<version>${jackson-jr.version}</version>
14-
</dependency>
10+
<dependencies>
11+
<dependency>
12+
<groupId>com.fasterxml.jackson.jr</groupId>
13+
<artifactId>jackson-jr-objects</artifactId>
14+
<version>${jackson-jr.version}</version>
15+
</dependency>
1516

16-
<!-- this is only used to avoid error messages during tests !!! -->
17-
<dependency>
18-
<groupId>ch.qos.logback</groupId>
19-
<artifactId>logback-classic</artifactId>
20-
<version>${logback.version}</version>
21-
<scope>test</scope>
22-
</dependency>
23-
</dependencies>
24-
<parent>
25-
<groupId>com.sap.hcp.cf.logging</groupId>
26-
<artifactId>cf-java-logging-support-parent</artifactId>
27-
<version>2.1.0-SNAPSHOT</version>
28-
<relativePath>../pom.xml</relativePath>
29-
</parent>
30-
<profiles>
31-
<profile>
32-
<id>generate</id>
33-
<build>
34-
<plugins>
35-
<plugin>
36-
<groupId>org.codehaus.mojo</groupId>
37-
<artifactId>exec-maven-plugin</artifactId>
38-
<version>${exec.plugin.version}</version>
39-
<executions>
40-
<execution>
41-
<id>request-metrics-doc</id>
42-
<phase>validate</phase>
43-
<goals>
44-
<goal>exec</goal>
45-
</goals>
46-
<configuration>
47-
<executable>python</executable>
48-
<arguments>
49-
<argument>${basedir}/beats/scripts/generate_fields_docs.py</argument>
50-
<argument>${basedir}/beats/request-metrics</argument>
51-
<argument>request-metrics</argument>
52-
</arguments>
53-
</configuration>
54-
</execution>
55-
<execution>
56-
<id>request-metrics-template</id>
57-
<phase>validate</phase>
58-
<goals>
59-
<goal>exec</goal>
60-
</goals>
61-
<configuration>
62-
<executable>python</executable>
63-
<arguments>
64-
<argument>${basedir}/beats/scripts/generate_template.py</argument>
65-
<argument>${basedir}/beats/request-metrics</argument>
66-
<argument>request-metrics</argument>
67-
</arguments>
68-
</configuration>
69-
</execution>
70-
<execution>
71-
<id>app-logs-doc</id>
72-
<phase>validate</phase>
73-
<goals>
74-
<goal>exec</goal>
75-
</goals>
76-
<configuration>
77-
<executable>python</executable>
78-
<arguments>
79-
<argument>${basedir}/beats/scripts/generate_fields_docs.py</argument>
80-
<argument>${basedir}/beats/app-logs</argument>
81-
<argument>app-logs</argument>
82-
</arguments>
83-
</configuration>
84-
</execution>
85-
<execution>
86-
<id>app-logs-template</id>
87-
<phase>validate</phase>
88-
<goals>
89-
<goal>exec</goal>
90-
</goals>
91-
<configuration>
92-
<executable>python</executable>
93-
<arguments>
94-
<argument>${basedir}/beats/scripts/generate_template.py</argument>
95-
<argument>${basedir}/beats/app-logs</argument>
96-
<argument>app-logs</argument>
97-
</arguments>
98-
</configuration>
99-
</execution>
100-
<execution>
101-
<id>core-fields</id>
102-
<phase>validate</phase>
103-
<goals>
104-
<goal>exec</goal>
105-
</goals>
106-
<configuration>
107-
<executable>ruby</executable>
108-
<outputFile>${basedir}/src/main/java/com/sap/hcp/cf/logging/common/Fields.java</outputFile>
109-
<arguments>
110-
<argument>${basedir}/beats/scripts/gen_java_fields.rb</argument>
111-
<argument>${basedir}/beats/app-logs/etc/fields.yml</argument>
112-
<argument>${basedir}/beats/request-metrics/etc/fields.yml</argument>
113-
</arguments>
114-
</configuration>
115-
</execution>
116-
</executions>
117-
</plugin>
118-
</plugins>
119-
</build>
120-
</profile>
121-
</profiles>
17+
<!-- this is only used to avoid error messages during tests !!! -->
18+
<dependency>
19+
<groupId>ch.qos.logback</groupId>
20+
<artifactId>logback-classic</artifactId>
21+
<version>${logback.version}</version>
22+
<scope>test</scope>
23+
</dependency>
24+
</dependencies>
25+
<parent>
26+
<groupId>com.sap.hcp.cf.logging</groupId>
27+
<artifactId>cf-java-logging-support-parent</artifactId>
28+
<version>2.1.0-SNAPSHOT</version>
29+
<relativePath>../pom.xml</relativePath>
30+
</parent>
31+
<profiles>
32+
<profile>
33+
<id>generate</id>
34+
<build>
35+
<plugins>
36+
<plugin>
37+
<groupId>org.codehaus.mojo</groupId>
38+
<artifactId>exec-maven-plugin</artifactId>
39+
<version>${exec.plugin.version}</version>
40+
<executions>
41+
<execution>
42+
<id>request-metrics-doc</id>
43+
<phase>validate</phase>
44+
<goals>
45+
<goal>exec</goal>
46+
</goals>
47+
<configuration>
48+
<executable>python</executable>
49+
<arguments>
50+
<argument>${basedir}/beats/scripts/generate_fields_docs.py</argument>
51+
<argument>${basedir}/beats/request-metrics</argument>
52+
<argument>request-metrics</argument>
53+
</arguments>
54+
</configuration>
55+
</execution>
56+
<execution>
57+
<id>request-metrics-template</id>
58+
<phase>validate</phase>
59+
<goals>
60+
<goal>exec</goal>
61+
</goals>
62+
<configuration>
63+
<executable>python</executable>
64+
<arguments>
65+
<argument>${basedir}/beats/scripts/generate_template.py</argument>
66+
<argument>${basedir}/beats/request-metrics</argument>
67+
<argument>request-metrics</argument>
68+
</arguments>
69+
</configuration>
70+
</execution>
71+
<execution>
72+
<id>app-logs-doc</id>
73+
<phase>validate</phase>
74+
<goals>
75+
<goal>exec</goal>
76+
</goals>
77+
<configuration>
78+
<executable>python</executable>
79+
<arguments>
80+
<argument>${basedir}/beats/scripts/generate_fields_docs.py</argument>
81+
<argument>${basedir}/beats/app-logs</argument>
82+
<argument>app-logs</argument>
83+
</arguments>
84+
</configuration>
85+
</execution>
86+
<execution>
87+
<id>app-logs-template</id>
88+
<phase>validate</phase>
89+
<goals>
90+
<goal>exec</goal>
91+
</goals>
92+
<configuration>
93+
<executable>python</executable>
94+
<arguments>
95+
<argument>${basedir}/beats/scripts/generate_template.py</argument>
96+
<argument>${basedir}/beats/app-logs</argument>
97+
<argument>app-logs</argument>
98+
</arguments>
99+
</configuration>
100+
</execution>
101+
<execution>
102+
<id>core-fields</id>
103+
<phase>validate</phase>
104+
<goals>
105+
<goal>exec</goal>
106+
</goals>
107+
<configuration>
108+
<executable>ruby</executable>
109+
<outputFile>${basedir}/src/main/java/com/sap/hcp/cf/logging/common/Fields.java</outputFile>
110+
<arguments>
111+
<argument>${basedir}/beats/scripts/gen_java_fields.rb</argument>
112+
<argument>${basedir}/beats/app-logs/etc/fields.yml</argument>
113+
<argument>${basedir}/beats/request-metrics/etc/fields.yml</argument>
114+
</arguments>
115+
</configuration>
116+
</execution>
117+
</executions>
118+
</plugin>
119+
</plugins>
120+
</build>
121+
</profile>
122+
</profiles>
122123
</project>

‎cf-java-logging-support-jersey/pom.xml

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<artifactId>cf-java-logging-support-jersey</artifactId>
6-
<packaging>jar</packaging>
5+
<artifactId>cf-java-logging-support-jersey</artifactId>
6+
<packaging>jar</packaging>
77

8-
<parent>
9-
<relativePath>../pom.xml</relativePath>
10-
<groupId>com.sap.hcp.cf.logging</groupId>
11-
<artifactId>cf-java-logging-support-parent</artifactId>
12-
<version>2.1.0-SNAPSHOT</version>
13-
</parent>
8+
<parent>
9+
<relativePath>../pom.xml</relativePath>
10+
<groupId>com.sap.hcp.cf.logging</groupId>
11+
<artifactId>cf-java-logging-support-parent</artifactId>
12+
<version>2.1.0-SNAPSHOT</version>
13+
</parent>
1414

15-
<name>cf-java-logging-support-jersey</name>
15+
<name>cf-java-logging-support-jersey</name>
1616

17-
<properties>
18-
<jersey.version>2.22.1</jersey.version>
19-
</properties>
17+
<properties>
18+
<jersey.version>2.22.1</jersey.version>
19+
</properties>
2020

21-
<dependencies>
22-
<!-- Jersey - RESTful Web service -->
23-
<dependency>
24-
<groupId>org.glassfish.jersey.core</groupId>
25-
<artifactId>jersey-client</artifactId>
26-
<version>${jersey.version}</version>
27-
<scope>provided</scope>
28-
</dependency>
21+
<dependencies>
22+
<!-- Jersey - RESTful Web service -->
23+
<dependency>
24+
<groupId>org.glassfish.jersey.core</groupId>
25+
<artifactId>jersey-client</artifactId>
26+
<version>${jersey.version}</version>
27+
<scope>provided</scope>
28+
</dependency>
2929

30-
<dependency>
31-
<groupId>org.glassfish.jersey.core</groupId>
32-
<artifactId>jersey-server</artifactId>
33-
<version>${jersey.version}</version>
34-
<scope>provided</scope>
35-
</dependency>
30+
<dependency>
31+
<groupId>org.glassfish.jersey.core</groupId>
32+
<artifactId>jersey-server</artifactId>
33+
<version>${jersey.version}</version>
34+
<scope>provided</scope>
35+
</dependency>
3636

37-
<dependency>
38-
<groupId>com.sap.hcp.cf.logging</groupId>
39-
<artifactId>cf-java-logging-support-core</artifactId>
40-
<version>${project.version}</version>
41-
<scope>compile</scope>
42-
</dependency>
37+
<dependency>
38+
<groupId>com.sap.hcp.cf.logging</groupId>
39+
<artifactId>cf-java-logging-support-core</artifactId>
40+
<version>${project.version}</version>
41+
<scope>compile</scope>
42+
</dependency>
4343

44-
<!-- unit test related -->
45-
<dependency>
46-
<groupId>org.glassfish.jersey.test-framework</groupId>
47-
<artifactId>jersey-test-framework-core</artifactId>
48-
<version>${jersey.version}</version>
49-
<scope>test</scope>
50-
</dependency>
44+
<!-- unit test related -->
45+
<dependency>
46+
<groupId>org.glassfish.jersey.test-framework</groupId>
47+
<artifactId>jersey-test-framework-core</artifactId>
48+
<version>${jersey.version}</version>
49+
<scope>test</scope>
50+
</dependency>
5151

52-
<dependency>
53-
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
54-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
55-
<version>${jersey.version}</version>
56-
<scope>test</scope>
57-
</dependency>
58-
<!-- we need our log4j2 implementation for testing! -->
59-
<dependency>
60-
<groupId>com.sap.hcp.cf.logging</groupId>
61-
<artifactId>cf-java-logging-support-log4j2</artifactId>
62-
<version>${project.version}</version>
63-
<scope>test</scope>
64-
</dependency>
65-
<dependency>
66-
<groupId>org.apache.logging.log4j</groupId>
67-
<artifactId>log4j-slf4j-impl</artifactId>
68-
<version>${log4j2.version}</version>
69-
<scope>test</scope>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.apache.logging.log4j</groupId>
73-
<artifactId>log4j-core</artifactId>
74-
<version>${log4j2.version}</version>
75-
<scope>test</scope>
76-
</dependency>
77-
</dependencies>
52+
<dependency>
53+
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
54+
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
55+
<version>${jersey.version}</version>
56+
<scope>test</scope>
57+
</dependency>
58+
<!-- we need our log4j2 implementation for testing! -->
59+
<dependency>
60+
<groupId>com.sap.hcp.cf.logging</groupId>
61+
<artifactId>cf-java-logging-support-log4j2</artifactId>
62+
<version>${project.version}</version>
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.apache.logging.log4j</groupId>
67+
<artifactId>log4j-slf4j-impl</artifactId>
68+
<version>${log4j2.version}</version>
69+
<scope>test</scope>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.apache.logging.log4j</groupId>
73+
<artifactId>log4j-core</artifactId>
74+
<version>${log4j2.version}</version>
75+
<scope>test</scope>
76+
</dependency>
77+
</dependencies>
7878
</project>

0 commit comments

Comments
 (0)