Update poms to match current bazel structure

Vertispan · Aug 13, 2021 · 27554e0 · 27554e0
1 parent 33787f1
commit 27554e0
Show file tree

Hide file tree

Showing 51 changed files with 333 additions and 205 deletions.
diff --git a/maven/ast-annotations-internal/pom.xml b/maven/ast-annotations-internal/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-parent</artifactId>
-        <version>${revision}</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>ast-annotations-internal</artifactId>
     <packaging>pom</packaging>

diff --git a/maven/ast-annotations/pom.xml b/maven/ast-annotations/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-parent</artifactId>
-        <version>${revision}</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>ast-annotations</artifactId>
     <packaging>jar</packaging>

diff --git a/maven/ast-processors-common/pom.xml b/maven/ast-processors-common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-parent</artifactId>
-        <version>${revision}</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>ast-processors-common</artifactId>
     <packaging>pom</packaging>

diff --git a/maven/ast-processors/pom.xml b/maven/ast-processors/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-parent</artifactId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>ast-processors</artifactId>
     <packaging>pom</packaging>

diff --git a/maven/ast/pom.xml b/maven/ast/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.vertispan.j2cl</groupId>
     <artifactId>j2cl-parent</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>ast</artifactId>
   <packaging>pom</packaging>
@@ -28,11 +28,11 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>../../bazel-bin/transpiler/java/com/google/j2cl/ast/libast.jar</file>
+                  <file>../../bazel-bin/transpiler/java/com/google/j2cl/transpiler/ast/libast.jar</file>
                   <type>jar</type>
                 </artifact>
                 <artifact>
-                  <file>../../bazel-bin/transpiler/java/com/google/j2cl/ast/libast-src.jar</file>
+                  <file>../../bazel-bin/transpiler/java/com/google/j2cl/transpiler/ast/libast-src.jar</file>
                   <type>jar</type>
                   <classifier>sources</classifier>
                 </artifact>
@@ -44,6 +44,10 @@
     </plugins>
   </build>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
@@ -59,17 +63,12 @@
 
     <dependency>
       <groupId>com.vertispan.j2cl</groupId>
-      <artifactId>ast-annotations</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.vertispan.j2cl</groupId>
-      <artifactId>ast-processors-common</artifactId>
+      <artifactId>common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.vertispan.j2cl</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>common-visitor</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

diff --git a/maven/backend-closure/pom.xml b/maven/backend-closure/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-parent</artifactId>
-        <version>0.8-SNAPSHOT</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>backend-closure</artifactId>
     <packaging>pom</packaging>

diff --git a/maven/backend-common/pom.xml b/maven/backend-common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-parent</artifactId>
-        <version>0.8-SNAPSHOT</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>backend-common</artifactId>
     <packaging>pom</packaging>

diff --git a/maven/backend-kotlin/pom.xml b/maven/backend-kotlin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-parent</artifactId>
-        <version>0.8-SNAPSHOT</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>backend-kotlin</artifactId>
     <packaging>pom</packaging>

diff --git a/maven/backend-libraryinfo-proto/pom.xml b/maven/backend-libraryinfo-proto/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.vertispan.j2cl</groupId>
     <artifactId>j2cl-parent</artifactId>
-    <version>0.2-SNAPSHOT</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>libraryinfo-proto</artifactId>
   <packaging>pom</packaging>
@@ -28,11 +28,11 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>../../bazel-bin/transpiler/java/com/google/j2cl/libraryinfo/liblibrary_info_proto-speed.jar</file>
+                  <file>../../bazel-bin/transpiler/java/com/google/j2cl/transpiler/backend/libraryinfo/liblibrary_info_proto-speed.jar</file>
                   <type>jar</type>
                 </artifact>
                 <!--<artifact>-->
-                  <!--<file>../../bazel-bin/transpiler/java/com/google/j2cl/libraryinfo/liblibraryinfo-src.jar</file>-->
+                  <!--<file>../../bazel-bin/transpiler/java/com/google/j2cl/transpiler/backend/libraryinfo/liblibraryinfo-src.jar</file>-->
                   <!--<type>jar</type>-->
                   <!--<classifier>sources</classifier>-->
                 <!--</artifact>-->

diff --git a/maven/backend-libraryinfo/pom.xml b/maven/backend-libraryinfo/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-parent</artifactId>
-        <version>0.8-SNAPSHOT</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>backend-libraryinfo</artifactId>
     <packaging>pom</packaging>
@@ -65,12 +65,12 @@
         </dependency>
         <dependency>
             <groupId>com.vertispan.j2cl</groupId>
-            <artifactId>ast</artifactId>
+            <artifactId>common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.vertispan.j2cl</groupId>
-            <artifactId>common</artifactId>
+            <artifactId>ast</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

diff --git a/maven/backend-wasm/pom.xml b/maven/backend-wasm/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-parent</artifactId>
-        <version>0.8-SNAPSHOT</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>backend-wasm</artifactId>
     <packaging>pom</packaging>

