Skip to content

Commit 2df41b3

Browse files
kayahrkayahr
committed
Update dependencies
1 parent c3cd92a commit 2df41b3

File tree

6 files changed

+93
-58
lines changed

6 files changed

+93
-58
lines changed

‎pom.xml‎

Lines changed: 55 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>usb4java-javax</artifactId>
77
<packaging>jar</packaging>
88
<name>usb4java-javax</name>
9-
<version>1.2.1-SNAPSHOT</version>
9+
<version>1.3.0-SNAPSHOT</version>
1010
<url>http://usb4java.org/usb4java-javax/</url>
1111
<description>
1212
Extension for usb4java which implements javax.usb (JSR-80).
@@ -81,12 +81,16 @@
8181
<url>https://ci.ailis.de/job/${project.artifactId}/</url>
8282
</ciManagement>
8383

84+
<prerequisites>
85+
<maven>3.0.5</maven>
86+
</prerequisites>
87+
8488
<reporting>
8589
<plugins>
8690
<plugin>
8791
<groupId>org.apache.maven.plugins</groupId>
8892
<artifactId>maven-project-info-reports-plugin</artifactId>
89-
<version>2.7</version>
93+
<version>3.0.0</version>
9094
<configuration>
9195
<dependencyDetailEnabled>false</dependencyDetailEnabled>
9296
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -95,12 +99,11 @@
9599
<reportSet>
96100
<reports>
97101
<report>summary</report>
98-
<report>project-team</report>
99-
<report>mailing-list</report>
100-
<report>issue-tracking</report>
102+
<report>team</report>
103+
<report>mailing-lists</report>
104+
<report>issue-management</report>
101105
<report>scm</report>
102-
<report>cim</report>
103-
<report>license</report>
106+
<report>licenses</report>
104107
<report>dependencies</report>
105108
<report>plugins</report>
106109
<report>plugin-management</report>
@@ -111,7 +114,10 @@
111114
<plugin>
112115
<groupId>org.apache.maven.plugins</groupId>
113116
<artifactId>maven-changes-plugin</artifactId>
114-
<version>2.9</version>
117+
<version>2.12.1</version>
118+
<configuration>
119+
<teamlist>team.html</teamlist>
120+
</configuration>
115121
<reportSets>
116122
<reportSet>
117123
<reports>
@@ -123,7 +129,7 @@
123129
<plugin>
124130
<groupId>org.apache.maven.plugins</groupId>
125131
<artifactId>maven-javadoc-plugin</artifactId>
126-
<version>2.9.1</version>
132+
<version>3.0.1</version>
127133
<reportSets>
128134
<reportSet>
129135
<reports>
@@ -136,23 +142,14 @@
136142
</reporting>
137143

138144
<build>
139-
<pluginManagement>
140-
<plugins>
141-
<plugin>
142-
<groupId>org.apache.maven.plugins</groupId>
143-
<artifactId>maven-surefire-plugin</artifactId>
144-
<version>2.16</version>
145-
</plugin>
146-
</plugins>
147-
</pluginManagement>
148145

149146
<plugins>
150147

151148
<!-- Use Java 6 -->
152149
<plugin>
153150
<groupId>org.apache.maven.plugins</groupId>
154151
<artifactId>maven-compiler-plugin</artifactId>
155-
<version>3.1</version>
152+
<version>3.8.0</version>
156153
<configuration>
157154
<source>1.6</source>
158155
<target>1.6</target>
@@ -164,7 +161,7 @@
164161
<plugin>
165162
<groupId>org.apache.maven.plugins</groupId>
166163
<artifactId>maven-site-plugin</artifactId>
167-
<version>3.3</version>
164+
<version>3.7.1</version>
168165
<configuration>
169166
<chmod>false</chmod>
170167
<locales>en</locales>
@@ -176,30 +173,56 @@
176173
<!-- Build binary artifacts for Unix, Mac OS X and Windows -->
177174
<plugin>
178175
<artifactId>maven-assembly-plugin</artifactId>
179-
<version>2.2.2</version>
176+
<version>3.1.0</version>
180177
<configuration>
181178
<appendAssemblyId>false</appendAssemblyId>
179+
<attach>true</attach>
182180
<descriptors>
183181
<descriptor>src/main/assembly/tarball.xml</descriptor>
184182
<descriptor>src/main/assembly/zip.xml</descriptor>
185183
</descriptors>
186-
<!-- Workaround for issue MASSEMBLY-449 -->
187-
<archiverConfig>
188-
<fileMode>420</fileMode> <!-- 420(dec) = 644(oct) -->
189-
<directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) -->
190-
<defaultDirectoryMode>493</defaultDirectoryMode>
191-
</archiverConfig>
192184
</configuration>
193185
<executions>
194186
<execution>
195187
<id>package-assembly</id>
196188
<phase>package</phase>
197189
<goals>
198-
<goal>attached</goal>
190+
<goal>single</goal>
199191
</goals>
200192
</execution>
201193
</executions>
202194
</plugin>
195+
196+
<plugin>
197+
<groupId>org.apache.maven.plugins</groupId>
198+
<artifactId>maven-surefire-plugin</artifactId>
199+
<version>2.22.0</version>
200+
</plugin>
201+
<plugin>
202+
<groupId>org.apache.maven.plugins</groupId>
203+
<artifactId>maven-clean-plugin</artifactId>
204+
<version>3.1.0</version>
205+
</plugin>
206+
<plugin>
207+
<groupId>org.apache.maven.plugins</groupId>
208+
<artifactId>maven-deploy-plugin</artifactId>
209+
<version>3.0.0-M1</version>
210+
</plugin>
211+
<plugin>
212+
<groupId>org.apache.maven.plugins</groupId>
213+
<artifactId>maven-install-plugin</artifactId>
214+
<version>3.0.0-M1</version>
215+
</plugin>
216+
<plugin>
217+
<groupId>org.apache.maven.plugins</groupId>
218+
<artifactId>maven-jar-plugin</artifactId>
219+
<version>3.1.0</version>
220+
</plugin>
221+
<plugin>
222+
<groupId>org.apache.maven.plugins</groupId>
223+
<artifactId>maven-resources-plugin</artifactId>
224+
<version>3.1.0</version>
225+
</plugin>
203226
</plugins>
204227
</build>
205228

