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 2018/11/03 14:32:42 UTC
[juneau] branch master updated: JUNEAU-89 errors in
juneau-examples-rest
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 b36f8bf JUNEAU-89 errors in juneau-examples-rest
b36f8bf is described below
commit b36f8bfbf9d3e1995c9945e5d7200ce69d6bd9ce
Author: JamesBognar <ja...@apache.org>
AuthorDate: Sat Nov 3 10:32:26 2018 -0400
JUNEAU-89 errors in juneau-examples-rest
---
.../juneau-examples-rest/build-overlay/.classpath | 4 +--
.../juneau-examples-rest/build-overlay/pom.xml | 38 +++++++++++++++++++++-
.../juneau-examples-rest/src/assembly/bin.xml | 2 +-
3 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/juneau-examples/juneau-examples-rest/build-overlay/.classpath b/juneau-examples/juneau-examples-rest/build-overlay/.classpath
index 644b8f9..968a4da 100644
--- a/juneau-examples/juneau-examples-rest/build-overlay/.classpath
+++ b/juneau-examples/juneau-examples-rest/build-overlay/.classpath
@@ -17,12 +17,12 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
diff --git a/juneau-examples/juneau-examples-rest/build-overlay/pom.xml b/juneau-examples/juneau-examples-rest/build-overlay/pom.xml
index 48a0a30..de220a0 100644
--- a/juneau-examples/juneau-examples-rest/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-rest/build-overlay/pom.xml
@@ -66,10 +66,27 @@
<version>${httpclient.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-server</artifactId>
+ <version>${version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>5.0.9.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>5.0.9.Final</version>
+ </dependency>
</dependencies>
<build>
@@ -107,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.3</version>
+ <!--version>2.4.3</version-->
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<minimizeJar>false</minimizeJar>
@@ -155,6 +172,25 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>juneau-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>juneau-examples-rest-${version}</finalName>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/juneau-examples/juneau-examples-rest/src/assembly/bin.xml b/juneau-examples/juneau-examples-rest/src/assembly/bin.xml
index 6f29fe6..9ea64e3 100644
--- a/juneau-examples/juneau-examples-rest/src/assembly/bin.xml
+++ b/juneau-examples/juneau-examples-rest/src/assembly/bin.xml
@@ -35,8 +35,8 @@
<include>src/main/**</include>
<include>src/test/**</include>
<include>.settings/**</include>
+ <include>files/**</include>
<include>.project</include>
- <include>jetty.xml</include>
<include>juneau-examples-rest.launch</include>
<include>examples.cfg</include>
</includes>