<parent>
<groupId>org.argeo.commons.eclipse</groupId>
<artifactId>dep</artifactId>
- <version>0.3.4-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.eclipse.dep.rap</artifactId>
<dependency>
<groupId>org.argeo.commons.eclipse</groupId>
<artifactId>org.argeo.eclipse.dep.common</artifactId>
- <version>0.3.4-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<!-- Dependency to enable file upload. Should be included directly in coming
<artifactId>org.eclipse.rap.ui.workbench</artifactId>
</dependency>
- <!-- Jetty (TO BE REMOVED and replaced by Tomcat
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.http.jetty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>org.mortbay.jetty.server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>org.mortbay.jetty.util</artifactId>
- </dependency>
- -->
-
+ <!-- Jetty (TO BE REMOVED and replaced by Tomcat <dependency> <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.http.jetty</artifactId> </dependency> <dependency>
+ <groupId>org.mortbay.jetty</groupId> <artifactId>org.mortbay.jetty.server</artifactId>
+ </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>org.mortbay.jetty.util</artifactId>
+ </dependency> -->
+
<!-- Eclipse -->
<dependency>
<groupId>org.eclipse.core</groupId>
</dependency>
</dependencies>
<profiles>
+ <profile>
+ <id>check-osgi</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.argeo.maven.plugins</groupId>
+ <artifactId>maven-argeo-osgi-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>check-osgi</id>
+ <phase>test</phase>
+ <goals>
+ <goal>equinox</goal>
+ </goals>
+ <configuration>
+ <onlyCheck>true</onlyCheck>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>rpmbuild-tp</id>
<build>
<plugins>
-<!-- <plugin> -->
-<!-- <groupId>org.apache.maven.plugins</groupId> -->
-<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-<!-- <executions> -->
-<!-- <execution> -->
-<!-- <id>copy-rap</id> -->
-<!-- <phase>package</phase> -->
-<!-- <goals> -->
-<!-- <goal>copy-dependencies</goal> -->
-<!-- </goals> -->
-<!-- <configuration> -->
-<!-- <includeTypes>jar</includeTypes> -->
-<!-- <includeGroupIds>org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu</includeGroupIds> -->
-<!-- <outputDirectory>${project.build.directory}/eclipse-rap</outputDirectory> -->
-<!-- </configuration> -->
-<!-- </execution> -->
-<!-- </executions> -->
-<!-- </plugin> -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
<groupname>root</groupname>
<filemode>644</filemode>
<directoryIncluded>false</directoryIncluded>
- <dependency/>
+ <dependency />
</mapping>
</mappings>
</configuration>
<configuration>
<target>
<copy todir="${rpm.stagingRepository}" verbose="true">
- <fileset dir="${project.build.directory}/rpm"
- includes="*/RPMS/**/*.rpm" />
+ <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
<flattenmapper />
</copy>
</target>