Skip to content

Commit d06b6c5

Browse files
andreacastelloandreacastello
authored
Merge pull request #25 from WURFL/2.1.8
2.1.8
2 parents cdc62dd + 45e820e commit d06b6c5

File tree

4 files changed

+65
-21
lines changed

4 files changed

+65
-21
lines changed

‎README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ Minimum Java version compatibility table
1818

1919
| | Min. Java version | WM client version(s) |
2020
|---|--------------|----------------------|
21-
| | 8 | 2.1.3 and above |
21+
| | 11 | 2.1.8 and above |
22+
| | 8 | 2.1.3 |
2223
| | 7 | 2.1.0 |
2324
| | 6 | 2.0.0 |
2425

26+
Version 2.1.7 (Java 8) and 2.1.3 (Java 11) only differ in their dependencies and Maven Central deployment (see CHANGELOG)
2527
Version 2.1.2 (Java 7) and 2.1.3 (Java 8) only differ in their dependencies (see CHANGELOG)
2628

2729
### Compiling the client and the example project
@@ -262,4 +264,4 @@ Code coverage report can be found under `target/site/jacoco/index.html`
262264

263265
```bash
264266
mvn clean verify -Pcoverage
265-
```
267+
```

‎example/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.scientiamobile.wurfl</groupId>
88
<artifactId>wmclient-example</artifactId>
9-
<version>2.1.7</version>
9+
<version>2.1.8</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.scientiamobile.wurflmicroservice</groupId>
4444
<artifactId>wurfl-microservice</artifactId>
45-
<version>2.1.7</version>
45+
<version>2.1.8</version>
4646
</dependency>
4747

4848
</dependencies>
@@ -53,10 +53,9 @@
5353
<plugin>
5454
<groupId>org.apache.maven.plugins</groupId>
5555
<artifactId>maven-compiler-plugin</artifactId>
56-
<version>2.0.2</version>
56+
<version>3.13.0</version>
5757
<configuration>
58-
<source>1.8</source>
59-
<target>1.8</target>
58+
<release>11</release>
6059
</configuration>
6160
</plugin>
6261
<plugin>

‎wmclient/CHANGELOG.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2.1.8
2+
-------------------------------------
3+
- Required Java minimum version is now 11
4+
- Updated dependencies
5+
- From this version pom.xml configuration only allows deployment on Maven via central portal plugin
6+
17
2.1.7
28
-------------------------------------
39
IMPORTANT: dependency commons-collections has been replaced with commons-collections4 (v4.4) to fix known vulnerability

‎wmclient/pom.xml

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,21 @@
66
<!-- Your artifact -->
77
<groupId>com.scientiamobile.wurflmicroservice</groupId>
88
<artifactId>wurfl-microservice</artifactId>
9-
<version>2.1.7</version>
9+
<version>2.1.8</version>
1010
<packaging>jar</packaging>
1111

12+
<properties>
13+
<!-- tells plugins (compilers, resources, etc.) to use UTF-8 -->
14+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
</properties>
16+
17+
<scm>
18+
<connection>scm:git:git://github.com/WURFL/wurfl-microservice-client-java.git</connection>
19+
<developerConnection>scm:git:ssh://github.com:WURFL/wurfl-microservice-client-java.git</developerConnection>
20+
<url>https://github.com/WURFL/wurfl-microservice-client-java/tree/master</url>
21+
</scm>
22+
23+
1224
<name>wurfl-microservice</name>
1325
<url>https://github.com/WURFL/wurfl-microservice-client-java</url>
1426
<description>Wurfl microservice java client API</description>
@@ -46,15 +58,15 @@
4658
<dependency>
4759
<groupId>com.google.code.gson</groupId>
4860
<artifactId>gson</artifactId>
49-
<version>2.9.1</version>
61+
<version>2.10.1</version>
5062
</dependency>
5163

5264

5365
<!-- Servlet reference for lookup request-->
5466
<dependency>
5567
<groupId>javax.servlet</groupId>
5668
<artifactId>servlet-api</artifactId>
57-
<version>2.4</version>
69+
<version>2.5</version>
5870
</dependency>
5971
<!-- Apache HttpClient -->
6072
<dependency>
@@ -72,13 +84,13 @@
7284
<dependency>
7385
<groupId>org.apache.commons</groupId>
7486
<artifactId>commons-lang3</artifactId>
75-
<version>3.12.0</version>
87+
<version>3.17.0</version>
7688
</dependency>
7789
<!-- Apache Commons IO -->
7890
<dependency>
7991
<groupId>commons-io</groupId>
8092
<artifactId>commons-io</artifactId>
81-
<version>2.14.0</version>
93+
<version>2.17.0</version>
8294
</dependency>
8395

8496
<!-- TEST dependencies -->
@@ -92,48 +104,73 @@
92104

93105
<build>
94106
<plugins>
95-
107+
<!-- plugin required for publishing to the new Maven Central Portal -->
108+
<plugin>
109+
<groupId>org.sonatype.central</groupId>
110+
<artifactId>central-publishing-maven-plugin</artifactId>
111+
<version>0.7.0</version>
112+
<extensions>true</extensions>
113+
<configuration>
114+
<publishingServerId>central</publishingServerId>
115+
<generateSources>false</generateSources>
116+
<generateJavadoc>false</generateJavadoc>
117+
</configuration>
118+
</plugin>
96119
<plugin>
97120
<groupId>org.apache.maven.plugins</groupId>
98121
<artifactId>maven-compiler-plugin</artifactId>
99-
<version>3.8.1</version>
122+
<version>3.13.0</version>
100123
<configuration>
101-
<source>1.8</source> <!-- Java 8 as the source version -->
102-
<target>1.8</target> <!-- Java 8 as the target version -->
124+
<!-- single flag that implies source, target, and system modules path -->
125+
<release>11</release>
103126
</configuration>
104127
</plugin>
105128

106129
<!-- Plugin to create the main JAR file -->
107130
<plugin>
108131
<groupId>org.apache.maven.plugins</groupId>
109132
<artifactId>maven-jar-plugin</artifactId>
110-
<version>3.2.0</version>
133+
<version>3.4.1</version>
111134
<configuration>
112135
<finalName>wurfl-microservice-${project.version}</finalName>
113136
</configuration>
114137
</plugin>
115138

116139
<!-- Plugin to create the source JAR -->
117140
<plugin>
118-
<groupId>org.apache.maven.plugins</groupId>
119141
<artifactId>maven-source-plugin</artifactId>
120-
<version>3.2.1</version>
142+
<version>3.3.1</version>
121143
<executions>
144+
<!-- Override any default execution (like "default") to prevent duplication -->
145+
<execution>
146+
<id>default</id>
147+
<phase>none</phase>
148+
<goals>
149+
<goal>jar</goal>
150+
</goals>
151+
</execution>
152+
<!-- Actual attach-sources execution -->
122153
<execution>
123154
<id>attach-sources</id>
155+
<phase>verify</phase>
124156
<goals>
125157
<goal>jar</goal>
126158
</goals>
159+
<configuration>
160+
<classifier>sources</classifier>
161+
</configuration>
127162
</execution>
128163
</executions>
129164
</plugin>
130165

166+
131167
<!-- Plugin to create the Javadoc JAR -->
132168
<plugin>
133169
<groupId>org.apache.maven.plugins</groupId>
134170
<artifactId>maven-javadoc-plugin</artifactId>
135171
<version>3.4.0</version>
136172
<configuration>
173+
<classifier>javadoc</classifier>
137174
<additionalJOptions>
138175
<arg>-Xdoclint:all,-missing,-html</arg> <!-- Suppresses "missing" and "html" warnings -->
139176
</additionalJOptions>
@@ -152,7 +189,7 @@
152189
<plugin>
153190
<groupId>org.apache.maven.plugins</groupId>
154191
<artifactId>maven-assembly-plugin</artifactId>
155-
<version>3.4.2</version>
192+
<version>3.7.1</version>
156193
<configuration>
157194
<descriptors>
158195
<descriptor>src/main/assembly/release-descriptor.xml</descriptor>
@@ -203,7 +240,7 @@
203240
<plugin>
204241
<groupId>org.jacoco</groupId>
205242
<artifactId>jacoco-maven-plugin</artifactId>
206-
<version>0.8.8</version>
243+
<version>0.8.12</version>
207244
<executions>
208245
<execution>
209246
<goals>

0 commit comments

Comments
 (0)