Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2018-01-31 01:22:29 -0500
committerEd Merks2018-01-31 01:22:29 -0500
commit361a9986cbdf6fa722945fb5b0960826d3af75cf (patch)
tree23f46209e4feeada6843029181d7c4e3ef122124
parent784f5d357a2e957a152af9e761ca3d2339b91829 (diff)
downloadorg.eclipse.oomph-361a9986cbdf6fa722945fb5b0960826d3af75cf.tar.gz
org.eclipse.oomph-361a9986cbdf6fa722945fb5b0960826d3af75cf.tar.xz
org.eclipse.oomph-361a9986cbdf6fa722945fb5b0960826d3af75cf.zip
[Releng] Make GENERATE_SOURCE=true unconditional in the POMs
-rw-r--r--features/org.eclipse.oomph.all-feature/build.properties3
-rw-r--r--features/org.eclipse.oomph.all-feature/p2.inf5
-rw-r--r--releng/org.eclipse.oomph.parent/features/pom.xml100
-rw-r--r--releng/org.eclipse.oomph.parent/plugins/pom.xml42
-rw-r--r--sites/org.eclipse.oomph.site/category.xml3
5 files changed, 70 insertions, 83 deletions
diff --git a/features/org.eclipse.oomph.all-feature/build.properties b/features/org.eclipse.oomph.all-feature/build.properties
index 5bc7fc6dd..7c168557d 100644
--- a/features/org.eclipse.oomph.all-feature/build.properties
+++ b/features/org.eclipse.oomph.all-feature/build.properties
@@ -10,7 +10,8 @@
# UpdateTrigger = 20160322-1212
bin.includes = feature.xml,\
- feature.properties
+ feature.properties,\
+ p2.inf
generateSourceReferences = true
src.includes = pom.xml
diff --git a/features/org.eclipse.oomph.all-feature/p2.inf b/features/org.eclipse.oomph.all-feature/p2.inf
new file mode 100644
index 000000000..93803b5eb
--- /dev/null
+++ b/features/org.eclipse.oomph.all-feature/p2.inf
@@ -0,0 +1,5 @@
+requires.0.namespace=org.eclipse.equinox.p2.iu
+requires.0.name=org.eclipse.oomph.all.source.feature.group
+requires.0.range=[$version$,$version$]
+requires.0.greedy=true
+requires.0.optional=true
diff --git a/releng/org.eclipse.oomph.parent/features/pom.xml b/releng/org.eclipse.oomph.parent/features/pom.xml
index ae76f0a25..d700a59cc 100644
--- a/releng/org.eclipse.oomph.parent/features/pom.xml
+++ b/releng/org.eclipse.oomph.parent/features/pom.xml
@@ -60,62 +60,54 @@ Eike Stepper - initial API and implementation
<module>../../../features/org.eclipse.oomph.workingsets-feature</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-source-feature</id>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <plugin id="org.apache.commons.codec"/>
+ <plugin id="org.apache.commons.logging"/>
+ <plugin id="org.apache.httpcomponents.httpclient"/>
+ <plugin id="org.apache.httpcomponents.httpcore"/>
+ <plugin id="org.eclipse.nebula.widgets.tablecombo"/>
+ <plugin id="org.eclipse.oomph.releng.helpcenter"/>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-p2-metadata-default</id>
+ <configuration>
+ <attachP2Metadata>false</attachP2Metadata>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
- <id>generate-source</id>
- <activation>
- <property>
- <name>GENERATE_SOURCE</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-source-feature</id>
- <goals>
- <goal>source-feature</goal>
- </goals>
- <configuration>
- <excludes>
- <plugin id="org.apache.commons.codec"/>
- <plugin id="org.apache.commons.logging"/>
- <plugin id="org.apache.httpcomponents.httpclient"/>
- <plugin id="org.apache.httpcomponents.httpcore"/>
- <plugin id="org.eclipse.nebula.widgets.tablecombo"/>
- <plugin id="org.eclipse.oomph.releng.helpcenter"/>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <executions>
- <execution>
- <id>default-p2-metadata-default</id>
- <configuration>
- <attachP2Metadata>false</attachP2Metadata>
- </configuration>
- </execution>
- <execution>
- <id>attach-p2-metadata</id>
- <phase>package</phase>
- <goals>
- <goal>p2-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>pack-and-sign</id>
<activation>
<property>
diff --git a/releng/org.eclipse.oomph.parent/plugins/pom.xml b/releng/org.eclipse.oomph.parent/plugins/pom.xml
index f6886de32..e4b67b822 100644
--- a/releng/org.eclipse.oomph.parent/plugins/pom.xml
+++ b/releng/org.eclipse.oomph.parent/plugins/pom.xml
@@ -115,33 +115,25 @@ Eike Stepper - initial API and implementation
<module>../../../plugins/org.eclipse.oomph.workingsets.editor</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
- <id>generate-source</id>
- <activation>
- <property>
- <name>GENERATE_SOURCE</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>pack-and-sign</id>
<activation>
<property>
diff --git a/sites/org.eclipse.oomph.site/category.xml b/sites/org.eclipse.oomph.site/category.xml
index b3afbb62e..832f7e07f 100644
--- a/sites/org.eclipse.oomph.site/category.xml
+++ b/sites/org.eclipse.oomph.site/category.xml
@@ -90,9 +90,6 @@
<feature id="org.eclipse.oomph.all" version="0.0.0">
<category name="org.eclipse.oomph.others.category"/>
</feature>
- <feature id="org.eclipse.oomph.all.source" version="0.0.0">
- <category name="org.eclipse.oomph.others.category"/>
- </feature>
<feature id="org.eclipse.oomph.tests" version="0.0.0">
<category name="org.eclipse.oomph.others.category"/>
</feature>

Back to the top