diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml
index 0c0f1362295..bdd50991a60 100644
--- a/modules/swagger-codegen-cli/pom.xml
+++ b/modules/swagger-codegen-cli/pom.xml
@@ -79,6 +79,13 @@
             <groupId>io.swagger.codegen.v3</groupId>
             <artifactId>swagger-codegen</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <!-- v2 codegen is only used by the online generator (GeneratorService), not by the CLI -->
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-codegen</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.swagger.codegen.v3</groupId>
@@ -107,11 +114,6 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>com.googlecode.lambdaj</groupId>
-            <artifactId>lambdaj</artifactId>
-            <version>2.3.3</version>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Langs.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Langs.java
index 8a92b2e81f0..9688f67fd93 100644
--- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Langs.java
+++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Langs.java
@@ -1,10 +1,11 @@
 package io.swagger.codegen.v3.cli.cmd;
 
-import ch.lambdaj.collection.LambdaIterable;
 import io.swagger.codegen.v3.CodegenConfig;
 
-import static ch.lambdaj.Lambda.on;
-import static ch.lambdaj.collection.LambdaCollections.with;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
 import static java.util.ServiceLoader.load;
 
 /**
@@ -13,8 +14,9 @@
 public class Langs implements Runnable {
     @Override
     public void run() {
-        LambdaIterable<String> langs =
-                with(load(CodegenConfig.class)).extract(on(CodegenConfig.class).getName());
+        List<String> langs = StreamSupport.stream(load(CodegenConfig.class).spliterator(), false)
+                .map(CodegenConfig::getName)
+                .collect(Collectors.toList());
         System.out.printf("Available languages: %s%n", langs);
     }
 }
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Meta.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Meta.java
index 61aee8c53a0..df61ca0b176 100644
--- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Meta.java
+++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Meta.java
@@ -82,7 +82,6 @@ public void run() {
      *
      * @param targetDir - destination directory
      * @param data - map with additional params needed to process templates
-     * @return converter object to pass to lambdaj
      */
     private static void processFiles(DefaultGenerator generator, SupportingFile support, final File targetDir, final Map<String, Object> data) {
         try {
diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
index 2edb5fd59b5..8438e633e61 100644
--- a/modules/swagger-codegen/pom.xml
+++ b/modules/swagger-codegen/pom.xml
@@ -89,13 +89,6 @@
                         </manifestEntries>
                     </archive>
                 </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>