You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2019/10/14 13:54:29 UTC

[juneau-petstore] 10/22: JUNEAU-159 Package pet store application in jar format|FIX

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau-petstore.git

commit cd7024f444b53e659625a35e345d3ce19fa66ac8
Author: COMVIVA\ishita.singh <is...@mahindracomviva.com>
AuthorDate: Fri Oct 11 15:05:04 2019 +0530

    JUNEAU-159 Package pet store application in jar format|FIX
---
 juneau-petstore-server/pom.xml | 125 ++++++++++++++++++++++++++---------------
 1 file changed, 81 insertions(+), 44 deletions(-)

diff --git a/juneau-petstore-server/pom.xml b/juneau-petstore-server/pom.xml
index 362f799..f629098 100644
--- a/juneau-petstore-server/pom.xml
+++ b/juneau-petstore-server/pom.xml
@@ -16,11 +16,13 @@
 <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>
+    <version>8.1.2-SNAPSHOT</version>
 
     <parent>
-        <groupId>org.apache.juneau.petstore</groupId>
-        <artifactId>juneau-petstore</artifactId>
-        <version>8.1.2-SNAPSHOT</version>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.0.1.RELEASE</version>
+        <relativePath />
     </parent>
 
     <artifactId>juneau-petstore-server</artifactId>
@@ -29,7 +31,6 @@
 
     <properties>
         <encoding>UTF-8</encoding>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
 
         <!-- Skip javadoc generation since we generate them in the aggregate pom -->
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -37,9 +38,16 @@
         <!-- Java 8 required because Jetty requires it. -->
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <springframework.version>2.0.1.RELEASE</springframework.version>
+
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+
+        <juneau.version>8.1.2-SNAPSHOT</juneau.version>
+        <javax.inject.version>1</javax.inject.version>
+        <servlet.version>3.1.0</servlet.version>
+        <hibernate.version>5.0.9.Final</hibernate.version>
     </properties>
 
+    <packaging>war</packaging>
 
     <dependencies>
         <!-- Juneau dependencies -->
@@ -53,48 +61,31 @@
             <artifactId>juneau-rest-server-springboot</artifactId>
             <version>${juneau.version}</version>
         </dependency>
-        
-        <!-- Spring Boot dependencies-->
+
+        <!-- Needed for @Inject support -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>${springframework.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>${javax.inject.version}</version>
         </dependency>
 
-		<!-- Needed for @Inject support -->
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-			<version>${javax.inject.version}</version>
-		</dependency>
-
-		<!-- Needed for JPA persistence of PetStore beans -->		
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>${derby.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
-			<version>${hibernate.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<version>${hibernate.version}</version>
-		</dependency>
-		<dependency>
-		    <groupId>xml-apis</groupId>
-		    <artifactId>xml-apis</artifactId>
-		    <version>${xml.apis.version}</version>
-		</dependency>
+        <!-- Needed for JPA persistence of PetStore beans -->
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+        </dependency>
 
     </dependencies>
 
@@ -113,6 +104,52 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build-info</goal>
+                        </goals>
+                        <configuration>
+                            <additionalProperties>
+                                <encoding.source>${project.build.sourceEncoding}</encoding.source>
+                                <encoding.reporting>${project.reporting.outputEncoding}</encoding.reporting>
+                                <java.source>${maven.compiler.source}</java.source>
+                                <java.target>${maven.compiler.target}</java.target>
+                            </additionalProperties>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>