Bump tycho to 0.20.0, remove groovy hack for update site
Signed-off-by: Fred Bricon <fbricon@gmail.com>
diff --git a/org.eclipse.m2e.wtp.jpa.feature/p2.inf b/org.eclipse.m2e.wtp.jpa.feature/p2.inf
index 428fda5..e541eb7 100644
--- a/org.eclipse.m2e.wtp.jpa.feature/p2.inf
+++ b/org.eclipse.m2e.wtp.jpa.feature/p2.inf
@@ -1,12 +1,13 @@
units.1.id=org.jboss.tools.maven.jpa
units.1.properties.0.name=org.eclipse.equinox.p2.name
units.1.properties.0.value=This version of the JPA configurator cannot be installed on top of the already installed org.jboss.tools.maven.jpa plugin. Uninstall the previous version of org.jboss.tools.maven.jpa and try the install again.
+units.1.properties.1.name=maven-classifier
+units.1.properties.1.value=p2inf
units.1.version=$version$
units.1.singleton=true
units.1.provides.0.namespace=osgi.bundle
units.1.provides.0.name=org.jboss.tools.maven.jpa
units.1.provides.0.version=$version$
-
requires.0.namespace=osgi.bundle
requires.0.name=org.jboss.tools.maven.jpa
requires.0.range=[$version$, $version$]
diff --git a/org.eclipse.m2e.wtp.jpa.site/pom.xml b/org.eclipse.m2e.wtp.jpa.site/pom.xml
index 67ceb66..909fbe4 100644
--- a/org.eclipse.m2e.wtp.jpa.site/pom.xml
+++ b/org.eclipse.m2e.wtp.jpa.site/pom.xml
@@ -23,30 +23,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>fix-content</id>
- <phase>package</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <source>${pom.basedir}/src/main/assembly/fixupdate.groovy</source>
- </configuration>
- </plugin>
- <!--
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho-version}</version>
- </plugin>
- -->
- <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
diff --git a/org.eclipse.m2e.wtp.jpa.site/src/main/assembly/fixupdate.groovy b/org.eclipse.m2e.wtp.jpa.site/src/main/assembly/fixupdate.groovy
deleted file mode 100644
index 8bc4590..0000000
--- a/org.eclipse.m2e.wtp.jpa.site/src/main/assembly/fixupdate.groovy
+++ /dev/null
@@ -1,41 +0,0 @@
-def updateMatchDefinition(root, oldFeature, newFeature, textContent) {
- def oldFeatureGroup = "${oldFeature}.feature.feature.group"
- def featureGroup = "${newFeature}.feature.feature.group"
- def feature = root.units.unit.find{ it.@id==featureGroup }
- if (!feature) {
- println "can't find " + featureGroup
- return textContent
- }
- def version = feature.@version
- println "Found " + feature.@id + '-' + version
-
- //Replace update match definition
- String originalStatement = "<update id='${featureGroup}' range='[0.0.0,$version)' severity='0'/>"
- matchDefinition = "providedCapabilities.exists(pc | pc.namespace == \"org.eclipse.equinox.p2.iu\" && (pc.name == \"${oldFeatureGroup}\" || pc.name == \"${featureGroup}\" && pc.version < \"${version}\"))"
- String newStatement = "<update match='$matchDefinition' severity='0'/>"
- return textContent.replace(originalStatement, newStatement)
-
-}
-
-def basedir = project.basedir.canonicalPath
-def repositoryDir = basedir + "/target/repository"
-def contentJar = repositoryDir + "/content.jar"
-def contentDir = basedir + "/target/content.jar/"
-
-def ant = new AntBuilder(); // create an antbuilder
-println 'Unzipping content.jar'
-ant.unzip( src: contentJar, dest:contentDir, overwrite:"true")
-
-println 'Modify content.xml to make m2e-wtp jpa updateable from jboss tools'
-
-File contentXml = new File(contentDir, "content.xml")
-def root = new XmlParser().parseText(contentXml.text)
-
-def newContentText = contentXml.text
-newContentText = updateMatchDefinition(root, "org.jboss.tools.maven.jpa", "org.eclipse.m2e.wtp.jpa", newContentText)
-
-println 'Overwriting content.xml'
-contentXml.text = newContentText
-
-println 'Zipping back customized content.jar'
-ant.zip( destFile: contentJar, baseDir:contentDir)
\ No newline at end of file
