You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2022/03/06 10:28:21 UTC

[servicemix-bundles] branch master updated: [SM-5022] Add rhino-engine in the SMX rhino bundle

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git


The following commit(s) were added to refs/heads/master by this push:
     new 27e17d8  [SM-5022] Add rhino-engine in the SMX rhino bundle
27e17d8 is described below

commit 27e17d8a085c2c327764ac00838066af7d3a46b4
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Mar 6 11:27:57 2022 +0100

    [SM-5022] Add rhino-engine in the SMX rhino bundle
---
 pom.xml              |  1 +
 rhino-1.7.14/pom.xml | 33 ++++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 827baf2..2f4a163 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
     <name>Apache ServiceMix :: Bundles</name>
 
     <modules>
+	<module>rhino-1.7.14</module>
     </modules>
 
 </project>
diff --git a/rhino-1.7.14/pom.xml b/rhino-1.7.14/pom.xml
index 40c8282..56c6cc6 100644
--- a/rhino-1.7.14/pom.xml
+++ b/rhino-1.7.14/pom.xml
@@ -32,19 +32,17 @@
     <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
     <version>1.7.14_2-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+    <name>Apache ServiceMix :: Bundles :: rhino</name>
+    <description>This OSGi bundle wraps rhino and rhino-engine ${pkgVersion} jar files.</description>
 
     <scm>
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.mozilla</pkgGroupId>
-        <pkgArtifactId>rhino</pkgArtifactId>
         <pkgVersion>1.7.14</pkgVersion>
         <servicemix.osgi.export.pkg>
             org.mozilla
@@ -52,7 +50,6 @@
         <servicemix.osgi.import.pkg>
             javax.swing*;resolution:=optional,
             javax.xml*;resolution:=optional,
-            org.apache.xmlbeans*;resolution:=optional,
             org.w3c*;resolution:=optional,
             org.xml*;resolution:=optional
         </servicemix.osgi.import.pkg>
@@ -62,14 +59,25 @@
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
+            <artifactId>rhino</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>rhino-engine</artifactId>
             <version>${pkgVersion}</version>
         </dependency>
 
         <!-- sources -->
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
+            <artifactId>rhino</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>rhino-engine</artifactId>
             <version>${pkgVersion}</version>
             <classifier>sources</classifier>
         </dependency>
@@ -89,12 +97,19 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                    <include>${pkgGroupId}:rhino</include>
+                                    <include>${pkgGroupId}:rhino-engine</include>
                                 </includes>
                             </artifactSet>
                             <filters>
                                 <filter>
-                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <artifact>${pkgGroupId}:rhino</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:rhino-engine</artifact>
                                     <excludes>
                                         <exclude>**</exclude>
                                     </excludes>