--- rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties.bak	2013-05-10 10:19:28.000000000 +0200
+++ rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties	2013-05-10 11:29:48.359120855 +0200
@@ -11,10 +11,16 @@
 bin.includes = plugin.properties,\
                about.html,\
                META-INF/,\
+               org/,\
                about_files/
 src.includes = plugin.properties,\
                about.html,\
                about_files/
+source.. = src/
+output.. = bin/
 customBuildCallbacks=customBuildCallbacks.xml
 javacSource = 1.5
 javacTarget = 1.5
+jars.compile.order = library.jar,\
+                     src/
+source.library.jar = src2/
--- rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml.bak	2013-05-10 10:19:28.000000000 +0200
+++ rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml	2013-05-10 11:28:11.292306529 +0200
@@ -25,64 +25,81 @@
   <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>
-        <!-- 
-        When building monolith, optional import-package javax.microedition.io causes circular dependency
-        between this org.eclipse.osgi.services bundle and org.eclipse.equinox.io. 
-        Since this bundle does not need to compile anything, we just disable optional dependencies during
-        the build. 
-         -->
         <configuration>
           <dependency-resolution>
-            <optionalDependencies>ignore</optionalDependencies>
+            <optionalDependencies>ignore</optionalDependencies>
+            <extraRequirements>
+              <requirement>
+                <type>eclipse-plugin</type>
+                <id>javax.servlet</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
           </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>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>extract-sources</id>
+                <phase>process-resources</phase>
+                <configuration>
+                  <target>
+                    <mkdir dir="src" />
+                    <mkdir dir="bin" />
+                    <unzip src="src.zip" dest="src" overwrite="false"/>
+                    <mkdir dir="src2/javax" />
+                    <copy todir="src2/javax/">
+                    	<fileset dir="../../../rt.equinox.bundles/bundles/org.eclipse.equinox.io/src/javax"/>
+                    </copy>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>copy-classes-back</id>
+                <phase>process-classes</phase>
+                <configuration>
+                  <target>
+                    <copy todir="org/">
+                    	<fileset dir="target/classes/org/"/>
+                    </copy>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>bsf</groupId>
+                <artifactId>bsf</artifactId>
+                <version>2.4.0</version>
+              </dependency>
+              <dependency>
+                <groupId>rhino</groupId>
+                <artifactId>js</artifactId>
+                <version>1.7R2</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-apache-bsf</artifactId>
+                <version>1.8.3</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-nodeps</artifactId>
+                <version>1.8.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
     </plugins>
   </build>