fixed Spring 2 maven plugin jar packaging

SeldonIO · Jul 21, 2020 · c4434c6 · c4434c6
1 parent bda3837
commit c4434c6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/incubating/wrappers/java/.DS_Store b/incubating/wrappers/java/.DS_Store
diff --git a/incubating/wrappers/java/pom.xml b/incubating/wrappers/java/pom.xml
@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.seldon.wrapper</groupId>
@@ -10,9 +10,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <name>Seldon Core Java Wrapper</name>
   <url>http://maven.apache.org</url>
   <description>Wrapper for seldon-core Java prediction models.
-  Allows easy creation of a Spring Boot app with Tomcat and gRPC
-  servers for handling the microservice APIs for
-  seldon-core.</description>
+    Allows easy creation of a Spring Boot app with Tomcat and gRPC
+    servers for handling the microservice APIs for
+    seldon-core.</description>
   <organization>
     <name>Seldon</name>
     <url>https://www.seldon.io/</url>
@@ -23,6 +23,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
       <url>http://www.apache.org/licenses/LICENSE-2.0</url>
     </license>
   </licenses>
+
   <developers>
     <developer>
       <id>cc</id>
@@ -35,42 +36,45 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
       </roles>
     </developer>
   </developers>
+
   <scm>
     <connection>
-    scm:git:git://github.com/SeldonIO/seldon-core.git</connection>
+      scm:git:git://github.com/SeldonIO/seldon-core.git</connection>
     <url>https://github.com/SeldonIO/seldon-core/tree/master</url>
     <developerConnection>
-    scm:git:git@github.com:SeldonIO/seldon-core.git</developerConnection>
+      scm:git:git@github.com:SeldonIO/seldon-core.git</developerConnection>
   </scm>
+
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
     <version>2.2.4.RELEASE</version>
   </parent>
+
   <properties>
     <java.version>13</java.version>
     <maven.compiler.source>13</maven.compiler.source>
     <maven.compiler.target>13</maven.compiler.target>
-    <project.build.sourceEncoding>
-    UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>
-    UTF-8</project.reporting.outputEncoding>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <grpc.version>1.25.0</grpc.version>
     <pb.version>3.11.1</pb.version>
     <start-class>io.seldon.wrapper.App</start-class>
   </properties>
+
   <distributionManagement>
     <snapshotRepository>
       <id>ossrh</id>
       <url>
-      https://oss.sonatype.org/content/repositories/snapshots</url>
+        https://oss.sonatype.org/content/repositories/snapshots</url>
     </snapshotRepository>
     <repository>
       <id>ossrh</id>
       <url>
-      https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
     </repository>
   </distributionManagement>
+
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>
     <extensions>
@@ -85,11 +89,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
         <executions>
-          <execution>
+          <execution >
+            <id>repackage</id>
             <goals>
               <goal>repackage</goal>
             </goals>
-            <configuration>
+            <configuration combine.self="override">
               <classifier>exec</classifier>
             </configuration>
           </execution>
@@ -114,10 +119,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <version>0.6.1</version>
         <configuration>
           <protocArtifact>
-          com.google.protobuf:protoc:${pb.version}:exe:${os.detected.classifier}</protocArtifact>
+            com.google.protobuf:protoc:${pb.version}:exe:${os.detected.classifier}</protocArtifact>
           <pluginId>grpc-java</pluginId>
           <pluginArtifact>
-          io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+            io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
           <clearOutputDirectory>false</clearOutputDirectory>
           <checkStaleness>true</checkStaleness>
         </configuration>
@@ -194,6 +199,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
       </plugin>
     </plugins>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>