aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2013-05-07 22:51:33 (EDT)
committerThomas Watson2013-05-08 15:33:05 (EDT)
commit6447261180fce2fef30fbdc7175b49fa025f6864 (patch)
tree47c9b757639956df4269e98f001bbb493518f3a9
parent80424a72af56a7bd24b89c98fbbc028993650b7a (diff)
downloadrt.equinox.framework-6447261180fce2fef30fbdc7175b49fa025f6864.zip
rt.equinox.framework-6447261180fce2fef30fbdc7175b49fa025f6864.tar.gz
rt.equinox.framework-6447261180fce2fef30fbdc7175b49fa025f6864.tar.bz2
Bug 407201 - Source bundles for org.eclipse.osgi.services and -.util broken
-rw-r--r--bundles/org.eclipse.osgi.services/build.properties5
-rw-r--r--bundles/org.eclipse.osgi.services/pom.xml44
-rw-r--r--bundles/org.eclipse.osgi.util/build.properties5
-rw-r--r--bundles/org.eclipse.osgi.util/pom.xml50
4 files changed, 96 insertions, 8 deletions
diff --git a/bundles/org.eclipse.osgi.services/build.properties b/bundles/org.eclipse.osgi.services/build.properties
index cf8b197..46cc6dc 100644
--- a/bundles/org.eclipse.osgi.services/build.properties
+++ b/bundles/org.eclipse.osgi.services/build.properties
@@ -11,13 +11,10 @@
bin.includes = plugin.properties,\
about.html,\
META-INF/,\
- org/,\
about_files/
-src.includes = src.zip,\
+src.includes = plugin.properties,\
about.html,\
about_files/
-source.. = .
-output.. = .
customBuildCallbacks=customBuildCallbacks.xml
javacSource = 1.5
javacTarget = 1.5
diff --git a/bundles/org.eclipse.osgi.services/pom.xml b/bundles/org.eclipse.osgi.services/pom.xml
index 0df6bb0..35a1e53 100644
--- a/bundles/org.eclipse.osgi.services/pom.xml
+++ b/bundles/org.eclipse.osgi.services/pom.xml
@@ -25,6 +25,24 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <unzip src="src.zip" dest="${basedir}"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<!--
@@ -39,6 +57,32 @@
</dependency-resolution>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <additionalFileSets>
+ <fileSet>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>org/**/*.class</include>
+ </includes>
+ </fileSet>
+ </additionalFileSets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <includes>
+ <include>org/**/*.java</include>
+ <include>org/**/packageinfo</include>
+ </includes>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/bundles/org.eclipse.osgi.util/build.properties b/bundles/org.eclipse.osgi.util/build.properties
index 7e2fef0..46cc6dc 100644
--- a/bundles/org.eclipse.osgi.util/build.properties
+++ b/bundles/org.eclipse.osgi.util/build.properties
@@ -9,15 +9,12 @@
# IBM Corporation - initial API and implementation
###############################################################################
bin.includes = plugin.properties,\
- org/,\
about.html,\
META-INF/,\
about_files/
-src.includes = src.zip,\
+src.includes = plugin.properties,\
about.html,\
about_files/
-source.. = .
-output.. = .
customBuildCallbacks=customBuildCallbacks.xml
javacSource = 1.5
javacTarget = 1.5
diff --git a/bundles/org.eclipse.osgi.util/pom.xml b/bundles/org.eclipse.osgi.util/pom.xml
index cc97c1f..4e57146 100644
--- a/bundles/org.eclipse.osgi.util/pom.xml
+++ b/bundles/org.eclipse.osgi.util/pom.xml
@@ -21,4 +21,54 @@
<artifactId>org.eclipse.osgi.util</artifactId>
<version>3.2.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <unzip src="src.zip" dest="${basedir}"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <additionalFileSets>
+ <fileSet>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>org/**/*.class</include>
+ </includes>
+ </fileSet>
+ </additionalFileSets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <includes>
+ <include>org/**/*.java</include>
+ <include>org/**/packageinfo</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>