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.
Date Tue, 11 Dec 2018 16:56:41 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 23db4c3  Fix build.
23db4c3 is described below

commit 23db4c3e5454f0fe855c2e6518c4085b28bb9115
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Tue Dec 11 11:56:30 2018 -0500

    Fix build.
---
 juneau-doc/pom.xml                                 |  2 +-
 .../juneau-microservice-jetty/pom.xml              | 13 ++++++++
 juneau-releng/juneau-distrib/pom.xml               | 38 +++++++++++-----------
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/juneau-doc/pom.xml b/juneau-doc/pom.xml
index 0b9c310..7adcf1b 100644
--- a/juneau-doc/pom.xml
+++ b/juneau-doc/pom.xml
@@ -79,7 +79,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.juneau</groupId>
-			<artifactId>juneau-microservice-server</artifactId>
+			<artifactId>juneau-microservice-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/juneau-microservice/juneau-microservice-jetty/pom.xml b/juneau-microservice/juneau-microservice-jetty/pom.xml
index 7642a1d..44556d6 100644
--- a/juneau-microservice/juneau-microservice-jetty/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty/pom.xml
@@ -70,6 +70,19 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<!--plugin>
 				<groupId>com.github.siom79.japicmp</groupId>
 				<artifactId>japicmp-maven-plugin</artifactId>
diff --git a/juneau-releng/juneau-distrib/pom.xml b/juneau-releng/juneau-distrib/pom.xml
index 2135b95..c0fb793 100644
--- a/juneau-releng/juneau-distrib/pom.xml
+++ b/juneau-releng/juneau-distrib/pom.xml
@@ -211,11 +211,11 @@
 									<version>${project.version}</version>
 									<destFileName>org.apache.juneau.rest.server.jaxrs_${project.version}.jar</destFileName>
 								</artifactItem>
-
+								
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-rest-client</artifactId>
+									<artifactId>juneau-rest-server-springboot</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>
 									<classifier>sources</classifier>
@@ -223,21 +223,21 @@
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-rest-client</artifactId>
+									<artifactId>juneau-rest-server-springboot</artifactId>
 									<version>${project.version}</version>
 								</artifactItem>
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-rest-client</artifactId>
+									<artifactId>juneau-rest-server-springboot</artifactId>
 									<version>${project.version}</version>
-									<destFileName>org.apache.juneau.rest.client_${project.version}.jar</destFileName>
+									<destFileName>org.apache.juneau.rest.server.springboot_${project.version}.jar</destFileName>
 								</artifactItem>
 
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-microservice-core</artifactId>
+									<artifactId>juneau-rest-client</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>
 									<classifier>sources</classifier>
@@ -245,21 +245,21 @@
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-microservice-core</artifactId>
+									<artifactId>juneau-rest-client</artifactId>
 									<version>${project.version}</version>
 								</artifactItem>
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-microservice-core</artifactId>
+									<artifactId>juneau-rest-client</artifactId>
 									<version>${project.version}</version>
-									<destFileName>org.apache.juneau.microservice.core_${project.version}.jar</destFileName>
+									<destFileName>org.apache.juneau.rest.client_${project.version}.jar</destFileName>
 								</artifactItem>
-								
+
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-microservice-jetty</artifactId>
+									<artifactId>juneau-microservice-core</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>
 									<classifier>sources</classifier>
@@ -267,21 +267,21 @@
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-microservice-jetty</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-jetty</artifactId>
+									<artifactId>juneau-microservice-core</artifactId>
 									<version>${project.version}</version>
-									<destFileName>org.apache.juneau.microservice.jetty_${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-springboot</artifactId>
+									<artifactId>juneau-microservice-jetty</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>
 									<classifier>sources</classifier>
@@ -289,15 +289,15 @@
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-microservice-springboot</artifactId>
+									<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-springboot</artifactId>
+									<artifactId>juneau-microservice-jetty</artifactId>
 									<version>${project.version}</version>
-									<destFileName>org.apache.juneau.microservice.springboot_${project.version}.jar</destFileName>
+									<destFileName>org.apache.juneau.microservice.jetty_${project.version}.jar</destFileName>
 								</artifactItem>
 
 								<artifactItem>


Mime
View raw message