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: Fix template dependencies.
Date Wed, 12 Dec 2018 01:00:54 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 c3e6da5  Fix template dependencies.
c3e6da5 is described below

commit c3e6da5747e546b8b00e1fd7b75f86f63e00ab63
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Tue Dec 11 20:00:33 2018 -0500

    Fix template dependencies.
---
 .../01.Installing.html                             |   3 +-
 .../01.Classes.html                                |   2 +-
 .../build-overlay/pom.xml                          |   4 +-
 .../juneau-examples-rest-springboot/.classpath     |   6 -
 .../build-overlay/.classpath                       |   7 +-
 .../build-overlay/Procfile                         |   2 +-
 .../build-overlay/pom.xml                          |   4 +-
 .../build-overlay/pom.xml                          |   7 +-
 .../juneau-microservice-jetty-template/pom.xml     |   2 +-
 .../build-overlay/pom.xml                          | 145 +++++++++++----------
 .../pom.xml                                        |   6 +-
 .../org/apache/juneau/microservice/sample/App.java |   1 -
 juneau-microservice/pom.xml                        |   1 +
 13 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/01.Installing.html
b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/01.Installing.html
index 7ab67b3..6191c24 100644
--- a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/01.Installing.html
+++ b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/01.Installing.html
@@ -87,10 +87,11 @@
 	}
 		</p>
 	<li>
-		<l>my-microservice.cfg</l> - The external configuration file. 
+		<l>juneau.cfg</l> - The configuration file. 
 		<br>Contains various useful settings.
 		<br>Can be used for your own resource configurations.
 		<br>Note that the Jetty configuration is not present.
+		<br>Also it's located in the classpath so that our microservice can be built as a
single executable jar. 
 		<br><br>
 		<p class='bcode w800'>
 	<cc>#=======================================================================================================================
diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Classes.html b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Classes.html
index d569c44..9e57646 100644
--- a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Classes.html
+++ b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Classes.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{new} Classes
+{todo} Classes
 
 <p>
 	The <code>juneau-examples-rest-springboot</code> project contains the same classes
as found in <code>juneau-examples-rest</code>
diff --git a/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml b/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
index bdf1fa5..01cdba0 100644
--- a/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
@@ -25,8 +25,8 @@
 	
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.apache.juneau</groupId>
-	<artifactId>juneau-examples-rest</artifactId>
+	<groupId>org.apache.juneau.examples</groupId>
+	<artifactId>juneau-examples-rest-jetty</artifactId>
 	<name>Apache Juneau REST Examples</name>
 	<version>${version}</version>
 	<description>Sample code packaged as a microservice.</description>
diff --git a/juneau-examples/juneau-examples-rest-springboot/.classpath b/juneau-examples/juneau-examples-rest-springboot/.classpath
index 0dd9435..b8f9eed 100644
--- a/juneau-examples/juneau-examples-rest-springboot/.classpath
+++ b/juneau-examples/juneau-examples-rest-springboot/.classpath
@@ -22,11 +22,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-examples/juneau-examples-rest-springboot/build-overlay/.classpath b/juneau-examples/juneau-examples-rest-springboot/build-overlay/.classpath
index 968a4da..b8f9eed 100644
--- a/juneau-examples/juneau-examples-rest-springboot/build-overlay/.classpath
+++ b/juneau-examples/juneau-examples-rest-springboot/build-overlay/.classpath
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -17,6 +11,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="src/assembly"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/juneau-examples/juneau-examples-rest-springboot/build-overlay/Procfile b/juneau-examples/juneau-examples-rest-springboot/build-overlay/Procfile
index da47aa2..992aac9 100644
--- a/juneau-examples/juneau-examples-rest-springboot/build-overlay/Procfile
+++ b/juneau-examples/juneau-examples-rest-springboot/build-overlay/Procfile
@@ -1 +1 @@
-web: java -jar target/juneau-examples-rest-${version}.jar
\ No newline at end of file
+web: java -jar target/juneau-examples-rest-springboot-${version}.jar
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml b/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
index d0d9a8e..fe4b313 100644
--- a/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
@@ -25,8 +25,8 @@
 	
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.apache.juneau</groupId>
-	<artifactId>juneau-examples-rest</artifactId>
+	<groupId>org.apache.juneau.examples</groupId>
+	<artifactId>juneau-examples-rest-springboot</artifactId>
 	<name>Apache Juneau REST Examples</name>
 	<version>${version}</version>
 	<description>Sample code packaged as a microservice.</description>
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 57ae5e0..38b1518 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
@@ -28,11 +28,10 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	
-	<groupId>juneau-examples</groupId>
-	<artifactId>juneau-examples-rest-jetty</artifactId>
+	<groupId>my-microservices</groupId>
+	<artifactId>my-microservice</artifactId>
 	<version>${project.version}</version>
-	<name>Juneau REST Examples using Jetty</name>
-	<description>Juneau REST Examples using Jetty</description>
+	<name>Juneau REST start project using Jetty</name>
 	
 	<properties>
 		<juneau.version>${project.version}</juneau.version>
diff --git a/juneau-microservice/juneau-microservice-jetty-template/pom.xml b/juneau-microservice/juneau-microservice-jetty-template/pom.xml
index 1751afb..2709fa1 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty-template/pom.xml
@@ -32,7 +32,7 @@
 	</parent>
 
 	<artifactId>juneau-microservice-jetty-template</artifactId>
-	<name>Apache Juneau Microservice Template</name>
+	<name>Apache Juneau Jetty Microservice Template</name>
 	<description>A template project developers use to start with to create a microservice.</description>
 	
 	<properties>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
