Move sub modules back to root dir structure

patrickfav · Jul 24, 2018 · 03f28d8 · 03f28d8
1 parent 16d8db8
commit 03f28d8
Show file tree

Hide file tree

Showing 29 changed files with 2 additions and 4 deletions.
diff --git a/modules/bcrypt-cli/pom.xml → bcrypt-cli/pom.xml b/modules/bcrypt-cli/pom.xml → bcrypt-cli/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>bcrypt-parent</artifactId>
         <groupId>at.favre.lib</groupId>
         <version>0.4.2</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>bcrypt-cli</artifactId>

diff --git a/...a/at/favre/lib/crypto/bcrypt/cli/Arg.java → ...a/at/favre/lib/crypto/bcrypt/cli/Arg.java b/...a/at/favre/lib/crypto/bcrypt/cli/Arg.java → ...a/at/favre/lib/crypto/bcrypt/cli/Arg.java
diff --git a/...vre/lib/crypto/bcrypt/cli/BcryptTool.java → ...vre/lib/crypto/bcrypt/cli/BcryptTool.java b/...vre/lib/crypto/bcrypt/cli/BcryptTool.java → ...vre/lib/crypto/bcrypt/cli/BcryptTool.java
diff --git a/...avre/lib/crypto/bcrypt/cli/CLIParser.java → ...avre/lib/crypto/bcrypt/cli/CLIParser.java b/...avre/lib/crypto/bcrypt/cli/CLIParser.java → ...avre/lib/crypto/bcrypt/cli/CLIParser.java
diff --git a/.../favre/lib/crypto/bcrypt/cli/ArgTest.java → .../favre/lib/crypto/bcrypt/cli/ArgTest.java b/.../favre/lib/crypto/bcrypt/cli/ArgTest.java → .../favre/lib/crypto/bcrypt/cli/ArgTest.java
diff --git a/...lib/crypto/bcrypt/cli/BcryptToolTest.java → ...lib/crypto/bcrypt/cli/BcryptToolTest.java b/...lib/crypto/bcrypt/cli/BcryptToolTest.java → ...lib/crypto/bcrypt/cli/BcryptToolTest.java
diff --git a/.../lib/crypto/bcrypt/cli/CLIParserTest.java → .../lib/crypto/bcrypt/cli/CLIParserTest.java b/.../lib/crypto/bcrypt/cli/CLIParserTest.java → .../lib/crypto/bcrypt/cli/CLIParserTest.java
diff --git a/modules/bcrypt/pom.xml → bcrypt/pom.xml b/modules/bcrypt/pom.xml → bcrypt/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>bcrypt-parent</artifactId>
         <groupId>at.favre.lib</groupId>
         <version>0.4.2</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>bcrypt</artifactId>

