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.

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

Remove use of hamcrest in production (non-test) code. #480

Merged

Conversation

dvlato
Copy link
Contributor

@dvlato dvlato commented Oct 11, 2019

No description provided.

Copy link
Contributor

@mikkokar mikkokar left a comment

Choose a reason for hiding this comment

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

The example plugin POM still needs to be fixed. This should do:

Index: plugin-examples/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- plugin-examples/pom.xml    (date 1570783123000)
+++ plugin-examples/pom.xml    (date 1570784721897)
@@ -11,7 +11,6 @@
   <version>1.0-SNAPSHOT</version>
 
   <properties>
-    <main.basedir>${project.parent.basedir}</main.basedir>
     <java.source>1.8</java.source>
     <java.target>1.8</java.target>
 
@@ -20,6 +19,7 @@
     <rxjava.version>1.1.6</rxjava.version>
     <jackson.version>2.9.10</jackson.version>
     <testng.version>6.14.3</testng.version>
+    <hamcrest.all.version>1.3</hamcrest.all.version>
   </properties>
 
   <dependencies>
@@ -60,6 +60,20 @@
       <version>${testng.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>${hamcrest.all.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+
   </dependencies>
 
   <build>

@@ -1,5 +1,5 @@
/*
Copyright (C) 2013-2018 Expedia Inc.
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's get rid of this class. You can just copy the changes from my closed PR: #478.

@mikkokar mikkokar merged commit a19e30b into ExpediaGroup:master Oct 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants