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 build issue.
Date Tue, 11 Dec 2018 15:23:35 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 efd3f88  Fix build issue.
     new cfe6542  Merge branch 'master' of https://gitbox.apache.org/repos/asf/juneau.git
efd3f88 is described below

commit efd3f889ff336470b84d32120b143cbed82ac0e6
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Tue Dec 11 10:22:32 2018 -0500

    Fix build issue.
---
 juneau-examples/juneau-examples-rest/.classpath    |  1 -
 .../juneau-examples-rest/src/assembly/bin.xml      | 51 ----------------
 juneau-releng/juneau-distrib/pom.xml               | 69 +++++++++++++++++++---
 3 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/juneau-examples/juneau-examples-rest/.classpath b/juneau-examples/juneau-examples-rest/.classpath
index 458e40d..968a4da 100644
--- a/juneau-examples/juneau-examples-rest/.classpath
+++ b/juneau-examples/juneau-examples-rest/.classpath
@@ -17,7 +17,6 @@
 			<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/src/assembly/bin.xml b/juneau-examples/juneau-examples-rest/src/assembly/bin.xml
deleted file mode 100644
index f8991cb..0000000
--- a/juneau-examples/juneau-examples-rest/src/assembly/bin.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
agreements.  See the NOTICE file *
- * distributed with this work for additional information regarding copyright ownership. 
The ASF licenses this file        *
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file
except in compliance            *
- * with the License.  You may obtain a copy of the License at                           
                                  *
- *                                                                                      
                                  *
- *  http://www.apache.org/licenses/LICENSE-2.0                                          
                                  *
- *                                                                                      
                                  *
- * Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the        *
- * specific language governing permissions and limitations under the License.           
                                  *
- ***************************************************************************************************************************
--->
-
-<!--
-	This assembly is used to create the template zip file that developers use to import into
Eclipse to start their
-	own projects.
- -->
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-	<id>bin</id>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<includeBaseDirectory>true</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${basedir}</directory>
-			<includes>
-				<include>src/main/**</include>
-				<include>src/test/**</include>
-				<include>.settings/**</include>
-				<include>files/**</include>
-				<include>.project</include>
-				<include>*.launch</include>
-				<include>*.cfg</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/build-overlay</directory>
-			<outputDirectory>/</outputDirectory>
-			<filtered>true</filtered>
-		</fileSet>
-	</fileSets>
-	
-</assembly>
\ No newline at end of file
diff --git a/juneau-releng/juneau-distrib/pom.xml b/juneau-releng/juneau-distrib/pom.xml
index 95edd6f..2135b95 100644
--- a/juneau-releng/juneau-distrib/pom.xml
+++ b/juneau-releng/juneau-distrib/pom.xml
@@ -237,7 +237,7 @@
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-microservice-server</artifactId>
+									<artifactId>juneau-microservice-core</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>
 									<classifier>sources</classifier>
@@ -245,15 +245,59 @@
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-microservice-server</artifactId>
+									<artifactId>juneau-microservice-core</artifactId>
 									<version>${project.version}</version>
 								</artifactItem>
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-microservice-server</artifactId>
+									<artifactId>juneau-microservice-core</artifactId>
 									<version>${project.version}</version>
-									<destFileName>org.apache.juneau.microservice.server_${project.version}.jar</destFileName>
+									<destFileName>org.apache.juneau.microservice.core_${project.version}.jar</destFileName>
+								</artifactItem>
+								
+								<artifactItem>
+									<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+									<groupId>org.apache.juneau</groupId>
+									<artifactId>juneau-microservice-jetty</artifactId>
+									<version>${project.version}</version>
+									<type>jar</type>
+									<classifier>sources</classifier>
+								</artifactItem>
+								<artifactItem>
+									<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+									<groupId>org.apache.juneau</groupId>
+									<artifactId>juneau-microservice-jetty</artifactId>
+									<version>${project.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+									<groupId>org.apache.juneau</groupId>
+									<artifactId>juneau-microservice-jetty</artifactId>
+									<version>${project.version}</version>
+									<destFileName>org.apache.juneau.microservice.jetty_${project.version}.jar</destFileName>
+								</artifactItem>
+
+								<artifactItem>
+									<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+									<groupId>org.apache.juneau</groupId>
+									<artifactId>juneau-microservice-springboot</artifactId>
+									<version>${project.version}</version>
+									<type>jar</type>
+									<classifier>sources</classifier>
+								</artifactItem>
+								<artifactItem>
+									<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+									<groupId>org.apache.juneau</groupId>
+									<artifactId>juneau-microservice-springboot</artifactId>
+									<version>${project.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+									<groupId>org.apache.juneau</groupId>
+									<artifactId>juneau-microservice-springboot</artifactId>
+									<version>${project.version}</version>
+									<destFileName>org.apache.juneau.microservice.springboot_${project.version}.jar</destFileName>
 								</artifactItem>
 
 								<artifactItem>
@@ -268,20 +312,29 @@
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/bin/projects</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-examples-rest</artifactId>
+									<artifactId>juneau-examples-rest-jetty</artifactId>
+									<classifier>bin</classifier>
+									<type>zip</type>
+									<version>${project.version}</version>
+									<destFileName>juneau-examples-rest-jetty-${project.version}.zip</destFileName>
+								</artifactItem>
+								<artifactItem>
+									<outputDirectory>${project.build.directory}/bin/projects</outputDirectory>
+									<groupId>org.apache.juneau</groupId>
+									<artifactId>juneau-examples-rest-springboot</artifactId>
 									<classifier>bin</classifier>
 									<type>zip</type>
 									<version>${project.version}</version>
-									<destFileName>juneau-examples-rest-${project.version}.zip</destFileName>
+									<destFileName>juneau-examples-rest-springboot-${project.version}.zip</destFileName>
 								</artifactItem>
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/bin/projects</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-microservice-template</artifactId>
+									<artifactId>juneau-microservice-jetty-template</artifactId>
 									<classifier>bin</classifier>
 									<type>zip</type>
 									<version>${project.version}</version>
-									<destFileName>my-microservice-${project.version}.zip</destFileName>
+									<destFileName>my-jetty-microservice-${project.version}.zip</destFileName>
 								</artifactItem>
 
 							</artifactItems>


Mime
View raw message