[booster-release] Remove classifier in Spring Boot Maven plugin confi…

…guration and adapt failsafe configuration accordingly.
snowdrop · Jun 29, 2018 · 1eac1c2 · 1eac1c2
1 parent d48f466
commit 1eac1c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/.openshiftio/application.yaml b/.openshiftio/application.yaml
@@ -33,7 +33,7 @@ parameters:
 - name: ARTIFACT_COPY_ARGS
   description: Syntax to be used to copy uberjar files to the target directory
   displayName: Copy Args
-  value: '*-exec.jar'
+  value: '*.jar'
   required: true
 - name: GITHUB_WEBHOOK_SECRET
   description: A secret string used to configure the GitHub webhook.

diff --git a/pom.xml b/pom.xml
@@ -14,36 +14,29 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.openshift</groupId>
     <artifactId>booster-parent</artifactId>
     <version>22</version>
   </parent>
-
   <groupId>io.openshift.booster</groupId>
   <artifactId>spring-boot-rest-http</artifactId>
   <version>1.5.14-1-SNAPSHOT</version>
-
   <name>Spring Boot - HTTP Booster</name>
   <description>Spring Boot - HTTP Booster</description>
-
   <properties>
     <spring-boot-bom.version>1.5.14.Final</spring-boot-bom.version>
     <spring-boot.version>1.5.14.RELEASE</spring-boot.version>
-
     <arquillian.version>1.4.0.Final</arquillian.version>
     <awaitility.version>3.1.0</awaitility.version>
     <rest-assured.version>3.1.0</rest-assured.version>
-
     <openjdk18-openshift.version>1.3</openjdk18-openshift.version>
     <fabric8.generator.from>
       registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:${openjdk18-openshift.version}
     </fabric8.generator.from>
   </properties>
-
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -52,7 +45,6 @@
       <comments>A business-friendly OSS license</comments>
     </license>
   </licenses>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -81,7 +73,6 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -151,7 +142,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
   <build>
     <resources>
       <resource>
@@ -178,9 +168,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
-        <configuration>
-          <classifier>exec</classifier>
-        </configuration>
+        <configuration/>
         <executions>
           <execution>
             <goals>
@@ -191,7 +179,6 @@
       </plugin>
     </plugins>
   </build>
-
   <profiles>
     <profile>
       <id>openshift-it</id>
@@ -204,6 +191,7 @@
               <systemPropertyVariables>
                 <app.name>${project.artifactId}</app.name>
               </systemPropertyVariables>
+              <classesDirectory>${project.build.directory}/${project.build.finalName}.${project.packaging}.original</classesDirectory>
             </configuration>
             <executions>
               <execution>