lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1690842 - in /lucene/dev/trunk: dev-tools/maven/lucene/pom.xml.template dev-tools/maven/lucene/spatial3d/pom.xml.template lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
Date Mon, 13 Jul 2015 23:45:21 GMT
Author: sarowe
Date: Mon Jul 13 23:45:20 2015
New Revision: 1690842

URL: http://svn.apache.org/r1690842
Log:
LUCENE-6607: Fix spatial3d module's Maven config - include dependency interpolation sites,
make packaging jar instead of pom, don't skip deploy phase, etc.; and fix GetMavenDependenciesTask
to exclude a module's build artifacts only if the build dir fully matches, rather than a prefix
(this bug caused lucene-spatial's test dependency on the lucene-spatial3d jar to be left out
of the generated POM, because lucene/build/spatial3d matched the regex for lucene-spatial's
build output dir: 'lucene/build/spatial', i.e. with no dir separator)

Modified:
    lucene/dev/trunk/dev-tools/maven/lucene/pom.xml.template
    lucene/dev/trunk/dev-tools/maven/lucene/spatial3d/pom.xml.template
    lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java

Modified: lucene/dev/trunk/dev-tools/maven/lucene/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/pom.xml.template?rev=1690842&r1=1690841&r2=1690842&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/pom.xml.template Mon Jul 13 23:45:20 2015
@@ -60,6 +60,7 @@
     <module>replicator</module>
     <module>sandbox</module>
     <module>spatial</module>
+    <module>spatial3d</module>
     <module>suggest</module>
   </modules>
   <build>

Modified: lucene/dev/trunk/dev-tools/maven/lucene/spatial3d/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/spatial3d/pom.xml.template?rev=1690842&r1=1690841&r2=1690842&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/spatial3d/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/spatial3d/pom.xml.template Mon Jul 13 23:45:20
2015
@@ -28,17 +28,30 @@
   </parent>
   <groupId>org.apache.lucene</groupId>
   <artifactId>lucene-spatial3d</artifactId>
-  <packaging>pom</packaging>
-  <name>Lucene Spatial shapes implemented using 3D planar geometry</name>
+  <packaging>jar</packaging>
+  <name>Lucene Spatial 3D</name>
+  <description>
+    Lucene Spatial shapes implemented using 3D planar geometry
+  </description>
+  <properties>
+    <module-directory>lucene/spatial3d</module-directory>
+    <relative-top-level>../../..</relative-top-level>
+    <module-path>${relative-top-level}/${module-directory}</module-path>
+  </properties>
+  <dependencies>
+    <dependency>
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-test-framework</artifactId>
+      <scope>test</scope>
+    </dependency>
+@lucene-spatial3d.internal.dependencies@
+@lucene-spatial3d.external.dependencies@
+@lucene-spatial3d.internal.test.dependencies@
+@lucene-spatial3d.external.test.dependencies@
+  </dependencies>
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
+    <sourceDirectory>${module-path}/src/java</sourceDirectory>
+    <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
   </build>
 </project>

Modified: lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java?rev=1690842&r1=1690841&r2=1690842&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
(original)
+++ lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
Mon Jul 13 23:45:20 2015
@@ -549,8 +549,10 @@ public class GetMavenDependenciesTask ex
       } else {
         // Lucene analysis modules' build dirs do not include hyphens, but Solr contribs'
build dirs do
         String origModuleDir = antProjectName.replace("analyzers-", "analysis/");
+        // Exclude the module's own build output, in addition to UNWANTED_INTERNAL_DEPENDENCIES
         Pattern unwantedInternalDependencies = Pattern.compile
-            ("(?:lucene/build/|solr/build/(?:contrib/)?)" + origModuleDir + "|" + UNWANTED_INTERNAL_DEPENDENCIES);
+            ("(?:lucene/build/|solr/build/(?:contrib/)?)" + origModuleDir + "/" // require
dir separator 
+             + "|" + UNWANTED_INTERNAL_DEPENDENCIES);
         SortedSet<String> sortedDeps = new TreeSet<>();
         for (String dependency : value.split(",")) {
           matcher = SHARED_EXTERNAL_DEPENDENCIES_PATTERN.matcher(dependency);



Mime
View raw message