Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Update dependencies #1922

Merged
dodgex merged 4 commits into from
Dec 11, 2016
Merged

Update dependencies #1922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
404eab9
Update Maven plugins
WonderCsabo Dec 11, 2016
ba21827
Move compiler plugin param to parent pom
WonderCsabo Dec 11, 2016
4ac5c10
Update dependencies
WonderCsabo Dec 11, 2016
cdf29f9
Update Mockito
WonderCsabo Dec 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions AndroidAnnotations/androidannotations-core/androidannotations-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<main.basedir>${project.parent.parent.basedir}</main.basedir>
<android-rome-version>1.0.0-r2</android-rome-version>
<checkstyle.excludes>**/R.java,**/BuildConfig.java,</checkstyle.excludes>
<parceler.version>1.1.4</parceler.version>
<parceler.version>1.1.6</parceler.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -118,7 +118,6 @@
<configuration>
<source>1.6</source>
<target>1.6</target>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>-Atrace=true</arg>
<arg>-AlogFile=${project.build.directory}/functional-test.log</arg>
Expand Down
2 changes: 1 addition & 1 deletion ...androidannotations-test/src/test/java/org/androidannotations/test/ThreadActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void after() throws InterruptedException {
.in(BackgroundExecutor.class) //
.get();

if (new MockUtil().isMock(executor) || !(executor instanceof ExecutorService)) {
if (MockUtil.isMock(executor) || !(executor instanceof ExecutorService)) {
return;
}

Expand Down
3 changes: 1 addition & 2 deletions AndroidAnnotations/androidannotations-ormlite/ormlite-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<dependency>
<groupId>com.j256.ormlite</groupId>
<artifactId>ormlite-android</artifactId>
<version>4.48</version>
<version>5.0</version>
</dependency>
<dependency>
<groupId>org.robolectric</groupId>
Expand Down Expand Up @@ -100,7 +100,6 @@
<configuration>
<source>1.6</source>
<target>1.6</target>
<showWarnings>true</showWarnings>
</configuration>
</plugin>

Expand Down
1 change: 0 additions & 1 deletion AndroidAnnotations/androidannotations-otto/otto-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
<configuration>
<source>1.6</source>
<target>1.6</target>
<showWarnings>true</showWarnings>
</configuration>
</plugin>

Expand Down
1 change: 0 additions & 1 deletion AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@
<configuration>
<source>1.6</source>
<target>1.6</target>
<showWarnings>true</showWarnings>
</configuration>
</plugin>

Expand Down
4 changes: 2 additions & 2 deletions ...rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/MyServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ public void cookieInUrl() {
ArgumentMatcher<HttpEntity<Void>> matcher = new ArgumentMatcher<HttpEntity<Void>>() {

@Override
public boolean matches(Object argument) {
public boolean matches(HttpEntity<Void> argument) {
final String expected = "sjsaid=" + sjsaidValue + ";";
return expected.equals(((HttpEntity<?>) argument).getHeaders().get("Cookie").get(0));
return expected.equals(argument.getHeaders().get("Cookie").get(0));
}
};

Expand Down
5 changes: 2 additions & 3 deletions ...pring-test/src/test/java/org/androidannotations/rest/spring/test/PostRestServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,8 @@ private static <T> ArgumentMatcher<HttpEntity<T>> equals(final HttpEntity<T> exp
return new ArgumentMatcher<HttpEntity<T>>() {

@Override
public boolean matches(Object argument) {
HttpEntity<?> actual = (HttpEntity<?>) argument;
return expected.getBody().equals(actual.getBody());
public boolean matches(HttpEntity<T> argument) {
return expected.getBody().equals(argument.getBody());
}
};
}
Expand Down
7 changes: 3 additions & 4 deletions ...spring-test/src/test/java/org/androidannotations/rest/spring/test/RequestTestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,10 @@ private void checkResponseCookies() throws AssertionFailedError {
}
}

public class HttpEntityArgumentMatcher extends ArgumentMatcher<HttpEntity<Void>> {
public class HttpEntityArgumentMatcher implements ArgumentMatcher<HttpEntity<Void>> {
@Override
public boolean matches(Object argument) {
HttpEntity<?> httpEntity = (HttpEntity<?>) argument;
HttpHeaders httpHeaders = httpEntity.getHeaders();
public boolean matches(HttpEntity<Void> argument) {
HttpHeaders httpHeaders = argument.getHeaders();

// Check that cookies set earlier are sent in the request
if (requestCookies.size() > 0) {
Expand Down
1 change: 0 additions & 1 deletion AndroidAnnotations/androidannotations-roboguice/roboguice-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
<configuration>
<source>1.6</source>
<target>1.6</target>
<showWarnings>true</showWarnings>
</configuration>
</plugin>

Expand Down
19 changes: 10 additions & 9 deletions AndroidAnnotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<dependency>
<groupId>com.helger</groupId>
<artifactId>jcodemodel</artifactId>
<version>2.8.5</version>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -224,7 +224,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -244,28 +244,29 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<showWarnings>true</showWarnings>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>2.10.4</version>
<configuration>
<locale>en_US</locale>
<quiet>true</quiet>
Expand All @@ -282,7 +283,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -302,12 +303,12 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.11</version>
<version>3.0</version>
</plugin>
<plugin>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
<version>4.4.1</version>
<version>4.4.3</version>
<configuration>
<sdk>
<platform>16</platform>
Expand Down