Finished adding source features, removed org.eclipse.bpel.source feature
(replaced by individual feature sources), updated tycho.version to
0.21.0
diff --git a/features/pom.xml b/features/pom.xml
index 0ee98cc..d7f1c37 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,24 +1,24 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <parent>
- <artifactId>org.eclipse.bpel.parent.pom</artifactId>
- <groupId>org.eclipse.bpel</groupId>
- <version>0.0.1-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.bpel</groupId>
- <artifactId>features</artifactId>
- <name>bpel.features</name>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
- <modules>
- <module>org.eclipse.bpel.common.feature</module>
- <module>org.eclipse.bpel.feature</module>
- <module>org.eclipse.bpel.source.feature</module>
- <!-- <module>org.eclipse.bpel.tests.feature</module> -->
- <module>org.eclipse.bpel.apache.ode.runtime.feature</module>
- <!-- <module>org.eclipse.bpel.jboss.riftsaw.runtime.feature</module> -->
- </modules>
-</project>
-
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <parent>
+ <artifactId>org.eclipse.bpel.parent.pom</artifactId>
+ <groupId>org.eclipse.bpel</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.bpel</groupId>
+ <artifactId>features</artifactId>
+ <name>bpel.features</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.eclipse.bpel.common.feature</module>
+ <module>org.eclipse.bpel.feature</module>
+ <!-- <module>org.eclipse.bpel.source.feature</module> -->
+ <!-- <module>org.eclipse.bpel.tests.feature</module> -->
+ <module>org.eclipse.bpel.apache.ode.runtime.feature</module>
+ <!-- <module>org.eclipse.bpel.jboss.riftsaw.runtime.feature</module> -->
+ </modules>
+</project>
+
diff --git a/parent/pom.xml b/parent/pom.xml
index ca1ea69..d3cfb3a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -10,9 +10,8 @@
</modules>
<properties>
- <tycho-version>0.16.0</tycho-version>
+ <tycho-version>0.21.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
- <BUILD_ALIAS>CI</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
@@ -32,7 +31,7 @@
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <format>'v'yyyyMMdd-HHmm'-${BUILD_ALIAS}'</format>
+ <format>'v'yyyyMMddHHmm</format>
<archiveSite>true</archiveSite>
</configuration>
</plugin>
@@ -156,7 +155,6 @@
</configuration>
</plugin>
-<!--
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
@@ -198,7 +196,7 @@
</execution>
</executions>
</plugin>
- -->
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
@@ -299,12 +297,6 @@
<profiles>
<profile>
- <id>hudson</id>
- <activation>
- <property>
- <name>BUILD_NUMBER</name>
- </property>
- </activation>
<build>
<plugins>
<plugin>
@@ -312,7 +304,7 @@
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <format>'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}-${BUILD_ALIAS}'</format>
+ <format>'v'yyyyMMddHHmm</format>
<archiveSite>true</archiveSite>
</configuration>
</plugin>
diff --git a/site/category.xml b/site/category.xml
index a7a84b7..fee0042 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -1,23 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.bpel.apache.ode.runtime.feature_1.0.4.qualifier.jar" id="org.eclipse.bpel.apache.ode.runtime.feature" version="1.0.4.qualifier">
- <category name="Eclipse BPEL Designer"/>
- </feature>
- <feature url="features/org.eclipse.bpel.feature_1.0.4.qualifier.jar" id="org.eclipse.bpel.feature" version="1.0.4.qualifier">
- <category name="Eclipse BPEL Designer"/>
- </feature>
- <!-- Removed for now because it conflicts with jboss tools' own deployment plugin for Riftsaw.
- This was only intended as an additional example deployer anyway, which was more-or-less similar to the Ode deployer.
- <feature url="features/org.eclipse.bpel.jboss.riftsaw.runtime.feature_1.0.4.qualifier.jar" id="org.eclipse.bpel.jboss.riftsaw.runtime.feature" version="1.0.4.qualifier">
- <category name="Eclipse BPEL Designer"/>
- </feature>
- -->
- <feature url="features/org.eclipse.bpel.common.feature_1.0.4.qualifier.jar" id="org.eclipse.bpel.common.feature" version="1.0.4.qualifier">
- <category name="Eclipse BPEL Designer"/>
- </feature>
- <category-def name="Eclipse BPEL Designer" label="Eclipse BPEL Designer">
- <description>
- Update site for the Eclipse BPEL Designer.
- </description>
- </category-def>
+ <feature url="features/org.eclipse.bpel.feature_0.0.0.jar" id="org.eclipse.bpel.feature" version="0.0.0">
+ <category name="Eclipse BPEL Designer" />
+ </feature>
+ <!-- Removed for now because it conflicts with jboss tools' own deployment
+ plugin for Riftsaw. This was only intended as an additional example deployer
+ anyway, which was more-or-less similar to the Ode deployer. <feature url="features/org.eclipse.bpel.jboss.riftsaw.runtime.feature_0.0.0.jar"
+ id="org.eclipse.bpel.jboss.riftsaw.runtime.feature" version="0.0.0">
+ <category name="Eclipse BPEL Designer"/> </feature> -->
+ <feature url="features/org.eclipse.bpel.common.feature_0.0.0.jar" id="org.eclipse.bpel.common.feature" version="0.0.0">
+ <category name="Eclipse BPEL Designer" />
+ </feature>
+ <feature
+ url="features/org.eclipse.bpel.apache.ode.runtime.feature_0.0.0.jar" id="org.eclipse.bpel.apache.ode.runtime.feature" version="0.0.0">
+ <category name="Eclipse BPEL Designer" />
+ </feature>
+
+ <feature url="features/org.eclipse.bpel.feature.source_0.0.0.jar" id="org.eclipse.bpel.feature.source" version="0.0.0">
+ <category name="Eclipse BPEL Designer" />
+ </feature>
+ <feature url="features/org.eclipse.bpel.common.feature.source_0.0.0.jar" id="org.eclipse.bpel.common.feature.source" version="0.0.0">
+ <category name="Eclipse BPEL Designer" />
+ </feature>
+ <feature
+ url="features/org.eclipse.bpel.apache.ode.runtime.feature.source_0.0.0.jar" id="org.eclipse.bpel.apache.ode.runtime.feature.source" version="0.0.0">
+ <category name="Eclipse BPEL Designer" />
+ </feature>
+
+ <category-def name="Eclipse BPEL Designer" label="Eclipse BPEL Designer">
+ <description>
+ Update site for the Eclipse BPEL Designer.
+ </description>
+ </category-def>
</site>
