Commit 4494f1ae2b39b1959d52f291858d84d0083c3f25

Authored by Nathanael Jourdane
1 parent 1f3536c5
Exists in master

pom.xml update:

- [bugfix] update <pluginManagement> to actually process ant scripts;
- add a task to copy log4j.properties file.
Showing 1 changed file with 90 additions and 38 deletions   Show diff stats
pom.xml
... ... @@ -85,7 +85,92 @@
85 85 <clearOutputDir>false</clearOutputDir>
86 86 </configuration>
87 87 </plugin>
  88 + <plugin>
  89 + <artifactId>maven-antrun-plugin</artifactId>
  90 + <version>1.7</version>
  91 + <executions>
  92 + <execution>
  93 + <phase>process-classes</phase>
  94 + <configuration>
  95 + <tasks>
  96 + <copy file="${basedir}/log4j.properties" todir="${basedir}/target/classes/" />
  97 + </tasks>
  98 + </configuration>
  99 + <goals>
  100 + <goal>run</goal>
  101 + </goals>
  102 + </execution>
  103 + <execution>
  104 + <id>remove-episode</id>
  105 + <phase>process-sources</phase>
  106 + <goals>
  107 + <goal>run</goal>
  108 + </goals>
  109 + <configuration>
  110 + <target name="Removing META-INF/sun-jaxb.episode">
  111 + <delete file="${basedir}/src/main/java/META-INF/sun-jaxb.episode" />
  112 + </target>
  113 + </configuration>
  114 + </execution>
  115 + <execution>
  116 + <id>suppress-warning-generated</id>
  117 + <phase>process-sources</phase>
  118 + <goals>
  119 + <goal>run</goal>
  120 + </goals>
  121 + <configuration>
  122 + <target name="Adding @SuppressWarnings on generated *.java">
  123 + <replace
  124 + dir="${basedir}/src/main/java/eu/omp/irap/vespa/epntapclient/votable/model/"
  125 + summary="true" includes="*.java" token="public class"
  126 + value='@SuppressWarnings("all")&#10;public class' />
  127 + <replace
  128 + dir="${basedir}/src/main/java/eu/omp/irap/vespa/epntapclient/votable/model/"
  129 + summary="true" includes="*.java" token="public enum"
  130 + value='@SuppressWarnings("all")&#10;public enum' />
  131 + </target>
  132 + </configuration>
  133 + </execution>
  134 + </executions>
  135 +
  136 + </plugin>
88 137 </plugins>
  138 + <pluginManagement>
  139 + <plugins>
  140 + <!--This plugin's configuration is used to store Eclipse m2e settings
  141 + only. It has no influence on the Maven build itself. -->
  142 + <plugin>
  143 + <groupId>org.eclipse.m2e</groupId>
  144 + <artifactId>lifecycle-mapping</artifactId>
  145 + <version>1.0.0</version>
  146 + <configuration>
  147 + <lifecycleMappingMetadata>
  148 + <pluginExecutions>
  149 + <pluginExecution>
  150 + <pluginExecutionFilter>
  151 + <groupId>
  152 + org.apache.maven.plugins
  153 + </groupId>
  154 + <artifactId>
  155 + maven-antrun-plugin
  156 + </artifactId>
  157 + <versionRange>
  158 + [1.7,)
  159 + </versionRange>
  160 + <goals>
  161 + <goal>run</goal>
  162 + </goals>
  163 + </pluginExecutionFilter>
  164 + <action>
  165 + <execute />
  166 + </action>
  167 + </pluginExecution>
  168 + </pluginExecutions>
  169 + </lifecycleMappingMetadata>
  170 + </configuration>
  171 + </plugin>
  172 + </plugins>
  173 + </pluginManagement>
89 174 </build>
90 175 <dependencies>
91 176 <dependency>
... ... @@ -94,6 +179,11 @@
94 179 <version>2.2.2</version>
95 180 <scope>compile</scope>
96 181 </dependency>
  182 + <dependency>
  183 + <groupId>log4j</groupId>
  184 + <artifactId>log4j</artifactId>
  185 + <version>1.2.17</version>
  186 + </dependency>
97 187 </dependencies>
98 188 <profiles>
99 189 <profile>
... ... @@ -123,44 +213,6 @@
123 213 </executions>
124 214 </plugin>
125 215 </plugins>
126   - <pluginManagement>
127   - <plugins>
128   - <plugin>
129   - <groupId>org.apache.maven.plugins</groupId>
130   - <artifactId>maven-antrun-plugin</artifactId>
131   - <version>1.7</version>
132   - <executions>
133   - <execution>
134   - <id>remove-episode</id>
135   - <phase>process-sources</phase>
136   - <goals>
137   - <goal>run</goal>
138   - </goals>
139   - <configuration>
140   - <target name="Removing META-INF/sun-jaxb.episode">
141   - <delete file="${basedir}/src/main/java/META-INF/sun-jaxb.episode" />
142   - </target>
143   - </configuration>
144   - </execution>
145   - <execution>
146   - <id>suppress-warning-generated</id>
147   - <phase>process-sources</phase>
148   - <goals>
149   - <goal>run</goal>
150   - </goals>
151   - <configuration>
152   - <target name="Adding @SuppressWarnings on generated *.java">
153   - <replace
154   - dir="${basedir}/src/main/java/eu/omp/irap/vespa/epntapclient/votable/model/"
155   - summary="true" includes="*.java" token="public class"
156   - value='@SuppressWarnings("all") public class' />
157   - </target>
158   - </configuration>
159   - </execution>
160   - </executions>
161   - </plugin>
162   - </plugins>
163   - </pluginManagement>
164 216 </build>
165 217 </profile>
166 218 </profiles>
... ...