[UIMA-6325] Update to UIMA Parent POM 14
- Remove Pack200 from the Eclipse Update Site build
diff --git a/ruta-eclipse-update-site/pom.xml b/ruta-eclipse-update-site/pom.xml
index f7217d0..59496ab 100644
--- a/ruta-eclipse-update-site/pom.xml
+++ b/ruta-eclipse-update-site/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>13</version>
+ <version>14-SNAPSHOT</version>
<relativePath />
</parent>
<artifactId>ruta-eclipse-update-site</artifactId>
<packaging>pom</packaging>
- <version>2.8.1</version>
+ <version>2.8.2-SNAPSHOT</version>
<name>Apache UIMA Ruta Eclipse: ${project.artifactId}</name>
<description>The UIMA Ruta Eclipse update site</description>
@@ -47,29 +47,9 @@
<uimaScmProject>${project.artifactId}</uimaScmProject>
<eclipseUpdateSiteComponent>ruta</eclipseUpdateSiteComponent>
<eclipseUpdateSubSite>${project.build.directory}/eclipse-update-site/${eclipseUpdateSiteComponent}</eclipseUpdateSubSite>
- <item-maven-release-version>2.8.1</item-maven-release-version>
- <item-eclipse-release-version>2.8.1</item-eclipse-release-version>
<dropPrevVersions>false</dropPrevVersions>
</properties>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <configuration>
- <excludes>
- <exclude>marker-file-identifying-eclipse-update-site</exclude> <!-- marker file -->
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -81,17 +61,52 @@
<configuration>
<!-- ===================================================================
the PLUGINS
- ======================================================================= -->
+ ======================================================================= -->
<artifactItems>
- <artifactItem><groupId>org.apache.uima</groupId><artifactId>ruta-ep-addons</artifactId> <version>${item-maven-release-version}</version><destFileName>org.apache.uima.ruta.addons_${item-eclipse-release-version}.jar </destFileName></artifactItem>
- <artifactItem><groupId>org.apache.uima</groupId><artifactId>ruta-ep-caseditor</artifactId> <version>${item-maven-release-version}</version><destFileName>org.apache.uima.ruta.caseditor_${item-eclipse-release-version}.jar</destFileName></artifactItem>
- <artifactItem><groupId>org.apache.uima</groupId><artifactId>ruta-ep-engine</artifactId> <version>${item-maven-release-version}</version><destFileName>org.apache.uima.ruta.engine_${item-eclipse-release-version}.jar </destFileName></artifactItem>
- <artifactItem><groupId>org.apache.uima</groupId><artifactId>ruta-ep-ide</artifactId> <version>${item-maven-release-version}</version><destFileName>org.apache.uima.ruta.ide_${item-eclipse-release-version}.jar </destFileName></artifactItem>
- <artifactItem><groupId>org.apache.uima</groupId><artifactId>ruta-ep-ide-ui</artifactId> <version>${item-maven-release-version}</version><destFileName>org.apache.uima.ruta.ide.ui_${item-eclipse-release-version}.jar </destFileName></artifactItem>
- <artifactItem><groupId>org.apache.uima</groupId><artifactId>ruta-ep-textruler</artifactId> <version>${item-maven-release-version}</version><destFileName>org.apache.uima.ruta.textruler_${item-eclipse-release-version}.jar</destFileName></artifactItem>
- <artifactItem><groupId>org.apache.uima</groupId><artifactId>ruta-ep-core-ext</artifactId> <version>${item-maven-release-version}</version><destFileName>org.apache.uima.ruta.core.ext_${item-eclipse-release-version}.jar</destFileName></artifactItem>
- </artifactItems>
- <outputDirectory>${toBePacked}</outputDirectory>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-ep-addons</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.uima.ruta.addons_${parsedVersion.osgiVersion}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-ep-caseditor</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.uima.ruta.caseditor_${parsedVersion.osgiVersion}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-ep-engine</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.uima.ruta.engine_${parsedVersion.osgiVersion}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-ep-ide</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.uima.ruta.ide_${parsedVersion.osgiVersion}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-ep-ide-ui</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.uima.ruta.ide.ui_${parsedVersion.osgiVersion}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-ep-textruler</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.uima.ruta.textruler_${parsedVersion.osgiVersion}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-ep-core-ext</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.uima.ruta.core.ext_${parsedVersion.osgiVersion}.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${eusWork}/plugins</outputDirectory>
</configuration>
</execution>
<execution>
@@ -104,7 +119,12 @@
the FEATURES
======================================================================= -->
<artifactItems>
- <artifactItem><groupId>org.apache.uima</groupId><artifactId>ruta-eclipse-feature</artifactId><version>${item-maven-release-version}</version><destFileName>org.apache.uima.ruta.feature_${item-eclipse-release-version}.jar</destFileName></artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-eclipse-feature</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.uima.ruta.feature_${parsedVersion.osgiVersion}.jar</destFileName>
+ </artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/eus-work/features</outputDirectory>
</configuration>
@@ -183,16 +203,6 @@
</then>
</if>
- <echo>Compress plugin Jars using pack200 - this may take a minute or 2</echo>
- <java fork="true" maxmemory="256m" jar="${uima-eclipse-jar-processor}" failonerror="true">
- <arg line="-processAll" />
- <arg line="-repack" />
- <arg line="-pack" />
- <arg line="-verbose" />
- <arg line="-outputDir ${eusWork}/plugins" />
- <arg line="${toBePacked}" />
- </java>
-
<echo>Save conditioned Jars prior to signing, in case of redo</echo>
<echo>-------------------------------------------------------</echo>
<copy todir="${project.build.directory}/saved/features" failonerror="true">
@@ -210,7 +220,6 @@
<arg line="-source ${eusWork}" />
<arg line="-configs ANY.ANY.ANY" />
<arg line="-publishArtifacts" />
- <arg line="-reusePack200Files" />
<arg line="-compress" />
<arg line="-append" />
</java>
@@ -240,7 +249,6 @@
<arg value="--batch" />
<fileset dir="${eusWork}">
<include name="**/*.jar" />
- <include name="**/*.jar.pack.gz" />
</fileset>
</apply>
<echo message="Copying the checksums and signatures to the update subsite" />