Enable javadoc build.

This commit is contained in:
Krzysztof Daniel 2012-12-14 14:32:33 +01:00
parent a3320ab005
commit 952ca485ac
2 changed files with 50 additions and 4 deletions

View File

@ -515,7 +515,7 @@
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -23,4 +23,61 @@
@@ -23,4 +23,99 @@
<artifactId>org.eclipse.pde.doc.user</artifactId>
<version>3.8.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
@ -531,6 +531,44 @@
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jdt.debug</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jdt.junit</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.5.1</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <overwriteReleases>true</overwriteReleases>
+ <overwriteSnapshots>true</overwriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-eclipserun-plugin</artifactId>
@ -1191,7 +1229,7 @@
+org.apache.ant.jar=org.apache.ant_*-lib/ant.jar.jar
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml.bak 2012-11-05 15:04:40.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml 2012-11-05 15:23:21.574964609 +0100
@@ -34,6 +34,49 @@
@@ -34,6 +34,54 @@
</activation>
<build>
<plugins>
@ -1216,6 +1254,11 @@
+ <id>org.junit</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.platform.doc.isv</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>

View File

@ -28,7 +28,7 @@ Epoch: 1
# Set this flag to 1 if you want to build Eclipse without dependency to eclipse-pde
# Some parts (help) will not be built, and second run will be required, but this
# is a way to bootstrap Eclipse on secondary archs.
%global bootstrap 1
%global bootstrap 0
# FIXME: update java packaging guidelines for this. See
# fedora-devel-java-list discussion in September 2008.
@ -65,7 +65,7 @@ fi;
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
Release: 21%{?dist}
Release: 22%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -1331,6 +1331,9 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
* Fri Dec 14 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-22
- Enable javadoc build.
* Mon Nov 26 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-21
- Remove javax.xml removal patch declaration.