diff --git a/maven/backend/pom.xml b/maven/backend/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-parent</artifactId>
-        <version>0.8-SNAPSHOT</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>backend</artifactId>
     <packaging>pom</packaging>
@@ -48,6 +48,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.vertispan.j2cl</groupId>
@@ -64,6 +68,11 @@
             <artifactId>backend-closure</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.vertispan.j2cl</groupId>
+            <artifactId>backend-kotlin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.vertispan.j2cl</groupId>
             <artifactId>backend-wasm</artifactId>

diff --git a/maven/bootstrap/assembly.xml b/maven/bootstrap/assembly.xml
@@ -8,6 +8,7 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
+<!--      <directory>../../bazel-j2cl/external/com_google_javascript_closure_library/closure</directory>-->
       <directory>../../../closure-library/closure/goog/</directory>
       <includes>
         <!--

diff --git a/maven/bootstrap/pom.xml b/maven/bootstrap/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.vertispan.j2cl</groupId>
     <artifactId>j2cl-parent</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>bootstrap</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/common-visitor/pom.xml b/maven/common-visitor/pom.xml
@@ -0,0 +1,49 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.vertispan.j2cl</groupId>
+        <artifactId>j2cl-parent</artifactId>
+        <version>0.10-SNAPSHOT</version>
+    </parent>
+    <artifactId>common-visitor</artifactId>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>../../bazel-bin/transpiler/java/com/google/j2cl/common/visitor/libvisitor-internal.jar</file>
+                                    <type>jar</type>
+                                </artifact>
+                                <artifact>
+                                    <file>../../bazel-bin/transpiler/java/com/google/j2cl/common/visitor/libvisitor-internal-src.jar</file>
+                                    <type>jar</type>
+                                    <classifier>sources</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+
+    </dependencies>
+</project>
diff --git a/maven/common/pom.xml b/maven/common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.vertispan.j2cl</groupId>
     <artifactId>j2cl-parent</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>common</artifactId>
   <packaging>pom</packaging>
@@ -44,10 +44,6 @@
     </plugins>
   </build>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-    </dependency>
     <dependency>
       <groupId>args4j</groupId>
       <artifactId>args4j</artifactId>

diff --git a/maven/external/org.eclipse/org.eclipse.core.contenttype/pom.xml b/maven/external/org.eclipse/org.eclipse.core.contenttype/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vertispan.j2cl.external</groupId>
     <artifactId>org.eclipse</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.core.contenttype</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/external/org.eclipse/org.eclipse.core.jobs/pom.xml b/maven/external/org.eclipse/org.eclipse.core.jobs/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vertispan.j2cl.external</groupId>
     <artifactId>org.eclipse</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.core.jobs</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/external/org.eclipse/org.eclipse.core.resources/pom.xml b/maven/external/org.eclipse/org.eclipse.core.resources/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vertispan.j2cl.external</groupId>
     <artifactId>org.eclipse</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.core.resources</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/external/org.eclipse/org.eclipse.core.runtime/pom.xml b/maven/external/org.eclipse/org.eclipse.core.runtime/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vertispan.j2cl.external</groupId>
     <artifactId>org.eclipse</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.core.runtime</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/external/org.eclipse/org.eclipse.equinox.common/pom.xml b/maven/external/org.eclipse/org.eclipse.equinox.common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vertispan.j2cl.external</groupId>
     <artifactId>org.eclipse</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.equinox.common</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/external/org.eclipse/org.eclipse.equinox.preferences/pom.xml b/maven/external/org.eclipse/org.eclipse.equinox.preferences/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vertispan.j2cl.external</groupId>
     <artifactId>org.eclipse</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.equinox.preferences</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/external/org.eclipse/org.eclipse.jdt.compiler.apt/pom.xml b/maven/external/org.eclipse/org.eclipse.jdt.compiler.apt/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vertispan.j2cl.external</groupId>
     <artifactId>org.eclipse</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/external/org.eclipse/org.eclipse.jdt.core/pom.xml b/maven/external/org.eclipse/org.eclipse.jdt.core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vertispan.j2cl.external</groupId>
     <artifactId>org.eclipse</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.jdt.core</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/external/org.eclipse/org.eclipse.osgi/pom.xml b/maven/external/org.eclipse/org.eclipse.osgi/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vertispan.j2cl.external</groupId>
     <artifactId>org.eclipse</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.osgi</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/external/org.eclipse/org.eclipse.text/pom.xml b/maven/external/org.eclipse/org.eclipse.text/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vertispan.j2cl.external</groupId>
     <artifactId>org.eclipse</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.text</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/external/org.eclipse/pom.xml b/maven/external/org.eclipse/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.vertispan.j2cl.external</groupId>
     <artifactId>external-dependencies</artifactId>
-    <version>${revision}</version>
+    <version>0.10-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse</artifactId>
   <packaging>pom</packaging>