@@ -233,13 +256,13 @@
233256
<dependency>
234257
<groupId>junit</groupId>
235258
<artifactId>junit</artifactId>
236-
<version>4.11</version>
259+
<version>4.12</version>
237260
<scope>test</scope>
238261
</dependency>
239262
<dependency>
240263
<groupId>org.mockito</groupId>
241264
<artifactId>mockito-core</artifactId>
242-
<version>1.9.5</version>
265+
<version>2.23.0</version>
243266
<scope>test</scope>
244267
</dependency>
245268
<dependency>
@@ -250,12 +273,12 @@
250273
<dependency>
251274
<groupId>org.apache.commons</groupId>
252275
<artifactId>commons-lang3</artifactId>
253-
<version>3.2.1</version>
276+
<version>3.8.1</version>
254277
</dependency>
255278
<dependency>
256279
<groupId>org.usb4java</groupId>
257280
<artifactId>usb4java</artifactId>
258-
<version>1.2.1-SNAPSHOT</version>
281+
<version>1.3.0-SNAPSHOT</version>
259282
</dependency>
260283
</dependencies>
261284

‎src/changes/changes.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
<author email="k@ailis.de">Klaus Reimer</author>
99
</properties>
1010
<body>
11+
<release version="1.3.0" date="2018-10-07" description="Major update">
12+
<action dev="kayahr" type="update" date="2018-10-07">
13+
Updated dependencies. See changelog of the usb4java project for details.
14+
</action>
15+
</release>
1116
<release version="1.2.0" date="2014-02-16" description="Major update">
1217
<action dev="kayahr" type="update" date="2014-02-16">
1318
Moved javax.usb implementation to org.usb4java.javax namespace

‎src/main/assembly/tarball.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<fileSets>
1010
<fileSet>
1111
<directory></directory>
12-
<outputDirectory>/</outputDirectory>
12+
<outputDirectory></outputDirectory>
1313
<includes>
1414
<include>LICENSE.md</include>
1515
</includes>
@@ -18,7 +18,7 @@
1818
</fileSet>
1919
<fileSet>
2020
<directory>src/main/assembly</directory>
21-
<outputDirectory>/</outputDirectory>
21+
<outputDirectory></outputDirectory>
2222
<includes>
2323
<include>README.txt</include>
2424
<include>AUTHORS.txt</include>

‎src/main/assembly/zip.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<fileSets>
1010
<fileSet>
1111
<directory></directory>
12-
<outputDirectory>/</outputDirectory>
12+
<outputDirectory></outputDirectory>
1313
<includes>
1414
<include>LICENSE.md</include>
1515
</includes>
@@ -18,7 +18,7 @@
1818
</fileSet>
1919
<fileSet>
2020
<directory>src/main/assembly</directory>
21-
<outputDirectory>/</outputDirectory>
21+
<outputDirectory></outputDirectory>
2222
<includes>
2323
<include>README.txt</include>
2424
<include>AUTHORS.txt</include>

‎src/site/site.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<skin>
1313
<groupId>org.apache.maven.skins</groupId>
1414
<artifactId>maven-fluido-skin</artifactId>
15-
<version>1.3.0</version>
15+
<version>1.7</version>
1616
</skin>
1717

1818
<body>
1919
<head>
20-
<link href="favicon.ico" rel="SHORTCUT ICON" />
20+
<![CDATA[<link href="favicon.ico" rel="SHORTCUT ICON" />]]>
2121
</head>
2222

2323
<links>

‎src/test/java/org/usb4java/javax/test/TCKRunner.java‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,34 @@ public class TCKRunner extends JUnit38ClassRunner
3030
public TCKRunner(final Class<?> testClass) throws NoTestsRemainException
3131
{
3232
super(testClass);
33-
filter(new Filter()
33+
try
3434
{
35-
@Override
36-
public boolean shouldRun(Description description)
37-
{
38-
try
39-
{
40-
UsbAssume.assumeTckTestsEnabled();
41-
return true;
42-
}
43-
catch (AssumptionViolatedException e)
44-
{
45-
return false;
46-
}
47-
}
35+
filter(new Filter()
36+
{
37+
@Override
38+
public boolean shouldRun(Description description)
39+
{
40+
try
41+
{
42+
UsbAssume.assumeTckTestsEnabled();
43+
return true;
44+
}
45+
catch (AssumptionViolatedException e)
46+
{
47+
return false;
48+
}
49+
}
4850

49-
@Override
50-
public String describe()
51-
{
52-
return "TCK tests only when enabled";
53-
}
54-
});
51+
@Override
52+
public String describe()
53+
{
54+
return "TCK tests only when enabled";
55+
}
56+
});
57+
}
58+
catch (NoTestsRemainException e)
59+
{
60+
// This is expected when we filter out the whole test class
61+
}
5562
}
5663
}

0 commit comments

Comments
 (0)