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 2017/09/02 14:37:13 UTC
incubator-juneau git commit: Fix Jenkins build.
Repository: incubator-juneau
Updated Branches:
refs/heads/master 7ebae9328 -> a18ab74e8
Fix Jenkins build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/a18ab74e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/a18ab74e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/a18ab74e
Branch: refs/heads/master
Commit: a18ab74e8e17523e5161b1e078ad943aa703f7e9
Parents: 7ebae93
Author: JamesBognar <ja...@apache.org>
Authored: Sat Sep 2 10:37:10 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Sat Sep 2 10:37:10 2017 -0400
----------------------------------------------------------------------
.../juneau-microservice-template/dependency-reduced-pom.xml | 6 +++++-
juneau-rest/juneau-microservice-template/pom.xml | 7 ++++++-
pom.xml | 3 +++
3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/a18ab74e/juneau-rest/juneau-microservice-template/dependency-reduced-pom.xml
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-microservice-template/dependency-reduced-pom.xml b/juneau-rest/juneau-microservice-template/dependency-reduced-pom.xml
index 8290f7f..ffefa16 100644
--- a/juneau-rest/juneau-microservice-template/dependency-reduced-pom.xml
+++ b/juneau-rest/juneau-microservice-template/dependency-reduced-pom.xml
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>juneau-rest</artifactId>
+ <groupId>org.apache.juneau</groupId>
+ <version>6.3.2-incubating-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>juneau-microservice-template</groupId>
<artifactId>juneau-microservice-template</artifactId>
<name>Apache Juneau Microservice Template</name>
<version>6.3.2</version>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/a18ab74e/juneau-rest/juneau-microservice-template/pom.xml
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-microservice-template/pom.xml b/juneau-rest/juneau-microservice-template/pom.xml
index fcf7191..99e0265 100644
--- a/juneau-rest/juneau-microservice-template/pom.xml
+++ b/juneau-rest/juneau-microservice-template/pom.xml
@@ -28,7 +28,12 @@
<modelVersion>4.0.0</modelVersion>
- <groupId>juneau-microservice-template</groupId>
+ <parent>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest</artifactId>
+ <version>6.3.2-incubating-SNAPSHOT</version>
+ </parent>
+
<artifactId>juneau-microservice-template</artifactId>
<version>6.3.2</version>
<name>Apache Juneau Microservice Template</name>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/a18ab74e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8ffbad1..58ace9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,9 @@
<!-- Generated by embedded jetty server -->
<exclude>**/jetty.out.xml</exclude>
+
+ <!-- Generated in juneau-microservice-template for some reason -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
</excludes>
<consoleOutput>true</consoleOutput>
<!-- Note: useEclipseDefaultExcludes does not work for subprojects. See RAT-107 -->