diff options
| author | Thomas Watson | 2013-05-13 19:51:58 +0000 |
|---|---|---|
| committer | Thomas Watson | 2013-05-13 19:56:53 +0000 |
| commit | 4a43819806e41156205f1bea2bd52011f409f242 (patch) | |
| tree | f65493868694a46f7c0d4e8c98af053e96b366fc | |
| parent | 1b5390f6a774b6098d09c7db041d8885f5683dce (diff) | |
| download | rt.equinox.framework-4a43819806e41156205f1bea2bd52011f409f242.tar.gz rt.equinox.framework-4a43819806e41156205f1bea2bd52011f409f242.tar.xz rt.equinox.framework-4a43819806e41156205f1bea2bd52011f409f242.zip | |
Revert "Bug 407201 - Source bundles for org.eclipse.osgi.services and -.util broken"I20130513-2000
This reverts commit 6447261180fce2fef30fbdc7175b49fa025f6864.
| -rw-r--r-- | bundles/org.eclipse.osgi.services/build.properties | 5 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi.services/pom.xml | 44 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi.util/build.properties | 5 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi.util/pom.xml | 50 |
4 files changed, 8 insertions, 96 deletions
diff --git a/bundles/org.eclipse.osgi.services/build.properties b/bundles/org.eclipse.osgi.services/build.properties index 46cc6dca6..cf8b197e9 100644 --- a/bundles/org.eclipse.osgi.services/build.properties +++ b/bundles/org.eclipse.osgi.services/build.properties @@ -11,10 +11,13 @@ bin.includes = plugin.properties,\ about.html,\ META-INF/,\ + org/,\ about_files/ -src.includes = plugin.properties,\ +src.includes = src.zip,\ 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 35a1e53b6..0df6bb0c0 100644 --- a/bundles/org.eclipse.osgi.services/pom.xml +++ b/bundles/org.eclipse.osgi.services/pom.xml @@ -25,24 +25,6 @@ <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> <!-- @@ -57,32 +39,6 @@ </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 46cc6dca6..7e2fef041 100644 --- a/bundles/org.eclipse.osgi.util/build.properties +++ b/bundles/org.eclipse.osgi.util/build.properties @@ -9,12 +9,15 @@ # IBM Corporation - initial API and implementation ############################################################################### bin.includes = plugin.properties,\ + org/,\ about.html,\ META-INF/,\ about_files/ -src.includes = plugin.properties,\ +src.includes = src.zip,\ 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 4e57146c5..cc97c1f98 100644 --- a/bundles/org.eclipse.osgi.util/pom.xml +++ b/bundles/org.eclipse.osgi.util/pom.xml @@ -21,54 +21,4 @@ <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> |