Repository: servicemix-bundles Updated Branches: refs/heads/master 691f8323b -> 0e9f6d1e2
SM-2856 - lucene-analyzers-common bundles should not export org.tartarus.snowball packages Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/0e9f6d1e Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/0e9f6d1e Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/0e9f6d1e Branch: refs/heads/master Commit: 0e9f6d1e24e7de9c42185f6b86f8d4fab0358424 Parents: 691f832 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Feb 15 16:52:35 2016 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Feb 15 16:52:35 2016 +0100 ---------------------------------------------------------------------- lucene-analyzers-common-4.8.1/pom.xml | 15 ++++++++++++--- lucene-analyzers-common-4.9.0/pom.xml | 15 ++++++++++++--- lucene-analyzers-common-5.0.0/pom.xml | 6 ++++-- lucene-analyzers-common-5.1.0/pom.xml | 6 ++++-- lucene-analyzers-common-5.2.1/pom.xml | 6 ++++-- lucene-analyzers-common-5.3.1/pom.xml | 6 ++++-- lucene-analyzers-common-5.4.0/pom.xml | 6 ++++-- lucene-analyzers-common-5.4.1/pom.xml | 6 ++++-- pom.xml | 8 ++++++++ 9 files changed, 56 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0e9f6d1e/lucene-analyzers-common-4.8.1/pom.xml ---------------------------------------------------------------------- diff --git a/lucene-analyzers-common-4.8.1/pom.xml b/lucene-analyzers-common-4.8.1/pom.xml index bda9145..4adebfe 100644 --- a/lucene-analyzers-common-4.8.1/pom.xml +++ b/lucene-analyzers-common-4.8.1/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>bundles-pom</artifactId> - <version>11</version> + <version>12</version> <relativePath>../bundles-pom/pom.xml</relativePath> </parent> @@ -35,6 +35,13 @@ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name> <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description> + <scm> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url> + <tag>HEAD</tag> + </scm> + <properties> <pkgGroupId>org.apache.lucene</pkgGroupId> <pkgArtifactId>lucene-analyzers-common</pkgArtifactId> @@ -42,8 +49,7 @@ <servicemix.osgi.export> !org.apache.lucene.analysis, !org.apache.lucene.analysis.tokenattributes, - org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first, - org.tartarus.snowball*;-split-package:=merge-first + org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.xml.parsers, @@ -57,6 +63,9 @@ org.xml.sax, org.xml.sax.helpers </servicemix.osgi.import.pkg> + <servicemix.osgi.private.pkg> + org.tartarus.snowball* + </servicemix.osgi.private.pkg> <servicemix.osgi.embed.dependency> *;inline=META-INF/services/* </servicemix.osgi.embed.dependency> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0e9f6d1e/lucene-analyzers-common-4.9.0/pom.xml ---------------------------------------------------------------------- diff --git a/lucene-analyzers-common-4.9.0/pom.xml b/lucene-analyzers-common-4.9.0/pom.xml index 9f872c1..9254831 100644 --- a/lucene-analyzers-common-4.9.0/pom.xml +++ b/lucene-analyzers-common-4.9.0/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>bundles-pom</artifactId> - <version>11</version> + <version>12</version> <relativePath>../bundles-pom/pom.xml</relativePath> </parent> @@ -35,6 +35,13 @@ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name> <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description> + <scm> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url> + <tag>HEAD</tag> + </scm> + <properties> <pkgGroupId>org.apache.lucene</pkgGroupId> <pkgArtifactId>lucene-analyzers-common</pkgArtifactId> @@ -42,8 +49,7 @@ <servicemix.osgi.export> !org.apache.lucene.analysis, !org.apache.lucene.analysis.tokenattributes, - org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first, - org.tartarus.snowball*;-split-package:=merge-first + org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.xml.parsers, @@ -57,6 +63,9 @@ org.xml.sax, org.xml.sax.helpers </servicemix.osgi.import.pkg> + <servicemix.osgi.private.pkg> + org.tartarus.snowball* + </servicemix.osgi.private.pkg> <servicemix.osgi.embed.dependency> *;inline=META-INF/services/* </servicemix.osgi.embed.dependency> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0e9f6d1e/lucene-analyzers-common-5.0.0/pom.xml ---------------------------------------------------------------------- diff --git a/lucene-analyzers-common-5.0.0/pom.xml b/lucene-analyzers-common-5.0.0/pom.xml index 7d47fce..b96e89b 100644 --- a/lucene-analyzers-common-5.0.0/pom.xml +++ b/lucene-analyzers-common-5.0.0/pom.xml @@ -49,8 +49,7 @@ <servicemix.osgi.export> !org.apache.lucene.analysis, !org.apache.lucene.analysis.tokenattributes, - org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first, - org.tartarus.snowball*;-split-package:=merge-first + org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.xml.parsers, @@ -64,6 +63,9 @@ org.xml.sax, org.xml.sax.helpers </servicemix.osgi.import.pkg> + <servicemix.osgi.private.pkg> + org.tartarus.snowball* + </servicemix.osgi.private.pkg> <servicemix.osgi.embed.dependency> *;inline=META-INF/services/* </servicemix.osgi.embed.dependency> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0e9f6d1e/lucene-analyzers-common-5.1.0/pom.xml ---------------------------------------------------------------------- diff --git a/lucene-analyzers-common-5.1.0/pom.xml b/lucene-analyzers-common-5.1.0/pom.xml index 4550645..45846ff 100644 --- a/lucene-analyzers-common-5.1.0/pom.xml +++ b/lucene-analyzers-common-5.1.0/pom.xml @@ -49,8 +49,7 @@ <servicemix.osgi.export> !org.apache.lucene.analysis, !org.apache.lucene.analysis.tokenattributes, - org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first, - org.tartarus.snowball*;-split-package:=merge-first + org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.xml.parsers, @@ -64,6 +63,9 @@ org.xml.sax, org.xml.sax.helpers </servicemix.osgi.import.pkg> + <servicemix.osgi.private.pkg> + org.tartarus.snowball* + </servicemix.osgi.private.pkg> <servicemix.osgi.embed.dependency> *;inline=META-INF/services/* </servicemix.osgi.embed.dependency> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0e9f6d1e/lucene-analyzers-common-5.2.1/pom.xml ---------------------------------------------------------------------- diff --git a/lucene-analyzers-common-5.2.1/pom.xml b/lucene-analyzers-common-5.2.1/pom.xml index 56e314d..33e0a16 100644 --- a/lucene-analyzers-common-5.2.1/pom.xml +++ b/lucene-analyzers-common-5.2.1/pom.xml @@ -49,8 +49,7 @@ <servicemix.osgi.export> !org.apache.lucene.analysis, !org.apache.lucene.analysis.tokenattributes, - org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first, - org.tartarus.snowball*;-split-package:=merge-first + org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.xml.parsers, @@ -64,6 +63,9 @@ org.xml.sax, org.xml.sax.helpers </servicemix.osgi.import.pkg> + <servicemix.osgi.private.pkg> + org.tartarus.snowball* + </servicemix.osgi.private.pkg> <servicemix.osgi.embed.dependency> *;inline=META-INF/services/* </servicemix.osgi.embed.dependency> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0e9f6d1e/lucene-analyzers-common-5.3.1/pom.xml ---------------------------------------------------------------------- diff --git a/lucene-analyzers-common-5.3.1/pom.xml b/lucene-analyzers-common-5.3.1/pom.xml index 7e7b93f..6214cf9 100644 --- a/lucene-analyzers-common-5.3.1/pom.xml +++ b/lucene-analyzers-common-5.3.1/pom.xml @@ -49,8 +49,7 @@ <servicemix.osgi.export> !org.apache.lucene.analysis, !org.apache.lucene.analysis.tokenattributes, - org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first, - org.tartarus.snowball*;-split-package:=merge-first + org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.xml.parsers, @@ -64,6 +63,9 @@ org.xml.sax, org.xml.sax.helpers </servicemix.osgi.import.pkg> + <servicemix.osgi.private.pkg> + org.tartarus.snowball* + </servicemix.osgi.private.pkg> <servicemix.osgi.embed.dependency> *;inline=META-INF/services/* </servicemix.osgi.embed.dependency> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0e9f6d1e/lucene-analyzers-common-5.4.0/pom.xml ---------------------------------------------------------------------- diff --git a/lucene-analyzers-common-5.4.0/pom.xml b/lucene-analyzers-common-5.4.0/pom.xml index 6d85867..fffafa0 100644 --- a/lucene-analyzers-common-5.4.0/pom.xml +++ b/lucene-analyzers-common-5.4.0/pom.xml @@ -49,8 +49,7 @@ <servicemix.osgi.export> !org.apache.lucene.analysis, !org.apache.lucene.analysis.tokenattributes, - org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first, - org.tartarus.snowball*;-split-package:=merge-first + org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.xml.parsers, @@ -64,6 +63,9 @@ org.xml.sax, org.xml.sax.helpers </servicemix.osgi.import.pkg> + <servicemix.osgi.private.pkg> + org.tartarus.snowball* + </servicemix.osgi.private.pkg> <servicemix.osgi.embed.dependency> *;inline=META-INF/services/* </servicemix.osgi.embed.dependency> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0e9f6d1e/lucene-analyzers-common-5.4.1/pom.xml ---------------------------------------------------------------------- diff --git a/lucene-analyzers-common-5.4.1/pom.xml b/lucene-analyzers-common-5.4.1/pom.xml index 9184541..125871c 100644 --- a/lucene-analyzers-common-5.4.1/pom.xml +++ b/lucene-analyzers-common-5.4.1/pom.xml @@ -49,8 +49,7 @@ <servicemix.osgi.export> !org.apache.lucene.analysis, !org.apache.lucene.analysis.tokenattributes, - org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first, - org.tartarus.snowball*;-split-package:=merge-first + org.apache.lucene.analysis.*;version=${pkgVersion};-split-package:=merge-first </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.xml.parsers, @@ -64,6 +63,9 @@ org.xml.sax, org.xml.sax.helpers </servicemix.osgi.import.pkg> + <servicemix.osgi.private.pkg> + org.tartarus.snowball* + </servicemix.osgi.private.pkg> <servicemix.osgi.embed.dependency> *;inline=META-INF/services/* </servicemix.osgi.embed.dependency> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0e9f6d1e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e2f0fd0..5e62664 100644 --- a/pom.xml +++ b/pom.xml @@ -61,6 +61,14 @@ <module>gae-1.9.32</module> <module>rhino-1.7.7.1</module> <module>elasticsearch-repository-hdfs-2.2.0</module> + <module>lucene-analyzers-common-5.4.1</module> + <module>lucene-analyzers-common-5.4.0</module> + <module>lucene-analyzers-common-5.3.1</module> + <module>lucene-analyzers-common-5.2.1</module> + <module>lucene-analyzers-common-5.1.0</module> + <module>lucene-analyzers-common-5.0.0</module> + <module>lucene-analyzers-common-4.9.0</module> + <module>lucene-analyzers-common-4.8.1</module> </modules> </project>
