Skip to content

Commit a1e7be1

Browse files
author
eugenp
committed
formatting cleanup
1 parent 3bb91d5 commit a1e7be1

File tree

87 files changed

+6200
-6256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+6200
-6256
lines changed

‎apache-fop/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<groupId>org.slf4j</groupId>
2626
<artifactId>jcl-over-slf4j</artifactId>
2727
<version>${org.slf4j.version}</version>
28-
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
28+
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
2929
</dependency>
3030
<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
3131
<groupId>org.slf4j</groupId>

‎apache-fop/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
4-
xsi:schemaLocation="
2+
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
3+
xsi:schemaLocation="
54
http://java.sun.com/xml/ns/javaee
6-
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
7-
id="WebApp_ID" version="3.0">
5+
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
6+
>
87

9-
<display-name>Spring MVC Application</display-name>
8+
<display-name>Spring MVC Application</display-name>
109

11-
<!-- Spring root -->
12-
<context-param>
13-
<param-name>contextClass</param-name>
14-
<param-value>
10+
<!-- Spring root -->
11+
<context-param>
12+
<param-name>contextClass</param-name>
13+
<param-value>
1514
org.springframework.web.context.support.AnnotationConfigWebApplicationContext
1615
</param-value>
17-
</context-param>
18-
<context-param>
19-
<param-name>contextConfigLocation</param-name>
20-
<param-value>org.baeldung.config</param-value>
21-
</context-param>
16+
</context-param>
17+
<context-param>
18+
<param-name>contextConfigLocation</param-name>
19+
<param-value>org.baeldung.config</param-value>
20+
</context-param>
2221

23-
<listener>
24-
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
25-
</listener>
22+
<listener>
23+
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
24+
</listener>
2625

27-
<!-- Spring child -->
28-
<servlet>
29-
<servlet-name>api</servlet-name>
30-
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
31-
<load-on-startup>1</load-on-startup>
32-
</servlet>
33-
<servlet-mapping>
34-
<servlet-name>api</servlet-name>
35-
<url-pattern>/</url-pattern>
36-
</servlet-mapping>
26+
<!-- Spring child -->
27+
<servlet>
28+
<servlet-name>api</servlet-name>
29+
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
30+
<load-on-startup>1</load-on-startup>
31+
</servlet>
32+
<servlet-mapping>
33+
<servlet-name>api</servlet-name>
34+
<url-pattern>/</url-pattern>
35+
</servlet-mapping>
3736

38-
<welcome-file-list>
39-
<welcome-file />
40-
</welcome-file-list>
37+
<welcome-file-list>
38+
<welcome-file/>
39+
</welcome-file-list>
4140

4241
</web-app>

‎core-java-8/pom.xml‎

