Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 385154 | Differences between
and this patch

Collapse All | Expand All

(-)a/org.eclipse.jdt.compiler.apt/pom.xml (+78 lines)
Lines 22-25 Link Here
22
  <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
22
  <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
23
  <version>1.0.500-SNAPSHOT</version>
23
  <version>1.0.500-SNAPSHOT</version>
24
  <packaging>eclipse-plugin</packaging>
24
  <packaging>eclipse-plugin</packaging>
25
26
27
  <build>
28
	<plugins>
29
          <plugin>
30
            <artifactId>maven-antrun-plugin</artifactId>
31
            <version>1.7</version>
32
            <executions>
33
              <execution>
34
                <id>natives</id>
35
                <phase>process-classes</phase>
36
                <configuration>
37
                  <target>
38
39
			<path id="ecj.id">
40
			    <fileset dir="${basedir}/../org.eclipse.jdt.core/target/">
41
			        <include name="org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler.jar"/>
42
			     </fileset>
43
			</path> 
44
45
			<property name="ecj.file" refid="ecj.id"/>
46
		
47
			<echo message="UPDATE ${ecj.file}" />
48
49
			<property name="unjarDestBin" value="${basedir}/tempbin"/>
50
			<mkdir dir="${unjarDestBin}"/>
51
			
52
			<unjar
53
				src="${ecj.file}"
54
				dest="${unjarDestBin}"/>
55
	
56
			<zip destfile="${ecj.file}" update="true">
57
				<!-- old stuff -->
58
				<fileset dir="${unjarDestBin}"/>	
59
				<!-- new stuff: this plugin classes are here -->
60
				<fileset dir="${basedir}/target/classes">
61
					<include name="**/*"/>
62
				</fileset>
63
				<fileset dir="${basedir}">
64
					<include name="META-INF/services/**" />
65
				</fileset>
66
			</zip>
67
			<delete dir="${unjarDestBin}" failonerror="false"/>
68
69
			<!-- no source bundle for ecj, as jdt.core pom.xml does not generate it -->
70
71
                  </target>
72
                </configuration>
73
                <goals>
74
                  <goal>run</goal>
75
                </goals>
76
              </execution>
77
            </executions>
78
            <dependencies>
79
              <dependency>
80
                <groupId>bsf</groupId>
81
                <artifactId>bsf</artifactId>
82
                <version>2.4.0</version>
83
              </dependency>
84
              <dependency>
85
                <groupId>rhino</groupId>
86
                <artifactId>js</artifactId>
87
                <version>1.7R2</version>
88
              </dependency>
89
              <dependency>
90
                <groupId>org.apache.ant</groupId>
91
                <artifactId>ant-apache-bsf</artifactId>
92
                <version>1.8.3</version>
93
              </dependency>
94
              <dependency>
95
                <groupId>org.apache.ant</groupId>
96
                <artifactId>ant-nodeps</artifactId>
97
                <version>1.8.1</version>
98
              </dependency>
99
            </dependencies>
100
          </plugin>
101
        </plugins>
102
  </build>
25
</project>
103
</project>
(-)a/org.eclipse.jdt.compiler.tool/pom.xml (-1 / +78 lines)
Lines 22-25 Link Here
22
  <artifactId>org.eclipse.jdt.compiler.tool</artifactId>
22
  <artifactId>org.eclipse.jdt.compiler.tool</artifactId>
23
  <version>1.0.101-SNAPSHOT</version>
23
  <version>1.0.101-SNAPSHOT</version>
24
  <packaging>eclipse-plugin</packaging>
24
  <packaging>eclipse-plugin</packaging>
25
26
27
  <build>
28
	<plugins>
29
          <plugin>
30
            <artifactId>maven-antrun-plugin</artifactId>
31
            <version>1.7</version>
32
            <executions>
33
              <execution>
34
                <id>update-ecj</id>
35
                <phase>process-classes</phase>
36
                <configuration>
37
                  <target>
38
39
			<path id="ecj.id">
40
			    <fileset dir="${basedir}/../org.eclipse.jdt.core/target/">
41
			        <include name="org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler.jar"/>
42
			     </fileset>
43
			</path> 
44
45
			<property name="ecj.file" refid="ecj.id"/>
46
		
47
			<echo message="UPDATE ${ecj.file}" />
48
49
			<property name="unjarDestBin" value="${basedir}/tempbin"/>
50
			<mkdir dir="${unjarDestBin}"/>
51
			
52
			<unjar
53
				src="${ecj.file}"
54
				dest="${unjarDestBin}"/>
55
	
56
			<zip destfile="${ecj.file}" update="true">
57
				<!-- old stuff -->
58
				<fileset dir="${unjarDestBin}"/>	
59
				<!-- new stuff: this plugin classes are here -->
60
				<fileset dir="${basedir}/target/classes">
61
					<include name="**/*"/>
62
				</fileset>
63
				<fileset dir="${basedir}">
64
					<include name="META-INF/services/**" />
65
				</fileset>
66
			</zip>
67
			<delete dir="${unjarDestBin}" failonerror="false"/>
68
69
			<!-- no source bundle for ecj, as jdt.core pom.xml does not generate it -->
70
71
                  </target>
72
                </configuration>
73
                <goals>
74
                  <goal>run</goal>
75
                </goals>
76
              </execution>
77
            </executions>
78
            <dependencies>
79
              <dependency>
80
                <groupId>bsf</groupId>
81
                <artifactId>bsf</artifactId>
82
                <version>2.4.0</version>
83
              </dependency>
84
              <dependency>
85
                <groupId>rhino</groupId>
86
                <artifactId>js</artifactId>
87
                <version>1.7R2</version>
88
              </dependency>
89
              <dependency>
90
                <groupId>org.apache.ant</groupId>
91
                <artifactId>ant-apache-bsf</artifactId>
92
                <version>1.8.3</version>
93
              </dependency>
94
              <dependency>
95
                <groupId>org.apache.ant</groupId>
96
                <artifactId>ant-nodeps</artifactId>
97
                <version>1.8.1</version>
98
              </dependency>
99
            </dependencies>
100
          </plugin>
101
        </plugins>
102
  </build>
25
</project>
103
</project>
26
- 

Return to bug 385154