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 66cde05 Fix issues when loading workspace from scratch.
66cde05 is described below
commit 66cde05cd303c7aa38e57feb6df33603145d3a0f
Author: JamesBognar <[email protected]>
AuthorDate: Mon Jul 1 13:39:32 2019 -0400
Fix issues when loading workspace from scratch.
---
.../build-overlay/.classpath.2} | 0
.../build-overlay/{.project => .project.2} | 0
...rvice.launch => my-jetty-microservice.launch.2} | 0
.../build-overlay/{pom2.xml => pom.xml.2} | 0
.../src/assembly/bin.xml | 22 ++++++++++++++++++++--
.../build-overlay/.classpath.2} | 0
.../build-overlay/{.project => .project.2} | 0
....launch => my-springboot-microservice.launch.2} | 0
.../build-overlay/{pom2.xml => pom.xml.2} | 0
.../src/assembly/bin.xml | 22 ++++++++++++++++++++--
pom.xml | 1 +
11 files changed, 41 insertions(+), 4 deletions(-)
diff --git
a/juneau-microservice/juneau-my-springboot-microservice/build-overlay/.classpath
b/juneau-microservice/juneau-my-jetty-microservice/build-overlay/.classpath.2
similarity index 100%
rename from
juneau-microservice/juneau-my-springboot-microservice/build-overlay/.classpath
rename to
juneau-microservice/juneau-my-jetty-microservice/build-overlay/.classpath.2
diff --git
a/juneau-microservice/juneau-my-jetty-microservice/build-overlay/.project
b/juneau-microservice/juneau-my-jetty-microservice/build-overlay/.project.2
similarity index 100%
rename from
juneau-microservice/juneau-my-jetty-microservice/build-overlay/.project
rename to
juneau-microservice/juneau-my-jetty-microservice/build-overlay/.project.2
diff --git
a/juneau-microservice/juneau-my-jetty-microservice/build-overlay/my-jetty-microservice.launch
b/juneau-microservice/juneau-my-jetty-microservice/build-overlay/my-jetty-microservice.launch.2
similarity index 100%
rename from
juneau-microservice/juneau-my-jetty-microservice/build-overlay/my-jetty-microservice.launch
rename to
juneau-microservice/juneau-my-jetty-microservice/build-overlay/my-jetty-microservice.launch.2
diff --git
a/juneau-microservice/juneau-my-jetty-microservice/build-overlay/pom2.xml
b/juneau-microservice/juneau-my-jetty-microservice/build-overlay/pom.xml.2
similarity index 100%
rename from
juneau-microservice/juneau-my-jetty-microservice/build-overlay/pom2.xml
rename to
juneau-microservice/juneau-my-jetty-microservice/build-overlay/pom.xml.2
diff --git
a/juneau-microservice/juneau-my-jetty-microservice/src/assembly/bin.xml
b/juneau-microservice/juneau-my-jetty-microservice/src/assembly/bin.xml
index b6222a6..32c0858 100644
--- a/juneau-microservice/juneau-my-jetty-microservice/src/assembly/bin.xml
+++ b/juneau-microservice/juneau-my-jetty-microservice/src/assembly/bin.xml
@@ -41,12 +41,30 @@
<directory>${basedir}/build-overlay</directory>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
- <excludes><exclude>pom2.xml</exclude></excludes>
+ <excludes><exclude>**/*.2</exclude></excludes>
</fileSet>
</fileSets>
<files>
<file>
- <source>${basedir}/build-overlay/pom2.xml</source>
+ <source>${basedir}/build-overlay/.classpath.2</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <destName>.classpath</destName>
+ </file>
+ <file>
+ <source>${basedir}/build-overlay/.project.2</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <destName>.project</destName>
+ </file>
+ <file>
+
<source>${basedir}/build-overlay/my-jetty-microservice.launch.2</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <destName>my-jetty-microservice.launch</destName>
+ </file>
+ <file>
+ <source>${basedir}/build-overlay/pom.xml.2</source>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
<destName>pom.xml</destName>
diff --git
a/juneau-microservice/juneau-my-jetty-microservice/build-overlay/.classpath
b/juneau-microservice/juneau-my-springboot-microservice/build-overlay/.classpath.2
similarity index 100%
rename from
juneau-microservice/juneau-my-jetty-microservice/build-overlay/.classpath
rename to
juneau-microservice/juneau-my-springboot-microservice/build-overlay/.classpath.2
diff --git
a/juneau-microservice/juneau-my-springboot-microservice/build-overlay/.project
b/juneau-microservice/juneau-my-springboot-microservice/build-overlay/.project.2
similarity index 100%
rename from
juneau-microservice/juneau-my-springboot-microservice/build-overlay/.project
rename to
juneau-microservice/juneau-my-springboot-microservice/build-overlay/.project.2
diff --git
a/juneau-microservice/juneau-my-springboot-microservice/build-overlay/my-springboot-microservice.launch
b/juneau-microservice/juneau-my-springboot-microservice/build-overlay/my-springboot-microservice.launch.2
similarity index 100%
rename from
juneau-microservice/juneau-my-springboot-microservice/build-overlay/my-springboot-microservice.launch
rename to
juneau-microservice/juneau-my-springboot-microservice/build-overlay/my-springboot-microservice.launch.2
diff --git
a/juneau-microservice/juneau-my-springboot-microservice/build-overlay/pom2.xml
b/juneau-microservice/juneau-my-springboot-microservice/build-overlay/pom.xml.2
similarity index 100%
rename from
juneau-microservice/juneau-my-springboot-microservice/build-overlay/pom2.xml
rename to
juneau-microservice/juneau-my-springboot-microservice/build-overlay/pom.xml.2
diff --git
a/juneau-microservice/juneau-my-springboot-microservice/src/assembly/bin.xml
b/juneau-microservice/juneau-my-springboot-microservice/src/assembly/bin.xml
index 14c41da..7f6b2a9 100644
--- a/juneau-microservice/juneau-my-springboot-microservice/src/assembly/bin.xml
+++ b/juneau-microservice/juneau-my-springboot-microservice/src/assembly/bin.xml
@@ -45,12 +45,30 @@
<directory>${basedir}/build-overlay</directory>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
- <excludes><exclude>pom2.xml</exclude></excludes>
+ <excludes><exclude>**/*.2</exclude></excludes>
</fileSet>
</fileSets>
<files>
<file>
- <source>${basedir}/build-overlay/pom2.xml</source>
+ <source>${basedir}/build-overlay/.classpath.2</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <destName>.classpath</destName>
+ </file>
+ <file>
+ <source>${basedir}/build-overlay/.project.2</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <destName>.project</destName>
+ </file>
+ <file>
+
<source>${basedir}/build-overlay/my-springboot-microservice.launch.2</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <destName>my-springboot-microservice.launch</destName>
+ </file>
+ <file>
+ <source>${basedir}/build-overlay/pom.xml.2</source>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
<destName>pom.xml</destName>
diff --git a/pom.xml b/pom.xml
index dc53320..0543be0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,6 +166,7 @@
<exclude>**/.settings/**</exclude>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
+ <exclude>**/*.2</exclude>
<exclude>**/*.launch</exclude>
<!-- Generated by embedded
jetty server -->
