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

Return to bug 385154