juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Bug fixes in examples.
Date Sun, 16 Dec 2018 16:33:22 GMT
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.git


The following commit(s) were added to refs/heads/master by this push:
     new 60089b3  Bug fixes in examples.
60089b3 is described below

commit 60089b326ed3db8cecfca517be89a83c4ea7d803
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Sun Dec 16 11:33:11 2018 -0500

    Bug fixes in examples.
---
 .../juneau-microservice-jetty-template/build-overlay/pom.xml            | 2 +-
 juneau-microservice/juneau-microservice-jetty-template/pom.xml          | 2 +-
 .../juneau-microservice-jetty-template/src/assembly/bin.xml             | 2 +-
 juneau-microservice/juneau-microservice-springboot-template/pom.xml     | 2 +-
 .../juneau-microservice-springboot-template/src/assembly/bin.xml        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
index 9fd8101..48f2cbe 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
@@ -73,7 +73,7 @@
 							<resources>
 								<resource>
 									<directory>.</directory>
-									<includes>my-microservice.cfg</includes>
+									<includes>my-jetty-microservice.cfg</includes>
 								</resource>
 							</resources>
 						</configuration>
diff --git a/juneau-microservice/juneau-microservice-jetty-template/pom.xml b/juneau-microservice/juneau-microservice-jetty-template/pom.xml
index 4dca41c..0570209 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty-template/pom.xml
@@ -68,7 +68,7 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<finalName>my-microservice-jetty-${project.version}</finalName>
+							<finalName>my-jetty-microservice-${project.version}</finalName>
 							<descriptors>
 								<descriptor>src/assembly/bin.xml</descriptor>
 							</descriptors>
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/assembly/bin.xml b/juneau-microservice/juneau-microservice-jetty-template/src/assembly/bin.xml
index e9467fb..6077ee7 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/src/assembly/bin.xml
+++ b/juneau-microservice/juneau-microservice-jetty-template/src/assembly/bin.xml
@@ -34,7 +34,7 @@
 			<includes>
 				<include>src/main/**</include>
 				<include>.settings/**</include>
-				<include>my-microservice.cfg</include>
+				<include>*.cfg</include>
 			</includes>
 		</fileSet>
 		<fileSet>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/pom.xml b/juneau-microservice/juneau-microservice-springboot-template/pom.xml
index ee13663..16f8af1 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/pom.xml
+++ b/juneau-microservice/juneau-microservice-springboot-template/pom.xml
@@ -73,7 +73,7 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<finalName>my-microservice-${project.version}</finalName>
+							<finalName>my-springboot-microservice-${project.version}</finalName>
 							<descriptors>
 								<descriptor>src/assembly/bin.xml</descriptor>
 							</descriptors>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/assembly/bin.xml
b/juneau-microservice/juneau-microservice-springboot-template/src/assembly/bin.xml
index 1c4f696..c396055 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/src/assembly/bin.xml
+++ b/juneau-microservice/juneau-microservice-springboot-template/src/assembly/bin.xml
@@ -38,7 +38,7 @@
 				<include>files/**</include>
 				<include>META-INF/**</include>
 				<include>jetty.xml</include>
-				<include>my-microservice.cfg</include>
+				<include>*.cfg</include>
 			</includes>
 		</fileSet>
 		<fileSet>


Mime
View raw message