[#29 #57] Fixing bom to not expose third-party dependencies and addin…

…g test source to maven upload
goldmansachs · Jul 23, 2017 · a4efeff · a4efeff
1 parent bb4e61f
commit a4efeff
Show file tree

Hide file tree

Showing 51 changed files with 606 additions and 542 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,14 +1,13 @@
-Obevo
-Copyright 2017 Goldman Sachs
-Licensed under Apache 2.0 license
-
-See the target/maven-shared-archive-resources/META-INF/DEPENDENCIES for links to the license texts.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Each module in this project has a NOTICE.txt file denoting the module's own dependencies.
-
-This product depends on (links to) the following software:
-  SLF4J API Module under MIT License
-
+Obevo
+Copyright 2017 Goldman Sachs
+Licensed under Apache 2.0 license
+
+See the target/maven-shared-archive-resources/META-INF/DEPENDENCIES for links to the license texts.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Each module in this project has a NOTICE.txt file denoting the module's own dependencies.
+
+This product depends on (links to) the following software:
+
diff --git a/obevo-bom/NOTICE.txt b/obevo-bom/NOTICE.txt
@@ -1,14 +1,13 @@
-Obevo
-Copyright 2017 Goldman Sachs
-Licensed under Apache 2.0 license
-
-See the target/maven-shared-archive-resources/META-INF/DEPENDENCIES for links to the license texts.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Each module in this project has a NOTICE.txt file denoting the module's own dependencies.
-
-This product depends on (links to) the following software:
-  SLF4J API Module under MIT License
-
+Obevo
+Copyright 2017 Goldman Sachs
+Licensed under Apache 2.0 license
+
+See the target/maven-shared-archive-resources/META-INF/DEPENDENCIES for links to the license texts.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Each module in this project has a NOTICE.txt file denoting the module's own dependencies.
+
+This product depends on (links to) the following software:
+
diff --git a/obevo-bom/obevo-bom.iml b/obevo-bom/obevo-bom.iml
@@ -8,12 +8,5 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit-addons:junit-addons:1.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
   </component>
 </module>
diff --git a/obevo-bom/pom.xml b/obevo-bom/pom.xml
@@ -37,11 +37,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-dbmetadata-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
                 <artifactId>obevo-core</artifactId>
@@ -52,14 +47,15 @@
                 <artifactId>obevo-db</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-db-client-alldbs</artifactId>
+                <artifactId>obevo-db-impls</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-db-scenario-tests</artifactId>
+                <artifactId>obevo-db-db2</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -74,82 +70,102 @@
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-db-sybase-ase</artifactId>
+                <artifactId>obevo-db-mssql</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-db-sybase-iq</artifactId>
+                <artifactId>obevo-db-oracle</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-db-db2</artifactId>
+                <artifactId>obevo-db-postgresql</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-db-mssql</artifactId>
+                <artifactId>obevo-db-scenario-tests</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-db-hive</artifactId>
+                <artifactId>obevo-db-sybase-ase</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-db-postgresql</artifactId>
+                <artifactId>obevo-db-sybase-iq</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-db-oracle</artifactId>
+                <artifactId>obevo-dbmetadata-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-reladomo-util</artifactId>
+                <artifactId>obevo-dists</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-maven-plugin</artifactId>
+                <artifactId>obevo-cli</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-maven-cbk-archetype</artifactId>
+                <artifactId>obevo-maven-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-dist</artifactId>
+                <artifactId>obevo-db-client-alldbs</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
                 <artifactId>obevo-internal-comparer</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.goldmansachs.obevo</groupId>
+                <artifactId>obevo-internal-test-client-01</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.goldmansachs.obevo</groupId>
+                <artifactId>obevo-internal-test-client-02</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.goldmansachs.obevo</groupId>
+                <artifactId>obevo-internal-test-util</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
                 <artifactId>obevo-site</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-internal-infra</artifactId>
+                <artifactId>obevo-utils</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-test-client-01</artifactId>
+                <artifactId>obevo-db-unittest-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.goldmansachs.obevo</groupId>
-                <artifactId>obevo-test-client-02</artifactId>
+                <artifactId>obevo-reladomo-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
         </dependencies>

diff --git a/obevo-core/NOTICE.txt b/obevo-core/NOTICE.txt
@@ -1,27 +1,27 @@
-Obevo
-Copyright 2017 Goldman Sachs
-Licensed under Apache 2.0 license
-
-See the target/maven-shared-archive-resources/META-INF/DEPENDENCIES for links to the license texts.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Each module in this project has a NOTICE.txt file denoting the module's own dependencies.
-
-This product depends on (links to) the following software:
-  Apache Commons Codec under Apache License, Version 2.0
-  Command Line Interface Parser for Java under The Apache Software License, Version 2.0
-  Commons BeanUtils under The Apache Software License, Version 2.0
-  Commons Collections under The Apache Software License, Version 2.0
-  Commons Configuration under The Apache Software License, Version 2.0
-  Commons Digester under The Apache Software License, Version 2.0
-  Commons IO under The Apache Software License, Version 2.0
-  Commons Lang under The Apache Software License, Version 2.0
-  Commons VFS Core under The Apache Software License, Version 2.0
-  Eclipse Collections API under Eclipse Public License - v 1.0
-  Eclipse Collections Main Library under Eclipse Public License - v 1.0
-  JCL 1.1.1 implemented over SLF4J under MIT License
-  JGraphT - Core under Eclipse Public License (EPL) 1.0
-  SLF4J API Module under MIT License
-
+Obevo
+Copyright 2017 Goldman Sachs
+Licensed under Apache 2.0 license
+
+See the target/maven-shared-archive-resources/META-INF/DEPENDENCIES for links to the license texts.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Each module in this project has a NOTICE.txt file denoting the module's own dependencies.
+
+This product depends on (links to) the following software:
+  Apache Commons Codec under Apache License, Version 2.0
+  Command Line Interface Parser for Java under The Apache Software License, Version 2.0
+  Commons BeanUtils under The Apache Software License, Version 2.0
+  Commons Collections under The Apache Software License, Version 2.0
+  Commons Configuration under The Apache Software License, Version 2.0
+  Commons Digester under The Apache Software License, Version 2.0
+  Commons IO under The Apache Software License, Version 2.0
+  Commons Lang under The Apache Software License, Version 2.0
+  Commons VFS Core under The Apache Software License, Version 2.0
+  Eclipse Collections API under Eclipse Public License - v 1.0
+  Eclipse Collections Main Library under Eclipse Public License - v 1.0
+  JCL 1.1.1 implemented over SLF4J under MIT License
+  JGraphT - Core under Eclipse Public License (EPL) 1.0
+  SLF4J API Module under MIT License
+
diff --git a/obevo-core/pom.xml b/obevo-core/pom.xml
@@ -19,8 +19,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.goldmansachs.obevo</groupId>
-        <artifactId>obevo-parent</artifactId>
+        <artifactId>obevo-dependencies</artifactId>
         <version>6.1.1-SNAPSHOT</version>
+        <relativePath>../obevo-dependencies</relativePath>
     </parent>
     <artifactId>obevo-core</artifactId>
 

diff --git a/obevo-db-impls/NOTICE.txt b/obevo-db-impls/NOTICE.txt
@@ -1,14 +1,14 @@
-Obevo
-Copyright 2017 Goldman Sachs
-Licensed under Apache 2.0 license
-
-See the target/maven-shared-archive-resources/META-INF/DEPENDENCIES for links to the license texts.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Each module in this project has a NOTICE.txt file denoting the module's own dependencies.
-
-This product depends on (links to) the following software:
-  SLF4J API Module under MIT License
-
+Obevo
+Copyright 2017 Goldman Sachs
+Licensed under Apache 2.0 license
+
+See the target/maven-shared-archive-resources/META-INF/DEPENDENCIES for links to the license texts.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Each module in this project has a NOTICE.txt file denoting the module's own dependencies.
+
+This product depends on (links to) the following software:
+  SLF4J API Module under MIT License
+
diff --git a/obevo-db-impls/obevo-db-db2/NOTICE.txt b/obevo-db-impls/obevo-db-db2/NOTICE.txt
@@ -26,20 +26,14 @@ This product depends on (links to) the following software:
   Eclipse Collections API under Eclipse Public License - v 1.0
   Eclipse Collections Main Library under Eclipse Public License - v 1.0
   FreeMarker under Apache License, Version 2.0
-  h2 under EPL 1.0
-  HyperSQL Database under HSQLDB License, a BSD open source license
   JCL 1.1.1 implemented over SLF4J under MIT License
   JGraphT - Core under Eclipse Public License (EPL) 1.0
   Joda time under Apache 2
-  Microsoft JDBC Driver for SQL Server under MIT License
   obevo-core under The Apache License, Version 2.0
   obevo-db under The Apache License, Version 2.0
-  obevo-db-h2 under The Apache License, Version 2.0
-  obevo-db-hsql under The Apache License, Version 2.0
   obevo-dbmetadata-impl under The Apache License, Version 2.0
   obevo-internal-comparer under The Apache License, Version 2.0
   opencsv under Apache 2
-  PostgreSQL JDBC Driver - JDBC 4.1 under The PostgreSQL License
   SchemaCrawler under Eclipse Public License - v 1.0
   SchemaCrawler for HyperSQL under Eclipse Public License - v 1.0
   SchemaCrawler for IBM DB2 under Eclipse Public License - v 1.0

diff --git a/obevo-db-impls/obevo-db-db2/obevo-db-db2.iml b/obevo-db-impls/obevo-db-db2/obevo-db-db2.iml
@@ -41,10 +41,8 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: us.fatehi:schemacrawler-hsqldb:14.16.01-java7" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: us.fatehi:schemacrawler-sybaseiq:14.16.01-java7" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: us.fatehi:schemacrawler-postgresql:14.16.01-java7" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.postgresql:postgresql:42.1.1.jre7" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: us.fatehi:schemacrawler-oracle:14.16.01-java7" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: us.fatehi:schemacrawler-sqlserver:14.16.01-java7" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.microsoft.sqlserver:mssql-jdbc:6.1.0.jre7" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: us.fatehi:schemacrawler-db2:14.16.01-java7" level="project" />
     <orderEntry type="module" module-name="obevo-db-h2" />
     <orderEntry type="library" name="Maven: com.h2database:h2:1.4.187" level="project" />

diff --git a/obevo-db-impls/obevo-db-h2/NOTICE.txt b/obevo-db-impls/obevo-db-h2/NOTICE.txt
@@ -27,17 +27,14 @@ This product depends on (links to) the following software:
   Eclipse Collections Main Library under Eclipse Public License - v 1.0
   FreeMarker under Apache License, Version 2.0
   h2 under EPL 1.0
-  HyperSQL Database under HSQLDB License, a BSD open source license
   JCL 1.1.1 implemented over SLF4J under MIT License
   JGraphT - Core under Eclipse Public License (EPL) 1.0
   Joda time under Apache 2
-  Microsoft JDBC Driver for SQL Server under MIT License
   obevo-core under The Apache License, Version 2.0
   obevo-db under The Apache License, Version 2.0
   obevo-dbmetadata-impl under The Apache License, Version 2.0
   obevo-internal-comparer under The Apache License, Version 2.0
   opencsv under Apache 2
-  PostgreSQL JDBC Driver - JDBC 4.1 under The PostgreSQL License
   SchemaCrawler under Eclipse Public License - v 1.0
   SchemaCrawler for HyperSQL under Eclipse Public License - v 1.0
   SchemaCrawler for IBM DB2 under Eclipse Public License - v 1.0