Make includable through jitpack

Requires hardcoding the name of the repo in ExternalVersionExtension, because jitpack overrides groupId: jitpack/jitpack.io#1029 Furthermore, for multi-module projects there can only be one groupId: jitpack/jitpack.io#2872 So changed everything to be in *.version (i.e. not in *.plugin). Maven complains that maven-*-plugin should be in groupId org.apache.maven.plugins, but works anyway.
cBioPortal · Dec 7, 2018 · 67e9fc4 · 67e9fc4
1 parent 81fe6c0
commit 67e9fc4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/external-version-api/pom.xml b/external-version-api/pom.xml
@@ -28,7 +28,6 @@
     </parent>
 
     <artifactId>external-version-api</artifactId>
-    <version>0.1.1-SNAPSHOT</version>
 
     <dependencies>
 
@@ -39,4 +38,4 @@
 
     </dependencies>
 
-</project>
+</project>
diff --git a/external-version-strategies/pom.xml b/external-version-strategies/pom.xml
@@ -29,14 +29,13 @@
     </parent>
 
     <artifactId>external-version-strategies</artifactId>
-    <version>0.1.1-SNAPSHOT</version>
 
     <dependencies>
 
         <dependency>
             <groupId>org.apache.maven.version</groupId>
             <artifactId>external-version-api</artifactId>
-            <version>0.1.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>
@@ -60,4 +59,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/maven-external-version-plugin/pom.xml b/maven-external-version-plugin/pom.xml
@@ -28,10 +28,8 @@
         <version>0.1.1-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.maven.plugins</groupId>
+    <groupId>org.apache.maven.version</groupId>
     <artifactId>maven-external-version-plugin</artifactId>
-    <version>0.1.1-SNAPSHOT</version>
-
     <packaging>maven-plugin</packaging>
 
     <dependencies>
@@ -61,12 +59,12 @@
         <dependency>
             <groupId>org.apache.maven.version</groupId>
             <artifactId>external-version-api</artifactId>
-            <version>0.1.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.version</groupId>
             <artifactId>external-version-strategies</artifactId>
-            <version>0.1.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>
@@ -111,4 +109,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/maven-external-version-plugin/src/it/multi-module/pom.xml b/maven-external-version-plugin/src/it/multi-module/pom.xml
@@ -24,7 +24,7 @@
                 <version>2.5.2</version>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+                <groupId>org.apache.maven.version</groupId>
                 <artifactId>maven-external-version-plugin</artifactId>
                 <version>0.1.1-SNAPSHOT</version>
                 <extensions>true</extensions>
@@ -43,4 +43,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/maven-external-version-plugin/src/it/simple-module/pom.xml b/maven-external-version-plugin/src/it/simple-module/pom.xml
@@ -52,7 +52,7 @@ under the License.
                 <version>2.5.2</version>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+                <groupId>org.apache.maven.version</groupId>
                 <artifactId>maven-external-version-plugin</artifactId>
                 <version>0.1.1-SNAPSHOT</version>
                 <extensions>true</extensions>

diff --git a/...ernal-version-plugin/src/main/java/org/apache/maven/version/ExternalVersionExtension.java b/...ernal-version-plugin/src/main/java/org/apache/maven/version/ExternalVersionExtension.java
@@ -96,7 +96,9 @@ public void afterProjectsRead( MavenSession session )
         for ( MavenProject mavenProject : session.getAllProjects() )
         {
             // Lookup this plugin's configuration
-            Plugin plugin = mavenProject.getPlugin( "org.apache.maven.plugins:maven-external-version-plugin" );
+            Plugin plugin = mavenProject.getPlugin(
+                "com.github.cbioportal.maven-external-version:maven-external-version-plugin"
+            );
 
             // now we are going to wedge in the config
             Xpp3Dom configDom = (Xpp3Dom) plugin.getConfiguration();
@@ -215,7 +217,9 @@ private void createNewVersionPom( MavenProject mavenProject, Map<String, String>
                 }
             }
 
-            Plugin plugin = mavenProject.getPlugin( "org.apache.maven.plugins:maven-external-version-plugin" );
+            Plugin plugin = mavenProject.getPlugin(
+                "com.github.cbioportal.maven-external-version:maven-external-version-plugin"
+            );
             // now we are going to wedge in the config
             Xpp3Dom pluginConfiguration = (Xpp3Dom) plugin.getConfiguration();
 

diff --git a/pom.xml b/pom.xml
@@ -84,4 +84,4 @@
         <!--</pluginManagement>-->
     </build>
 
-</project>
+</project>