Skip to content

Commit 84c4fbb

Browse files
author
Matthew Gilliard
authored
Merge pull request #147 from Fork-World/feature/module-maintenance
pom.xml files - refactoring
2 parents e2cbfe3 + 7b977ee commit 84c4fbb

13 files changed

Lines changed: 285 additions & 227 deletions

File tree

‎api/pom.xml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,13 @@
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<properties>
13-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
</properties>
15-
1612
<artifactId>api</artifactId>
1713

1814
<build>
1915
<plugins>
2016
<plugin>
2117
<groupId>org.apache.maven.plugins</groupId>
2218
<artifactId>maven-javadoc-plugin</artifactId>
23-
<version>3.0.0-M1</version>
2419
<executions>
2520
<execution>
2621
<id>attach-javadocs</id>
@@ -33,7 +28,6 @@
3328
<plugin>
3429
<groupId>org.netbeans.tools</groupId>
3530
<artifactId>sigtest-maven-plugin</artifactId>
36-
<version>1.0</version>
3731
<executions>
3832
<execution>
3933
<goals>
@@ -49,12 +43,4 @@
4943
</plugin>
5044
</plugins>
5145
</build>
52-
<dependencies>
53-
<dependency>
54-
<groupId>junit</groupId>
55-
<artifactId>junit</artifactId>
56-
<version>4.12</version>
57-
<scope>test</scope>
58-
</dependency>
59-
</dependencies>
6046
</project>

‎build-image/pom.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
11+
1012
<fnproject.version>1.0.0-SNAPSHOT</fnproject.version>
1113
<fn.repo.url>http://172.17.0.1:18080</fn.repo.url>
1214
</properties>
@@ -47,7 +49,7 @@
4749
<plugin>
4850
<groupId>org.apache.maven.plugins</groupId>
4951
<artifactId>maven-compiler-plugin</artifactId>
50-
<version>3.3</version>
52+
<version>3.8.0</version>
5153
<configuration>
5254
<source>1.8</source>
5355
<target>1.8</target>

‎examples/async-thumbnails/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
<properties>
88
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
10+
911
<fnproject.version>1.0.0-SNAPSHOT</fnproject.version>
1012
<mockito.version>2.8.47</mockito.version>
1113
</properties>

‎examples/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
<version>1.0.0-SNAPSHOT</version>
1414
</parent>
1515

16-
<properties>
17-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18-
</properties>
19-
2016
<modules>
2117
<module>string-reverse</module>
2218
<module>regex-query</module>
@@ -31,7 +27,6 @@
3127
<plugin>
3228
<groupId>org.apache.maven.plugins</groupId>
3329
<artifactId>maven-deploy-plugin</artifactId>
34-
<version>2.8.2</version>
3530
<configuration>
3631
<skip>true</skip>
3732
</configuration>

‎examples/regex-query/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
<properties>
88
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
10+
911
<fnproject.version>1.0.0-SNAPSHOT</fnproject.version>
1012
<jackson.version>2.9.6</jackson.version>
1113
</properties>

‎examples/string-reverse/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
11+
1012
</properties>
1113

1214
<groupId>com.fnproject.fn.examples</groupId>

‎fn-spring-cloud-function/pom.xml‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@
1212
<artifactId>fn-spring-cloud-function</artifactId>
1313

1414
<properties>
15-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<spring.cloud.function.version>1.0.0.M6</spring.cloud.function.version>
15+
<spring.cloud.function.version>1.0.0.RELEASE</spring.cloud.function.version>
1716
</properties>
1817

1918
<dependencies>
2019

2120
<dependency>
2221
<groupId>com.fnproject.fn</groupId>
2322
<artifactId>api</artifactId>
24-
<version>${project.version}</version>
2523
</dependency>
2624

2725
<dependency>
@@ -33,60 +31,52 @@
3331
<dependency>
3432
<groupId>io.projectreactor</groupId>
3533
<artifactId>reactor-core</artifactId>
36-
<version>3.0.7.RELEASE</version>
34+
<version>3.2.0.M3</version>
3735
</dependency>
3836

3937
<dependency>
4038
<groupId>net.jodah</groupId>
4139
<artifactId>typetools</artifactId>
42-
<version>0.5.0</version>
4340
</dependency>
4441

4542
<dependency>
4643
<groupId>com.fnproject.fn</groupId>
4744
<artifactId>testing-core</artifactId>
48-
<version>${project.version}</version>
4945
<scope>test</scope>
5046
</dependency>
5147
<dependency>
5248
<groupId>com.fnproject.fn</groupId>
5349
<artifactId>testing-junit4</artifactId>
54-
<version>${project.version}</version>
5550
<scope>test</scope>
5651
</dependency>
57-
5852
<dependency>
5953
<groupId>org.mockito</groupId>
6054
<artifactId>mockito-core</artifactId>
61-
<version>${mockito.version}</version>
6255
<scope>test</scope>
6356
</dependency>
6457

6558
<dependency>
6659
<groupId>org.assertj</groupId>
6760
<artifactId>assertj-core</artifactId>
68-
<version>${assertj-core.version}</version>
6961
<scope>test</scope>
7062
</dependency>
7163

7264
<dependency>
7365
<groupId>junit</groupId>
7466
<artifactId>junit</artifactId>
75-
<version>${junit.version}</version>
7667
<scope>test</scope>
7768
</dependency>
7869

7970
<dependency>
8071
<groupId>commons-logging</groupId>
8172
<artifactId>commons-logging</artifactId>
82-
<version>1.1.1</version>
8373
<scope>test</scope>
8474
</dependency>
8575

8676
<dependency>
8777
<groupId>com.github.stefanbirkner</groupId>
8878
<artifactId>system-rules</artifactId>
89-
<version>1.16.0</version>
79+
<version>1.18.0</version>
9080
<scope>test</scope>
9181
</dependency>
9282

0 commit comments

Comments
 (0)