Repository: zeppelin Updated Branches: refs/heads/branch-0.6 8f8b056da -> cc4ff29a6
[HOTFIX] change 1.5-SNAPSHOT to 1.5-20160502.230123-45 ### What is this PR for? This is to fix CI which is mostly failing for resource org.apache.apache.resources:apache-jar-resource-bundle:1.5-SNAPSHOT, until the resource is generated in https://repository.apache.org/content/groups/snapshots/org/apache/apache/resources/apache-jar-resource-bundle/1.5-SNAPSHOT/ ### What type of PR is it? [Hot Fix] ### How should this be tested? CI should be green ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Prabhjyot Singh <[email protected]> Closes #1250 from prabhjyotsingh/hotfix/apache-jar-resource-bundle and squashes the following commits: a14e160 [Prabhjyot Singh] usage as mentioned in http://maven.apache.org/plugins/maven-remote-resources-plugin/usage.html 1e05545 [Prabhjyot Singh] org.apache:apache-jar-resource-bundle:1.0 514c799 [Prabhjyot Singh] change 1.5-SNAPSHOT to 1.5-20160502.230123-45 (cherry picked from commit 6eb2cc5abe2512b584127edbd2e5710774b84c18) Signed-off-by: Mina Lee <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/cc4ff29a Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/cc4ff29a Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/cc4ff29a Branch: refs/heads/branch-0.6 Commit: cc4ff29a6266737484b5a7b6c76a3b8a60ca635e Parents: 8f8b056 Author: Prabhjyot Singh <[email protected]> Authored: Sat Jul 30 14:38:10 2016 +0530 Committer: Mina Lee <[email protected]> Committed: Sun Jul 31 11:38:53 2016 +0900 ---------------------------------------------------------------------- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cc4ff29a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f615ab9..36b1f99 100644 --- a/pom.xml +++ b/pom.xml @@ -342,18 +342,17 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.4</version> + <version>1.5</version> <executions> <execution> + <id>process-remote-resources</id> <goals> <goal>process</goal> </goals> <configuration> <resourceBundles> - <!-- Will generate META-INF/DEPENDENCIES META-INF/LICENSE META-INF/NOTICE --> - <resourceBundle>org.apache.apache.resources:apache-jar-resource-bundle:1.5-SNAPSHOT</resourceBundle> + <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle> </resourceBundles> </configuration> </execution>
