2012-07-30 11:09:46 +00:00
|
|
|
--- rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml.bak 2012-07-25 17:42:07.000000000 +0200
|
|
|
|
|
+++ rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml 2012-07-30 12:05:54.525785334 +0200
|
2012-08-02 06:22:53 +00:00
|
|
|
@@ -42,6 +42,84 @@
|
2012-07-30 11:09:46 +00:00
|
|
|
</dependency-resolution>
|
|
|
|
|
</configuration>
|
|
|
|
|
</plugin>
|
|
|
|
|
+ <plugin>
|
|
|
|
|
+ <groupId>org.eclipse.tycho</groupId>
|
|
|
|
|
+ <artifactId>target-platform-configuration</artifactId>
|
|
|
|
|
+ <configuration>
|
|
|
|
|
+ <dependency-resolution>
|
|
|
|
|
+ <extraRequirements>
|
|
|
|
|
+ <requirement>
|
|
|
|
|
+ <type>eclipse-plugin</type>
|
|
|
|
|
+ <id>javax.servlet</id>
|
|
|
|
|
+ <versionRange>0.0.0</versionRange>
|
|
|
|
|
+ </requirement>
|
|
|
|
|
+ <!--requirement>
|
|
|
|
|
+ <type>eclipse-plugin</type>
|
|
|
|
|
+ <id>org.eclipse.equinox.io</id>
|
|
|
|
|
+ <versionRange>0.0.0</versionRange>
|
|
|
|
|
+ </requirement-->
|
|
|
|
|
+ </extraRequirements>
|
|
|
|
|
+ </dependency-resolution>
|
|
|
|
|
+ </configuration>
|
|
|
|
|
+ </plugin>
|
|
|
|
|
+ <plugin>
|
|
|
|
|
+ <artifactId>maven-antrun-plugin</artifactId>
|
|
|
|
|
+ <version>1.7</version>
|
|
|
|
|
+ <executions>
|
|
|
|
|
+ <execution>
|
2012-08-02 06:22:53 +00:00
|
|
|
+ <id>extract-sources</id>
|
2012-07-30 11:09:46 +00:00
|
|
|
+ <phase>process-resources</phase>
|
|
|
|
|
+ <configuration>
|
|
|
|
|
+ <target>
|
2012-08-02 06:22:53 +00:00
|
|
|
+ <mkdir dir="src" /><mkdir dir="bin" />
|
|
|
|
|
+ <unzip src="src.zip" dest="src" overwrite="false"/>
|
2012-07-30 11:09:46 +00:00
|
|
|
+ <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>
|
2012-08-02 06:22:53 +00:00
|
|
|
+ <execution>
|
|
|
|
|
+ <id>copy-classes-back</id>
|
|
|
|
|
+ <phase>process-classes</phase>
|
|
|
|
|
+ <configuration>
|
|
|
|
|
+ <target>
|
|
|
|
|
+ <copy todir="org/"><fileset dir="target/classes/org/"/></copy>
|
|
|
|
|
+ <!--unzip src="src.zip" dest="src" overwrite="false"/>
|
|
|
|
|
+ <mkdir dir="src2/javax" />
|
|
|
|
|
+ -->
|
|
|
|
|
+ </target>
|
|
|
|
|
+ </configuration>
|
|
|
|
|
+ <goals>
|
|
|
|
|
+ <goal>run</goal>
|
|
|
|
|
+ </goals>
|
|
|
|
|
+ </execution>
|
2012-07-30 11:09:46 +00:00
|
|
|
+ </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>
|
|
|
|
|
|
2012-08-02 06:22:53 +00:00
|
|
|
--- rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties.bak 2012-08-01 16:03:39.000000000 +0200
|
|
|
|
|
+++ rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties 2012-08-01 16:22:16.274724843 +0200
|
|
|
|
|
@@ -11,13 +11,16 @@
|
|
|
|
|
bin.includes = plugin.properties,\
|
|
|
|
|
about.html,\
|
|
|
|
|
META-INF/,\
|
|
|
|
|
- org/,\
|
|
|
|
|
+ org/,\
|
|
|
|
|
about_files/
|
|
|
|
|
src.includes = src.zip,\
|
|
|
|
|
about.html,\
|
|
|
|
|
about_files/
|
|
|
|
|
-source.. = .
|
|
|
|
|
-output.. = .
|
|
|
|
|
+source.. = src/
|
|
|
|
|
+output.. = bin/
|
|
|
|
|
customBuildCallbacks=customBuildCallbacks.xml
|
|
|
|
|
javacSource = 1.5
|
|
|
|
|
javacTarget = 1.5
|
|
|
|
|
+jars.compile.order = library.jar,\
|
|
|
|
|
+ src/
|
|
|
|
|
+source.library.jar = src2/
|
