Skip to content

Commit 35231d0

Browse files
Doha2012Eugen
Doha2012
authored and
Eugen
committed
cleanup parent dependencies (eugenp#1828)
* upgrade to spring boot 1.5.2 * add full update to REST API * modify ratings controller * upgrade herold * fix integration test * fix integration test * minor fix * fix integration test * fix integration test * minor cleanup * minor cleanup * remove log4j properties * use standard logbook.xml * remove log4j dependencies * remove commons-logging * merge * fix conflict * exclude commons-logging dependency * cleanup * minor fix * minor fix * fix dependency issues * Revert "fix dependency issues" This reverts commit 83bf1f9. * fix dependency issues * minor fix * minor fix * minor fix * cleanup generated files * fix commons-logging issue * add parent to pom * cleanup parent dependencies
1 parent 9fd2a91 commit 35231d0

File tree

129 files changed

+81
-3939
lines changed

Some content is hidden

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

129 files changed

+81
-3939
lines changed

‎JGit/pom.xml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,5 @@
4747
<artifactId>slf4j-simple</artifactId>
4848
<version>1.7.21</version>
4949
</dependency>
50-
<dependency>
51-
<groupId>junit</groupId>
52-
<artifactId>junit</artifactId>
53-
<version>4.12</version>
54-
<scope>test</scope>
55-
</dependency>
5650
</dependencies>
57-
<build>
58-
<plugins>
59-
<plugin>
60-
<groupId>org.apache.maven.plugins</groupId>
61-
<artifactId>maven-compiler-plugin</artifactId>
62-
<version>3.2</version>
63-
<configuration>
64-
<source>1.7</source>
65-
<target>1.7</target>
66-
</configuration>
67-
</plugin>
68-
</plugins>
69-
</build>
7051
</project>

‎Twitter4J/pom.xml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2020
<java.version>1.8</java.version>
21-
<maven.compiler.source>1.8</maven.compiler.source>
22-
<maven.compiler.target>1.8</maven.compiler.target>
2321
</properties>
2422

2523
<dependencies>
@@ -28,11 +26,6 @@
2826
<artifactId>twitter4j-stream</artifactId>
2927
<version>4.0.6</version>
3028
</dependency>
31-
<dependency>
32-
<groupId>junit</groupId>
33-
<artifactId>junit</artifactId>
34-
<version>4.12</version>
35-
</dependency>
3629
</dependencies>
3730

3831
<build>
@@ -46,7 +39,7 @@
4639
<plugin>
4740
<groupId>org.apache.maven.plugins</groupId>
4841
<artifactId>maven-surefire-plugin</artifactId>
49-
<version>2.19.1</version>
42+
<version>${maven-surefire-plugin.version}</version>
5043
<configuration>
5144
<excludes>
5245
<exclude>**/ApplicationTest.java</exclude>

‎algorithms/pom.xml‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<version>0.0.1-SNAPSHOT</version>
77

88
<properties>
9-
<junit.version>4.12</junit.version>
10-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
119
<exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
1210
<lombok.version>1.16.12</lombok.version>
1311
<commons-math3.version>3.6.1</commons-math3.version>
@@ -25,13 +23,7 @@
2523
<artifactId>commons-math3</artifactId>
2624
<version>${commons-math3.version}</version>
2725
</dependency>
28-
<dependency>
29-
<groupId>junit</groupId>
30-
<artifactId>junit</artifactId>
31-
<version>${junit.version}</version>
32-
<scope>test</scope>
33-
</dependency>
34-
<dependency>
26+
<dependency>
3527
<groupId>org.projectlombok</groupId>
3628
<artifactId>lombok</artifactId>
3729
<version>${lombok.version}</version>
@@ -47,31 +39,11 @@
4739
<build>
4840
<pluginManagement>
4941
<plugins>
50-
<plugin>
51-
<groupId>org.apache.maven.plugins</groupId>
52-
<artifactId>maven-compiler-plugin</artifactId>
53-
<version>${maven-compiler-plugin.version}</version>
54-
<configuration>
55-
<source>1.8</source>
56-
<target>1.8</target>
57-
</configuration>
58-
</plugin>
5942
<plugin>
6043
<groupId>org.codehaus.mojo</groupId>
6144
<artifactId>exec-maven-plugin</artifactId>
6245
<version>${exec-maven-plugin.version}</version>
6346
</plugin>
64-
65-
<plugin>
66-
<groupId>org.apache.maven.plugins</groupId>
67-
<artifactId>maven-surefire-plugin</artifactId>
68-
<configuration>
69-
<excludes>
70-
<exclude>**/*LongRunningUnitTest.java</exclude>
71-
<exclude>**/*IntegrationTest.java</exclude>
72-
</excludes>
73-
</configuration>
74-
</plugin>
7547
</plugins>
7648
</pluginManagement>
7749
</build>

‎apache-bval/pom.xml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,9 @@
2626
<artifactId>bval-extras</artifactId>
2727
<version>${bval.version}</version>
2828
</dependency>
29-
30-
<dependency>
31-
<groupId>junit</groupId>
32-
<artifactId>junit</artifactId>
33-
<version>${junit.version}</version>
34-
<scope>test</scope>
35-
</dependency>
3629
</dependencies>
3730

38-
<build>
39-
<plugins>
40-
<plugin>
41-
<groupId>org.apache.maven.plugins</groupId>
42-
<artifactId>maven-compiler-plugin</artifactId>
43-
<version>${maven-compiler-plugin.version}</version>
44-
<configuration>
45-
<source>1.8</source>
46-
<target>1.8</target>
47-
</configuration>
48-
</plugin>
49-
</plugins>
50-
</build>
5131
<properties>
52-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
53-
<junit.version>4.12</junit.version>
5432
<bval.version>1.1.2</bval.version>
5533
</properties>
5634
</project>

‎apache-cxf/pom.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,13 @@
2020
</modules>
2121

2222
<properties>
23-
<junit.version>4.12</junit.version>
24-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
2523
<exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
2624
</properties>
2725

28-
<dependencies>
29-
<dependency>
30-
<groupId>junit</groupId>
31-
<artifactId>junit</artifactId>
32-
<version>${junit.version}</version>
33-
<scope>test</scope>
34-
</dependency>
35-
</dependencies>
36-
3726
<build>
3827
<defaultGoal>install</defaultGoal>
3928
<pluginManagement>
4029
<plugins>
41-
<plugin>
42-
<groupId>org.apache.maven.plugins</groupId>
43-
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>${maven-compiler-plugin.version}</version>
45-
<configuration>
46-
<source>1.8</source>
47-
<target>1.8</target>
48-
</configuration>
49-
</plugin>
5030
<plugin>
5131
<groupId>org.codehaus.mojo</groupId>
5232
<artifactId>exec-maven-plugin</artifactId>

‎apache-fop/pom.xml‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@
1616
<dependencies>
1717

1818
<!-- logging -->
19-
20-
<dependency>
21-
<groupId>org.slf4j</groupId>
22-
<artifactId>slf4j-api</artifactId>
23-
<version>${org.slf4j.version}</version>
24-
</dependency>
25-
<dependency>
26-
<groupId>ch.qos.logback</groupId>
27-
<artifactId>logback-classic</artifactId>
28-
<version>${logback.version}</version>
29-
<!-- <scope>runtime</scope> -->
30-
</dependency>
3119
<dependency>
3220
<groupId>org.slf4j</groupId>
3321
<artifactId>jcl-over-slf4j</artifactId>
@@ -36,14 +24,6 @@
3624
</dependency>
3725

3826
<!-- test scoped -->
39-
40-
<dependency>
41-
<groupId>junit</groupId>
42-
<artifactId>junit</artifactId>
43-
<version>${junit.version}</version>
44-
<scope>test</scope>
45-
</dependency>
46-
4727
<dependency>
4828
<groupId>org.hamcrest</groupId>
4929
<artifactId>hamcrest-core</artifactId>
@@ -131,35 +111,6 @@
131111
<filtering>true</filtering>
132112
</resource>
133113
</resources>
134-
135-
<plugins>
136-
137-
<plugin>
138-
<groupId>org.apache.maven.plugins</groupId>
139-
<artifactId>maven-compiler-plugin</artifactId>
140-
<version>${maven-compiler-plugin.version}</version>
141-
<configuration>
142-
<source>1.7</source>
143-
<target>1.7</target>
144-
</configuration>
145-
</plugin>
146-
147-
<plugin>
148-
<groupId>org.apache.maven.plugins</groupId>
149-
<artifactId>maven-surefire-plugin</artifactId>
150-
<version>${maven-surefire-plugin.version}</version>
151-
<configuration>
152-
<forkCount>3</forkCount>
153-
<reuseForks>true</reuseForks>
154-
<excludes>
155-
<exclude>**/*IntegrationTest.java</exclude>
156-
<exclude>**/*LiveTest.java</exclude>
157-
</excludes>
158-
</configuration>
159-
</plugin>
160-
161-
</plugins>
162-
163114
</build>
164115

165116
<profiles>
@@ -203,19 +154,11 @@
203154
<avalon-framework.version>4.3</avalon-framework.version>
204155
<dbdoclet.version>8.0.2</dbdoclet.version>
205156
<jtidy.version>r938</jtidy.version>
206-
<!-- logging -->
207-
<org.slf4j.version>1.7.21</org.slf4j.version>
208-
<logback.version>1.1.7</logback.version>
209157

210158
<!-- testing -->
211159
<org.hamcrest.version>1.3</org.hamcrest.version>
212-
<junit.version>4.12</junit.version>
213160
<mockito.version>1.10.19</mockito.version>
214161

215-
<!-- maven plugins -->
216-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
217-
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
218-
219162
</properties>
220163

221164
</project>

‎apache-poi/pom.xml‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,11 @@
1212
</parent>
1313

1414
<properties>
15-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
16-
<junit.version>4.12</junit.version>
1715
<poi.version>3.15</poi.version>
18-
<jexcel.version>1.0.6</jexcel.version>
16+
<jexcel.version>1.0.6</jexcel.version>
1917
</properties>
2018

21-
<build>
22-
<plugins>
23-
<plugin>
24-
<groupId>org.apache.maven.plugins</groupId>
25-
<artifactId>maven-compiler-plugin</artifactId>
26-
<version>${maven-compiler-plugin.version}</version>
27-
<configuration>
28-
<source>1.8</source>
29-
<target>1.8</target>
30-
</configuration>
31-
</plugin>
32-
</plugins>
33-
</build>
34-
3519
<dependencies>
36-
<dependency>
37-
<groupId>junit</groupId>
38-
<artifactId>junit</artifactId>
39-
<version>${junit.version}</version>
40-
<scope>test</scope>
41-
</dependency>
4220
<dependency>
4321
<groupId>org.apache.poi</groupId>
4422
<artifactId>poi-ooxml</artifactId>

‎apache-solrj/pom.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,12 @@
1212
<artifactId>parent-modules</artifactId>
1313
<version>1.0.0-SNAPSHOT</version>
1414
</parent>
15-
16-
<properties>
17-
<junit.version>4.12</junit.version>
18-
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
19-
</properties>
2015

2116
<dependencies>
2217
<dependency>
2318
<groupId>org.apache.solr</groupId>
2419
<artifactId>solr-solrj</artifactId>
2520
<version>6.4.0</version>
2621
</dependency>
27-
<dependency>
28-
<groupId>junit</groupId>
29-
<artifactId>junit</artifactId>
30-
<version>${junit.version}</version>
31-
<scope>test</scope>
32-
</dependency>
3322
</dependencies>
34-
35-
<build>
36-
<plugins>
37-
<plugin>
38-
<artifactId>maven-compiler-plugin</artifactId>
39-
<version>2.3.2</version>
40-
</plugin>
41-
<plugin>
42-
<groupId>org.apache.maven.plugins</groupId>
43-
<artifactId>maven-surefire-plugin</artifactId>
44-
<version>${maven-surefire-plugin.version}</version>
45-
<configuration>
46-
<source>1.8</source>
47-
<target>1.8</target>
48-
<excludes>
49-
<exclude>**/*IntegrationTest.java</exclude>
50-
<exclude>**/*LiveTest.java</exclude>
51-
</excludes>
52-
</configuration>
53-
</plugin>
54-
</plugins>
55-
</build>
5623
</project>

‎apache-thrift/pom.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
<properties>
1616
<java.versin>1.8</java.versin>
17-
<junit.version>4.12</junit.version>
18-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
1917
<thrift.version>0.10.0</thrift.version>
2018
<maven-thrift.version>0.1.11</maven-thrift.version>
2119
</properties>
@@ -33,13 +31,6 @@
3331
</exclusions>
3432
</dependency>
3533

36-
<dependency>
37-
<groupId>junit</groupId>
38-
<artifactId>junit</artifactId>
39-
<version>${junit.version}</version>
40-
<scope>test</scope>
41-
</dependency>
42-
4334
<dependency>
4435
<groupId>org.slf4j</groupId>
4536
<artifactId>slf4j-simple</artifactId>
@@ -51,15 +42,6 @@
5142
<build>
5243
<defaultGoal>install</defaultGoal>
5344
<plugins>
54-
<plugin>
55-
<groupId>org.apache.maven.plugins</groupId>
56-
<artifactId>maven-compiler-plugin</artifactId>
57-
<version>${maven-compiler-plugin.version}</version>
58-
<configuration>
59-
<source>1.8</source>
60-
<target>1.8</target>
61-
</configuration>
62-
</plugin>
6345
<plugin>
6446
<groupId>org.codehaus.mojo</groupId>
6547
<artifactId>build-helper-maven-plugin</artifactId>

0 commit comments

Comments
 (0)