[REST-6] #resolve

Tirasa · Jan 25, 2019 · 948876f · 948876f
1 parent c34af2a
commit 948876f
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,20 @@
+<!--
+
+    Copyright (C) 2011 ConnId (connid-dev@googlegroups.com)
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 ConnIdRESTBundle
 ==============
 

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>net.tirasa.connid</groupId>
     <artifactId>connid</artifactId>
-    <version>1.4.1.0</version>
+    <version>1.4.5.1</version>
   </parent>
 
   <groupId>net.tirasa.connid.bundles</groupId>
@@ -76,9 +76,9 @@
   </mailingLists>
 
   <properties>
-    <connid.version>1.4.1.0</connid.version>
-    <cxf.version>3.1.14</cxf.version>
-    <jackson.version>2.9.4</jackson.version>
+    <connid.version>1.4.5.1</connid.version>
+    <cxf.version>3.1.17</cxf.version>
+    <jackson.version>2.9.8</jackson.version>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>net.tirasa.connid.commons</groupId>
       <artifactId>commons-scripted</artifactId>
-      <version>1.4.1.0</version>
+      <version>1.4.1.1</version>
     </dependency>
 
     <dependency>
@@ -165,7 +165,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version> 
+        <version>3.8.0</version> 
         <inherited>false</inherited>
         <configuration>
           <source>1.7</source>
@@ -177,61 +177,63 @@
         </configuration>
       </plugin>
 
-      <plugin>        
-        <groupId>com.mycila.maven-license-plugin</groupId>
-        <artifactId>maven-license-plugin</artifactId>
-        <inherited>true</inherited>
+      <plugin>
+        <groupId>com.mycila</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <inherited>false</inherited>
         <configuration>
           <skip>true</skip>
         </configuration>
       </plugin>
+
       <plugin>
-        <groupId>com.mycila</groupId>
-        <artifactId>license-maven-plugin</artifactId>
-        <version>2.11</version>
-        <inherited>false</inherited>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>0.13</version>
         <configuration>
-          <header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
-          <properties>
-            <owner>ConnId</owner>
-            <email>connid-dev@googlegroups.com</email>
-          </properties>
           <excludes>
-            <exclude>**/LICENSE*</exclude>
-            <exclude>**/NOTICE*</exclude>
-            <exclude>**/*.pfx</exclude>
-            <exclude>**/*.dll</exclude>
-            <exclude>**/*.so</exclude>
-            <exclude>**/*.jnilib</exclude>
-            <exclude>nbactions.xml</exclude>
-            <exclude>nb-configuration.xml</exclude>
+            <exclude>**/nbactions.xml</exclude>
+            <exclude>**/nb-configuration.xml</exclude>
+            <exclude>**/META-INF/cxf/**</exclude>
             <exclude>**/META-INF/services/**</exclude>
-            <exclude>**/*.css</exclude>
-            <exclude>**/*.js</exclude>
+            <exclude>**/META-INF/MANIFEST.MF</exclude>            
             <exclude>**/*.csv</exclude>
+            <exclude>**/archetype-resources/**</exclude>
+            <exclude>**/AdminLTE*/**</exclude>
+            <exclude>**/goal.txt</exclude>
+            <exclude>**/rat.txt</exclude>
+            <exclude>**/build-copy-javadoc-files.xml</exclude>
             <exclude>**/maven-eclipse.xml</exclude>
             <exclude>**/*.iml</exclude>
             <exclude>**/*.log</exclude>
-            <exclude>.externalToolBuilders/**</exclude>
+            <exclude>**/.externalToolBuilders/**</exclude>
             <exclude>.git/**</exclude>
             <exclude>.idea/**</exclude>
+            <exclude>**/.settings/**</exclude>
             <exclude>**/.*</exclude>
+            <exclude>**/deb/control/conffiles</exclude>
+            <exclude>**/deb/control/control</exclude>
+            <exclude>**/*.lst</exclude>
+            <exclude>**/*.json</exclude>
+            <exclude>**/banner.txt</exclude>
+            <exclude>**/target/**</exclude>
           </excludes>
         </configuration>
         <executions>
           <execution>
+            <id>rat-check</id>
+            <phase>verify</phase>
             <goals>
               <goal>check</goal>
             </goals>
           </execution>
         </executions>
-      </plugin>      
+      </plugin>
 
       <!-- Put NOTICE and LICENSE files in all artifacts and javadocs -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>3.0.1</version>
         <executions>
           <execution>
             <id>copy-artifact-legal-files</id>

diff --git a/src/main/java/net/tirasa/connid/bundles/rest/FIQLFilterTranslator.java b/src/main/java/net/tirasa/connid/bundles/rest/FIQLFilterTranslator.java
@@ -25,6 +25,7 @@
 import org.identityconnectors.framework.common.objects.filter.ContainsFilter;
 import org.identityconnectors.framework.common.objects.filter.EndsWithFilter;
 import org.identityconnectors.framework.common.objects.filter.EqualsFilter;
+import org.identityconnectors.framework.common.objects.filter.EqualsIgnoreCaseFilter;
 import org.identityconnectors.framework.common.objects.filter.GreaterThanFilter;
 import org.identityconnectors.framework.common.objects.filter.GreaterThanOrEqualFilter;
 import org.identityconnectors.framework.common.objects.filter.LessThanFilter;
@@ -99,6 +100,14 @@ protected Map<String, Object> createEqualsExpression(EqualsFilter filter, boolea
         return createMap(not ? ConditionType.NOT_EQUALS : ConditionType.EQUALS, filter);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Map<String, Object> createEqualsIgnoreCaseExpression(EqualsIgnoreCaseFilter filter, boolean not) {
+        return createMap(not ? ConditionType.NOT_EQUALS : ConditionType.EQUALS, filter);
+    }
+
     /**
      * {@inheritDoc}
      */