Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BEAM-3690] ban mockito-all and hamcrest-all #4712

Closed
wants to merge 17 commits into from
Closed

[BEAM-3690] ban mockito-all and hamcrest-all #4712

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0913119
replace mockito-all
1028332163 Feb 19, 2018
148972e
replace mockito
1028332163 Feb 19, 2018
8b8ef42
replace mockito-all and harcrest-all
1028332163 Feb 19, 2018
e577911
replace mockito-all and harcrest-all
1028332163 Feb 19, 2018
4bd2c9b
replace mockito-all and harcrest-all
1028332163 Feb 19, 2018
ee29c56
replace mockito-all and harcrest-all
1028332163 Feb 19, 2018
f9365f7
replace mockito-all and harcrest-all
1028332163 Feb 19, 2018
883c71b
replace mockito-all and harcrest-all
1028332163 Feb 19, 2018
8367a98
replace mockito-all and harcrest-all
1028332163 Feb 19, 2018
053476f
replace mockito-all and harcrest-all
1028332163 Feb 19, 2018
a09b794
ignoredUnusedDeclaredDependencies
1028332163 Feb 19, 2018
8f7fd8b
Merge branch 'master' of https://github.com/apache/beam.git
1028332163 Feb 20, 2018
1bf1418
ban hamcrest-all and mockito-all
1028332163 Feb 20, 2018
834be30
ban mockito-all and hamcrest-all
1028332163 Feb 20, 2018
a501b3f
Merge branch 'master' of https://github.com/apache/beam.git
1028332163 Feb 22, 2018
9bf4976
ban mockito-all and hamcrest-all
1028332163 Feb 22, 2018
33394a9
ban mockito-all and hamcrest-all
1028332163 Feb 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Expand Up @@ -2218,6 +2218,8 @@
<rules>
<bannedDependencies>
<excludes>
<exclude>org.mockito:mockito-all</exclude>
<exclude>org.hamcrest:hamcrest-all</exclude>
<exclude>com.google.guava:guava-jdk5</exclude>
<exclude>com.google.protobuf:protobuf-lite</exclude>
</excludes>
Expand Down
23 changes: 7 additions & 16 deletions sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml
View file
Open in desktop
Expand Up @@ -41,6 +41,12 @@
<artifactId>framework</artifactId>
<version>${elasticsearch.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--to enable rest connection on embeded elasticsearch-->
Expand Down Expand Up @@ -75,22 +81,7 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>analyze-only</goal>
</goals>
<configuration>
<ignoredUsedUndeclaredDependencies>
<ignoredUsedUndeclaredDependency>org.hamcrest:hamcrest-all:jar:${hamcrest.version}</ignoredUsedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
16 changes: 16 additions & 0 deletions sdks/java/nexmark/pom.xml
View file
Open in desktop
Expand Up @@ -118,6 +118,22 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>analyze-only</goal>
</goals>
<configuration>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>org.hamcrest:hamcrest-library:jar:${hamcrest.version}</ignoredUnusedDeclaredDependency>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to duplicate the lines below.

Are they needed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you fix the indentation?

</ignoredUnusedDeclaredDependencies>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down