[rhino] 05/13: Use the upstream pom and relocate rhino:js to org.mozilla:rhino

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository rhino.

commit b5d295298a17a5be161036fe06091afec26f1433
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 19 16:13:38 2017 +0100

    Use the upstream pom and relocate rhino:js to org.mozilla:rhino
---
 debian/changelog |  2 ++
 debian/pom.xml   | 21 ---------------------
 debian/rules     | 11 ++---------
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae63aaf..b54f6b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ rhino (1.7.7-1) UNRELEASED; urgency=medium
     - Removed 04_bug_798642_800616.diff (fixed upstream)
     - Removed the build dependency on libxmlbeans-java
     - Require a Java 6 runtime or higher
+    - Use the pom from the upstream sources to install the Maven artifacts,
+      and relocate the old coordinates rhino:js to org.mozilla:rhino
   * Removed the transitional package rhino-doc
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
diff --git a/debian/pom.xml b/debian/pom.xml
deleted file mode 100644
index bade3a5..0000000
--- a/debian/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>rhino</groupId>
-	<artifactId>js</artifactId>
-	<version>1.7R3</version>
-	<packaging>jar</packaging>
-	<name>Rhino</name>
-	<description>Rhino is an open-source implementation of JavaScript written entirely in Java. It is typically embedded into Java applications to provide scripting to end users.</description>
-	<url>http://www.mozilla.org/rhino/</url>
-
-	<licenses>
-		<license>
-			<name>Mozilla Public License</name>
-			<url>http://www.mozilla.org/MPL/MPL-1.1.html</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
-</project>
diff --git a/debian/rules b/debian/rules
index 59352e6..381d4cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,6 @@ UVERSION	:= $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/~RC.//" | sed "s/~pre/
 
 BUILDDIR=build/rhino$(UVERSION)
 
-POM_VERSION          := $(UVERSION)
-MAVEN_REPO           := http://repository.sonatype.org/service/local/repositories/central/content
-
 clean::
 	rm -rf toolsrc/org/mozilla/javascript/tools/debugger/downloaded/*
 	rm -rf build
@@ -33,8 +30,8 @@ configure/rhino::
 	cp debian/src_from_treetable_article_see_bug409629/TreeTableModelAdapter.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/
 
 install/librhino-java::
-	mh_installpom -plibrhino-java -e$(UVERSION) debian/pom.xml
-	mh_installjar -plibrhino-java -e$(UVERSION) -l debian/pom.xml $(BUILDDIR)/js.jar
+	mh_installpom -plibrhino-java -e$(UVERSION) maven/maven-pom.xml --no-parent --relocate=rhino:js
+	mh_installjar -plibrhino-java -e$(UVERSION) -l maven/maven-pom.xml --usj-name=js $(BUILDDIR)/js.jar
 
 install/librhino-java-doc::
 	mv $(BUILDDIR)/javadoc $(BUILDDIR)/api
@@ -42,7 +39,3 @@ install/librhino-java-doc::
 
 get-orig-source:
 	uscan --force-download
-
-get-orig-pom:
-	wget -O debian/pom.xml $(MAVEN_REPO)/rhino/js/$(POM_VERSION)/js-$(POM_VERSION).pom
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/rhino.git