diff --git a/...va/at/favre/lib/crypto/bcrypt/BCrypt.java → ...va/at/favre/lib/crypto/bcrypt/BCrypt.java b/...va/at/favre/lib/crypto/bcrypt/BCrypt.java → ...va/at/favre/lib/crypto/bcrypt/BCrypt.java
diff --git a/...re/lib/crypto/bcrypt/BCryptFormatter.java → ...re/lib/crypto/bcrypt/BCryptFormatter.java b/...re/lib/crypto/bcrypt/BCryptFormatter.java → ...re/lib/crypto/bcrypt/BCryptFormatter.java
diff --git a/.../crypto/bcrypt/BCryptOpenBSDProtocol.java → .../crypto/bcrypt/BCryptOpenBSDProtocol.java b/.../crypto/bcrypt/BCryptOpenBSDProtocol.java → .../crypto/bcrypt/BCryptOpenBSDProtocol.java
diff --git a/...favre/lib/crypto/bcrypt/BCryptParser.java → ...favre/lib/crypto/bcrypt/BCryptParser.java b/...favre/lib/crypto/bcrypt/BCryptParser.java → ...favre/lib/crypto/bcrypt/BCryptParser.java
diff --git a/.../bcrypt/IllegalBCryptFormatException.java → .../bcrypt/IllegalBCryptFormatException.java b/.../bcrypt/IllegalBCryptFormatException.java → .../bcrypt/IllegalBCryptFormatException.java
diff --git a/...crypto/bcrypt/LongPasswordStrategies.java → ...crypto/bcrypt/LongPasswordStrategies.java b/...crypto/bcrypt/LongPasswordStrategies.java → ...crypto/bcrypt/LongPasswordStrategies.java
diff --git a/...b/crypto/bcrypt/LongPasswordStrategy.java → ...b/crypto/bcrypt/LongPasswordStrategy.java b/...b/crypto/bcrypt/LongPasswordStrategy.java → ...b/crypto/bcrypt/LongPasswordStrategy.java
diff --git a/...vre/lib/crypto/bcrypt/Radix64Encoder.java → ...vre/lib/crypto/bcrypt/Radix64Encoder.java b/...vre/lib/crypto/bcrypt/Radix64Encoder.java → ...vre/lib/crypto/bcrypt/Radix64Encoder.java
diff --git a/...ib/crypto/bcrypt/BCryptFormatterTest.java → ...ib/crypto/bcrypt/BCryptFormatterTest.java b/...ib/crypto/bcrypt/BCryptFormatterTest.java → ...ib/crypto/bcrypt/BCryptFormatterTest.java
diff --git a/...e/lib/crypto/bcrypt/BCryptParserTest.java → ...e/lib/crypto/bcrypt/BCryptParserTest.java b/...e/lib/crypto/bcrypt/BCryptParserTest.java → ...e/lib/crypto/bcrypt/BCryptParserTest.java
diff --git a/.../lib/crypto/bcrypt/BcBcryptTestCases.java → .../lib/crypto/bcrypt/BcBcryptTestCases.java b/.../lib/crypto/bcrypt/BcBcryptTestCases.java → .../lib/crypto/bcrypt/BcBcryptTestCases.java
diff --git a/...t/favre/lib/crypto/bcrypt/BcryptTest.java → ...t/favre/lib/crypto/bcrypt/BcryptTest.java b/...t/favre/lib/crypto/bcrypt/BcryptTest.java → ...t/favre/lib/crypto/bcrypt/BcryptTest.java
diff --git a/...re/lib/crypto/bcrypt/BcryptTestEntry.java → ...re/lib/crypto/bcrypt/BcryptTestEntry.java b/...re/lib/crypto/bcrypt/BcryptTestEntry.java → ...re/lib/crypto/bcrypt/BcryptTestEntry.java
diff --git a/...e/lib/crypto/bcrypt/JBcryptTestCases.java → ...e/lib/crypto/bcrypt/JBcryptTestCases.java b/...e/lib/crypto/bcrypt/JBcryptTestCases.java → ...e/lib/crypto/bcrypt/JBcryptTestCases.java
diff --git a/...ypto/bcrypt/LongPasswordStrategyTest.java → ...ypto/bcrypt/LongPasswordStrategyTest.java b/...ypto/bcrypt/LongPasswordStrategyTest.java → ...ypto/bcrypt/LongPasswordStrategyTest.java
diff --git a/.../favre/lib/crypto/bcrypt/Radix64Test.java → .../favre/lib/crypto/bcrypt/Radix64Test.java b/.../favre/lib/crypto/bcrypt/Radix64Test.java → .../favre/lib/crypto/bcrypt/Radix64Test.java
diff --git a/...pto/bcrypt/misc/BcryptMicroBenchmark.java → ...pto/bcrypt/misc/BcryptMicroBenchmark.java b/...pto/bcrypt/misc/BcryptMicroBenchmark.java → ...pto/bcrypt/misc/BcryptMicroBenchmark.java
diff --git a/...to/bcrypt/misc/Radix64RefDataCreator.java → ...to/bcrypt/misc/Radix64RefDataCreator.java b/...to/bcrypt/misc/Radix64RefDataCreator.java → ...to/bcrypt/misc/Radix64RefDataCreator.java
diff --git a/.../favre/lib/crypto/bcrypt/misc/Repeat.java → .../favre/lib/crypto/bcrypt/misc/Repeat.java b/.../favre/lib/crypto/bcrypt/misc/Repeat.java → .../favre/lib/crypto/bcrypt/misc/Repeat.java
diff --git a/...re/lib/crypto/bcrypt/misc/RepeatRule.java → ...re/lib/crypto/bcrypt/misc/RepeatRule.java b/...re/lib/crypto/bcrypt/misc/RepeatRule.java → ...re/lib/crypto/bcrypt/misc/RepeatRule.java
diff --git a/pom.xml b/pom.xml
@@ -16,8 +16,8 @@
     <description>Parent Maven project for Bcrypt</description>
 
     <modules>
-        <module>modules/bcrypt</module>
-        <module>modules/bcrypt-cli</module>
+        <module>bcrypt</module>
+        <module>bcrypt-cli</module>
     </modules>
 
     <properties>