Lines changed: 116 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,118 @@
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>
4-
<groupId>org.baeldung</groupId>
5-
<artifactId>spring-rest</artifactId>
6-
<version>0.1-SNAPSHOT</version>
7-
8-
<name>spring-rest</name>
9-
10-
<dependencies>
11-
12-
<!-- utils -->
13-
14-
<dependency>
15-
<groupId>commons-io</groupId>
16-
<artifactId>commons-io</artifactId>
17-
<version>2.4</version>
18-
</dependency>
19-
20-
<dependency>
21-
<groupId>com.google.guava</groupId>
22-
<artifactId>guava</artifactId>
23-
<version>${guava.version}</version>
24-
</dependency>
25-
26-
<dependency>
27-
<groupId>org.apache.commons</groupId>
28-
<artifactId>commons-collections4</artifactId>
29-
<version>4.0</version>
30-
</dependency>
31-
32-
<dependency>
33-
<groupId>org.apache.commons</groupId>
34-
<artifactId>commons-lang3</artifactId>
35-
<version>3.3.2</version>
36-
</dependency>
37-
38-
<!-- test scoped -->
39-
40-
<dependency>
41-
<groupId>org.hamcrest</groupId>
42-
<artifactId>hamcrest-library</artifactId>
43-
<version>${org.hamcrest.version}</version>
44-
<scope>test</scope>
45-
</dependency>
46-
47-
<dependency>
48-
<groupId>junit</groupId>
49-
<artifactId>junit</artifactId>
50-
<version>${junit.version}</version>
51-
<scope>test</scope>
52-
</dependency>
53-
54-
<dependency>
55-
<groupId>org.mockito</groupId>
56-
<artifactId>mockito-core</artifactId>
57-
<version>${mockito.version}</version>
58-
<scope>test</scope>
59-
</dependency>
60-
61-
</dependencies>
62-
63-
<build>
64-
<finalName>core-java-8</finalName>
65-
<resources>
66-
<resource>
67-
<directory>src/main/resources</directory>
68-
<filtering>true</filtering>
69-
</resource>
70-
</resources>
71-
72-
<plugins>
73-
74-
<plugin>
75-
<groupId>org.apache.maven.plugins</groupId>
76-
<artifactId>maven-compiler-plugin</artifactId>
77-
<version>${maven-compiler-plugin.version}</version>
78-
<configuration>
79-
<source>1.8</source>
80-
<target>1.8</target>
81-
</configuration>
82-
</plugin>
83-
84-
<plugin>
85-
<groupId>org.apache.maven.plugins</groupId>
86-
<artifactId>maven-surefire-plugin</artifactId>
87-
<version>${maven-surefire-plugin.version}</version>
88-
</plugin>
89-
90-
</plugins>
91-
92-
</build>
93-
94-
<properties>
95-
<!-- logging -->
96-
<org.slf4j.version>1.7.12</org.slf4j.version>
97-
<logback.version>1.0.13</logback.version>
98-
99-
<!-- various -->
100-
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
101-
102-
<!-- util -->
103-
<guava.version>18.0</guava.version>
104-
<commons-lang3.version>3.4</commons-lang3.version>
105-
106-
<!-- testing -->
107-
<org.hamcrest.version>1.3</org.hamcrest.version>
108-
<junit.version>4.12</junit.version>
109-
<mockito.version>1.10.19</mockito.version>
110-
111-
<!-- maven plugins -->
112-
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
113-
<maven-war-plugin.version>2.6</maven-war-plugin.version>
114-
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
115-
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
116-
117-
</properties>
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>
3+
<groupId>org.baeldung</groupId>
4+
<artifactId>spring-rest</artifactId>
5+
<version>0.1-SNAPSHOT</version>
6+
7+
<name>spring-rest</name>
8+
9+
<dependencies>
10+
11+
<!-- utils -->
12+
13+
<dependency>
14+
<groupId>commons-io</groupId>
15+
<artifactId>commons-io</artifactId>
16+
<version>2.4</version>
17+
</dependency>
18+
19+
<dependency>
20+
<groupId>com.google.guava</groupId>
21+
<artifactId>guava</artifactId>
22+
<version>${guava.version}</version>
23+
</dependency>
24+
25+
<dependency>
26+
<groupId>org.apache.commons</groupId>
27+
<artifactId>commons-collections4</artifactId>
28+
<version>4.0</version>
29+
</dependency>
30+
31+
<dependency>
32+
<groupId>org.apache.commons</groupId>
33+
<artifactId>commons-lang3</artifactId>
34+
<version>3.3.2</version>
35+
</dependency>
36+
37+
<!-- test scoped -->
38+
39+
<dependency>
40+
<groupId>org.hamcrest</groupId>
41+
<artifactId>hamcrest-library</artifactId>
42+
<version>${org.hamcrest.version}</version>
43+
<scope>test</scope>
44+
</dependency>
45+
46+
<dependency>
47+
<groupId>junit</groupId>
48+
<artifactId>junit</artifactId>
49+
<version>${junit.version}</version>
50+
<scope>test</scope>
51+
</dependency>
52+
53+
<dependency>
54+
<groupId>org.mockito</groupId>
55+
<artifactId>mockito-core</artifactId>
56+
<version>${mockito.version}</version>
57+
<scope>test</scope>
58+
</dependency>
59+
60+
</dependencies>
61+
62+
<build>
63+
<finalName>core-java-8</finalName>
64+
<resources>
65+
<resource>
66+
<directory>src/main/resources</directory>
67+
<filtering>true</filtering>
68+
</resource>
69+
</resources>
70+
71+
<plugins>
72+
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-compiler-plugin</artifactId>
76+
<version>${maven-compiler-plugin.version}</version>
77+
<configuration>
78+
<source>1.8</source>
79+
<target>1.8</target>
80+
</configuration>
81+
</plugin>
82+
83+
<plugin>
84+
<groupId>org.apache.maven.plugins</groupId>
85+
<artifactId>maven-surefire-plugin</artifactId>
86+
<version>${maven-surefire-plugin.version}</version>
87+
</plugin>
88+
89+
</plugins>
90+
91+
</build>
92+
93+
<properties>
94+
<!-- logging -->
95+
<org.slf4j.version>1.7.12</org.slf4j.version>
96+
<logback.version>1.0.13</logback.version>
97+
98+
<!-- various -->
99+
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
100+
101+
<!-- util -->
102+
<guava.version>18.0</guava.version>
103+
<commons-lang3.version>3.4</commons-lang3.version>
104+
105+
<!-- testing -->
106+
<org.hamcrest.version>1.3</org.hamcrest.version>
107+
<junit.version>4.12</junit.version>
108+
<mockito.version>1.10.19</mockito.version>
109+
110+
<!-- maven plugins -->
111+
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
112+
<maven-war-plugin.version>2.6</maven-war-plugin.version>
113+
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
114+
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
115+
116+
</properties>
118117

119118
</project>

0 commit comments

Comments
 (0)