bump to 4.0.3-SNAPSHOT and fix generateFacade

Signed-off-by: Stephane Bouchet <[email protected]>
jbosstools · Sep 22, 2023 · 8bd4970 · 8bd4970
1 parent c964688
commit 8bd4970
Show file tree

Hide file tree

Showing 15 changed files with 366 additions and 312 deletions.
diff --git a/tycho-plugins/enforcer-rules/pom.xml b/tycho-plugins/enforcer-rules/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>tycho-plugins</artifactId>
-		<version>4.0.2</version>
+		<version>4.0.3-SNAPSHOT</version>
 	</parent>
 
 	<properties>

diff --git a/tycho-plugins/pom.xml b/tycho-plugins/pom.xml
@@ -16,7 +16,7 @@
 	<artifactId>tycho-plugins</artifactId>
 	<packaging>pom</packaging>
 	<name>jbosstools-tycho-plugins-parent</name>
-	<version>4.0.2</version>
+	<version>4.0.3-SNAPSHOT</version>
 	<properties>
 		<tychoVersion>4.0.2</tychoVersion>
 		<maven.version>3.9.4</maven.version>
@@ -118,32 +118,6 @@
 		</pluginManagement>
 	</build>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-plugin-api</artifactId>
-			<version>${maven.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-component-annotations</artifactId>
-			<version>2.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugin-testing</groupId>
-			<artifactId>maven-plugin-testing-harness</artifactId>
-			<version>3.3.0</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
 	<repositories>
 		<repository>
 			<id>tycho-snapshots</id>

diff --git a/tycho-plugins/repository-utils/pom.xml b/tycho-plugins/repository-utils/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>tycho-plugins</artifactId>
-		<version>4.0.2</version>
+		<version>4.0.3-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -31,24 +31,79 @@
 	</properties>
 
 	<dependencies>
+		<!-- Maven -->
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-core</artifactId>
 			<version>${maven.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-			<version>1</version>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-plugin-api</artifactId>
+			<version>${maven.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>3.5.1</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.plugin-tools</groupId>
 			<artifactId>maven-plugin-annotations</artifactId>
 			<version>3.9.0</version>
-			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugin-testing</groupId>
+			<artifactId>maven-plugin-testing-harness</artifactId>
+			<version>3.3.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-compat</artifactId>
+			<version>3.2.5</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.resolver</groupId>
+			<artifactId>maven-resolver-api</artifactId>
+			<version>1.9.15</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.resolver</groupId>
+			<artifactId>maven-resolver-util</artifactId>
+			<version>1.9.15</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>5.4.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-archiver</artifactId>
+			<version>3.6.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-archiver</artifactId>
+			<version>2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-io</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+		<!-- Tycho -->
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>
 			<artifactId>tycho-packaging-plugin</artifactId>
@@ -59,6 +114,18 @@
 			<artifactId>tycho-core</artifactId>
 			<version>${tychoVersion}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.tycho</groupId>
+			<artifactId>tycho-testing-harness</artifactId>
+			<version>${tychoVersion}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>2.0.7</version>
+		</dependency>
+		<!-- Mojo deps-->
 		<dependency>
 			<groupId>net.sf.saxon</groupId>
 			<artifactId>saxon</artifactId>
@@ -103,6 +170,16 @@
 			<artifactId>jsoup</artifactId>
 			<version>1.16.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+			<version>1.23.0</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.11.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -126,7 +203,7 @@
 					<!-- The path for the to be generated properties file, it's
 					relative to ${project.basedir} -->
 					<generateGitPropertiesFilename>
-						src/test/resources/git.properties</generateGitPropertiesFilename>
+						src/test/resources/projects/fetch-sources-from-manifests/target/git.properties</generateGitPropertiesFilename>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/...ry-utils/src/main/java/org/jboss/tools/tycho/sitegenerator/FetchSourcesFromManifests.java b/...ry-utils/src/main/java/org/jboss/tools/tycho/sitegenerator/FetchSourcesFromManifests.java
@@ -96,7 +96,7 @@
  * f) unpack each source zip and combine them into a single zip
  * 
  * For example, see
- * repository-utils/src/main/resources/fetch-sources-from-manifests-example.pom.xml
+ * repository-utils/src/test/resources/fetch-sources-from-manifests-example.pom.xml
  * 
  */
 @Mojo(name = "fetch-sources-from-manifests", defaultPhase = LifecyclePhase.PACKAGE)

diff --git a/...utils/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java b/...utils/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java
@@ -90,7 +90,7 @@
  * Generates a JBoss-friendly facade and files for this p2 repo
  * 
  * For example, see
- * repository-utils/src/main/resources/generate-repository-facade-example.pom.xml
+ * repository-utils/src/test/resources/generate-repository-facade-example.pom.xml
  */
 @Mojo(name = "generate-repository-facade", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true)
 public class GenerateRepositoryFacadeMojo extends AbstractTychoPackagingMojo {
@@ -193,6 +193,9 @@ private enum ReferenceStrategy {
 
 	@Parameter
 	private String p2StatsUrl;
+
+	@Component(role = TychoProject.class, hint = PackagingType.TYPE_ECLIPSE_REPOSITORY)
+	private EclipseRepositoryProject eclipseRepositoryProject;
 
 	/**
 	 * In case some content is missing on site, use alternate URL pattern as
@@ -422,7 +425,7 @@ private File generateCategoryXml(File outputRepository) throws MojoExecutionExce
 		} catch (IOException ex) {
 			throw new MojoExecutionException("Could not read 'category.xml' file", ex);
 		}
-		new EclipseRepositoryProject().getDependencyWalker(DefaultReactorProject.adapt(this.project))
+		eclipseRepositoryProject.getDependencyWalker(DefaultReactorProject.adapt(this.project))
 				.traverseUpdateSite(site, new ArtifactDependencyVisitor() {
 					@Override
 					public boolean visitFeature(FeatureDescription feature) {