Fix standalone module dependencies

nbbrd · Jul 26, 2023 · bff4ed9 · bff4ed9
1 parent 385d5c1
commit bff4ed9
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 6 deletions.
diff --git a/sdmx-dl-format-protobuf/pom.xml b/sdmx-dl-format-protobuf/pom.xml
@@ -56,10 +56,30 @@
             <artifactId>protobuf-java-util</artifactId>
             <version>${protobuf.version}</version>
             <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.google.errorprone</groupId>
                     <artifactId>error_prone_annotations</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.j2objc</groupId>
+                    <artifactId>j2objc-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>failureaccess</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>listenablefuture</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

diff --git a/sdmx-dl-standalone/pom.xml b/sdmx-dl-standalone/pom.xml
@@ -22,6 +22,16 @@
             <artifactId>sdmx-dl-provider-ri</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdmx-dl-format-kryo</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -50,6 +60,7 @@
                                 <exclude>META-INF/NOTICE</exclude>
                                 <exclude>META-INF/LICENSE</exclude>
                                 <exclude>META-INF/LICENSE.txt</exclude>
+                                <exclude>**/*.proto</exclude>
                             </excludes>
                         </filter>
                     </filters>
@@ -63,26 +74,36 @@
                     <relocations>
                         <relocation>
                             <pattern>sdmxdl.format</pattern>
-                            <shadedPattern>standalone.sdmxdl.format</shadedPattern>
+                            <shadedPattern>standalone_sdmxdl.sdmxdl.format</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>sdmxdl.provider</pattern>
-                            <shadedPattern>standalone.sdmxdl.provider</shadedPattern>
+                            <shadedPattern>standalone_sdmxdl.sdmxdl.provider</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>internal</pattern>
-                            <shadedPattern>standalone.internal</shadedPattern>
+                            <shadedPattern>standalone_sdmxdl.internal</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>nbbrd</pattern>
-                            <shadedPattern>standalone.nbbrd</shadedPattern>
+                            <shadedPattern>standalone_sdmxdl.nbbrd</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>com</pattern>
-                            <shadedPattern>standalone.com</shadedPattern>
+                            <shadedPattern>standalone_sdmxdl.com</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>nl</pattern>
+                            <shadedPattern>standalone_sdmxdl.nl</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org</pattern>
+                            <shadedPattern>standalone_sdmxdl.org</shadedPattern>
                         </relocation>
                     </relocations>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <createDependencyReducedPom>true</createDependencyReducedPom>
+                    <useDependencyReducedPomInJar>true</useDependencyReducedPomInJar>
+                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
                 </configuration>
             </plugin>
         </plugins>