Update site generation with Jboss dependency
Change-Id: Iba5caf1c24da5b2457bce59a344e9887cc7064a6
diff --git a/features/org.eclipse.graphiti.site/pom.xml b/features/org.eclipse.graphiti.site/pom.xml
index 7c49646..f6a9b55 100644
--- a/features/org.eclipse.graphiti.site/pom.xml
+++ b/features/org.eclipse.graphiti.site/pom.xml
@@ -34,40 +34,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>parse-version</id>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jboss.tools.tycho-plugins</groupId>
- <artifactId>repository-utils</artifactId>
- <version>${jboss-tycho-plugins-version}</version>
- <executions>
- <execution>
- <id>generate-facade</id>
- <phase>package</phase>
- <goals>
- <goal>generate-repository-facade</goal>
- </goals>
- <configuration>
- <siteTemplateFolder>siteTemplate/</siteTemplateFolder>
- <!-- Symbols are used while expanding index.html template -->
- <symbols>
- <!-- parsedVersion property is filled by build-helper-maven-plugin goal parse-version -->
- <update.site.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</update.site.version>
- <update.site.name>Graphiti ${update.site.version} Update Site</update.site.name>
- </symbols>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <finalName>org.eclipse.graphiti.site-${qualifiedVersion}</finalName>
+ </configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
@@ -125,42 +97,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.codehaus.mojo
- </groupId>
- <artifactId>
- build-helper-maven-plugin
- </artifactId>
- <versionRange>
- [1.8,)
- </versionRange>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index b489c7f..a0a34d4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,6 @@
<properties>
<tycho-version>2.2.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
- <jboss-tycho-plugins-version>2.2.0</jboss-tycho-plugins-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<platform-site>https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/</platform-site>
<orbit-site>https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/</orbit-site>
diff --git a/releng/org.eclipse.graphiti.releng/pom.xml b/releng/org.eclipse.graphiti.releng/pom.xml
index 65291e8..4cecf61 100644
--- a/releng/org.eclipse.graphiti.releng/pom.xml
+++ b/releng/org.eclipse.graphiti.releng/pom.xml
@@ -42,8 +42,10 @@
<fileset dir="${WORKSPACE}/graphiti/org.eclipse.graphiti/features/org.eclipse.graphiti.site/target/" includes="org.eclipse.graphiti.site-*.zip" />
</copy>
- <echo message="Unpacking archive to last_success updatesite area"/>
- <unzip src="${WORKSPACE}/graphiti/org.eclipse.graphiti/features/org.eclipse.graphiti.site/target/org.eclipse.graphiti.site-0.19.0-SNAPSHOT.zip" dest="${WORKSPACE}/last_success/updatesite/"/>
+ <echo message="Copying updatesite folder to last_success area"/>
+ <copy todir="${WORKSPACE}/last_success/updatesite/">
+ <fileset dir="${WORKSPACE}/graphiti/org.eclipse.graphiti/features/org.eclipse.graphiti.site/target/repository/" includes="**" />
+ </copy>
</tasks>
</configuration>
</execution>