b/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
index 716977d..1d71e52 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
+++ b/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
@@ -15,7 +15,7 @@
 -->
 <!--
 	This project is meant to be used as a starting point for developers to use in creating their
own REST microservices.
-	It creates a parent REST interface on port 10000 with a single child hello-world resource.
+	It creates a Spring Boot application on port 5000 with a single child hello-world resource.
 	This POM is likewise meant to be used as a starting point for developers. It creates an
uber-jar
 	to run the microservice from the command line. 
 	
@@ -27,101 +27,112 @@
 <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/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	
-	<groupId>juneau-examples</groupId>
-	<artifactId>juneau-examples-rest-springboot</artifactId>
+
+	<groupId>my-microservices</groupId>
+	<artifactId>my-microservice</artifactId>
 	<version>${project.version}</version>
-	<name>Juneau REST Examples using Spring Boot</name>
-	<description>Juneau REST Examples using Spring Boot</description>
-	
+	<name>Juneau REST start project using Spring Boot</name>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>${springframework.version}</version>
+		<relativePath />
+	</parent>
+
 	<properties>
-		<juneau.version>${project.version}</juneau.version>
+		<encoding>UTF-8</encoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+		<maven.javadoc.skip>true</maven.javadoc.skip>
+		<javax.inject.version>${javax.inject.version}</javax.inject.version>
+		<juneau.version>${version}</juneau.version>
+		<jena.version>${jena.version}</jena.version>
 	</properties>
-	
+
 	<dependencies>
+
+		<!-- Juneau artifacts -->	
 		<dependency>
 			<groupId>org.apache.juneau</groupId>
-			<artifactId>juneau-microservice-server</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<artifactId>juneau-all</artifactId>
+			<version>\${juneau.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.juneau</groupId>
+			<artifactId>juneau-microservice-core</artifactId>
+			<version>\${juneau.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.juneau</groupId>
+			<artifactId>juneau-rest-server-springboot</artifactId>
+			<version>\${juneau.version}</version>
+		</dependency>
+				
+		<!-- Spring Boot dependencies-->
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>javax.inject</groupId>
+			<artifactId>javax.inject</artifactId>
+			<version>\${javax.inject.version}</version>
+		</dependency>
+
 	</dependencies>
-	
+
 	<build>
 		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-       			<version>3.0.2</version>
- 				<executions>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
 					<execution>
-						<id>package-config</id>
-						<phase>package</phase>
+						<id>attach-sources</id>
+						<phase>verify</phase>
 						<goals>
-							<goal>copy-resources</goal>
+							<goal>jar-no-fork</goal>
 						</goals>
-						<configuration>
-							<outputDirectory>target</outputDirectory>
-							<resources>
-								<resource>
-									<directory>.</directory>
-									<includes>my-microservice.cfg,jetty.xml</includes>
-								</resource>
-							</resources>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<mainClass>org.apache.juneau.microservice.springboot.App
-							</mainClass>
-						</manifest>
-						<manifestEntries>
-							<Main-Config>my-microservice.cfg</Main-Config>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.0.0</version>
-				<configuration>
-					<createDependencyReducedPom>false</createDependencyReducedPom>
-				</configuration>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
 				<executions>
 					<execution>
-						<phase>package</phase>
 						<goals>
-							<goal>shade</goal>
+							<goal>build-info</goal>
 						</goals>
 						<configuration>
-							<filters>
-								<filter>
-									<artifact>*:*</artifact>
-									<excludes>
-										<exclude>META-INF/*.SF</exclude>
-										<exclude>META-INF/*.RSA</exclude>
-										<exclude>META-INF/*.INF</exclude> <!-- This one may not be required
-->
-									</excludes>
-								</filter>
-							</filters>
+							<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>
 		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 	</build>
 </project>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/pom.xml b/juneau-microservice/juneau-microservice-springboot-template/pom.xml
index 32e53eb..57431b8 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/pom.xml
+++ b/juneau-microservice/juneau-microservice-springboot-template/pom.xml
@@ -32,7 +32,7 @@
 	</parent>
 
 	<artifactId>juneau-microservice-springboot-template</artifactId>
-	<name>Apache Juneau Microservice Template</name>
+	<name>Apache Juneau Spring Boot Microservice Template</name>
 	<description>A template project developers use to start with to create a microservice.</description>
 	
 	<properties>
@@ -43,12 +43,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.juneau</groupId>
-			<artifactId>juneau-examples-rest</artifactId>
+			<artifactId>juneau-rest-server-springboot</artifactId>
 			<version>${juneau.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.juneau</groupId>
-			<artifactId>juneau-rest-server-springboot</artifactId>
+			<artifactId>juneau-microservice-core</artifactId>
 			<version>${juneau.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/App.java
b/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/App.java
index 2e0fe42..58adf18 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/App.java
+++ b/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/App.java
@@ -12,7 +12,6 @@
 // ***************************************************************************************************************************
 package org.apache.juneau.microservice.sample;
 
-import org.apache.juneau.examples.rest.RootResources;
 import org.apache.juneau.rest.springboot.*;
 import org.apache.juneau.rest.springboot.annotation.*;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/juneau-microservice/pom.xml b/juneau-microservice/pom.xml
index edc2850..33b8d83 100644
--- a/juneau-microservice/pom.xml
+++ b/juneau-microservice/pom.xml
@@ -33,6 +33,7 @@
 		<module>juneau-microservice-jetty</module>
 		<module>juneau-microservice-jetty-template</module>
 		<module>juneau-microservice-test</module>
+		<module>juneau-microservice-springboot-template</module>
 	</modules>
 
 </project>


Mime
View raw message