Revision 59cf966f
Added by Lutz Suhrbier over 12 years ago
| pom.xml | ||
|---|---|---|
| 14 | 14 |
<packaging>pom</packaging> |
| 15 | 15 |
<properties> |
| 16 | 16 |
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
| 17 |
<cdmlib.version>3.0.7-SNAPSHOT</cdmlib.version>
|
|
| 17 |
<cdmlib.version>3.0.8-SNAPSHOT</cdmlib.version>
|
|
| 18 | 18 |
<tycho.version>0.12.0</tycho.version> |
| 19 | 19 |
<taxeditor.version>3.0.6-SNAPSHOT</taxeditor.version> |
| 20 | 20 |
</properties> |
| ... | ... | |
| 26 | 26 |
<module>eu.etaxonomy.taxeditor.bulkeditor</module> |
| 27 | 27 |
<module>eu.etaxonomy.taxeditor.printpublisher</module> |
| 28 | 28 |
<!--module>eu.etaxonomy.taxeditor.annotatedlineeditor</module--> |
| 29 |
<module>eu.etaxonomy.taxeditor.help</module> |
|
| 29 | 30 |
<module>eu.etaxonomy.taxeditor.application</module> |
| 30 | 31 |
<module>eu.etaxonomy.taxeditor.feature.platform</module> |
| 31 | 32 |
<module>eu.etaxonomy.taxeditor.feature</module> |
| ... | ... | |
| 82 | 83 |
</issueManagement> |
| 83 | 84 |
<ciManagement> |
| 84 | 85 |
<system>Jenkins</system> |
| 85 |
<url>http://160.45.63.201/jenkins</url> |
|
| 86 |
<url>http://160.45.63.201/jenkins/view/EDIT%20Taxonomic%20Editor/</url>
|
|
| 86 | 87 |
</ciManagement> |
| 87 | 88 |
<!-- **** REPOSITORIES **** --> |
| 88 | 89 |
<repositories> |
| 89 | 90 |
<!-- the cdm internal repository --> |
| 90 | 91 |
<repository> |
| 91 | 92 |
<id>EditRepository</id> |
| 92 |
<url>http://wp5.e-taxonomy.eu/cdmlib/mavenrepo/</url>
|
|
| 93 |
<url>http://wp5.e-taxonomy.eu/mavenrepo/</url> |
|
| 93 | 94 |
</repository> |
| 94 | 95 |
</repositories> |
| 95 | 96 |
<build> |
| ... | ... | |
| 187 | 188 |
<plugin> |
| 188 | 189 |
<groupId>org.apache.maven.plugins</groupId> |
| 189 | 190 |
<artifactId>maven-site-plugin</artifactId> |
| 190 |
<version>2.2</version>
|
|
| 191 |
<version>3.0</version>
|
|
| 191 | 192 |
<configuration> |
| 192 | 193 |
<locales>en</locales> |
| 193 | 194 |
</configuration> |
| ... | ... | |
| 255 | 256 |
<plugin> |
| 256 | 257 |
<groupId>org.codehaus.mojo</groupId> |
| 257 | 258 |
<artifactId>wagon-maven-plugin</artifactId> |
| 258 |
<!-- |
|
| 259 |
<version>1.0-beta-3</version> |
|
| 260 |
<!-- |
|
| 259 | 261 |
Problems with the wagon-maven-plugin have been encounterd on Windows, |
| 260 | 262 |
it should work properly on linux though. |
| 261 | 263 |
--> |
| ... | ... | |
| 275 | 277 |
</configuration> |
| 276 | 278 |
</plugin> |
| 277 | 279 |
</plugins> |
| 278 |
<pluginManagement> |
|
| 280 |
<!--pluginManagement>
|
|
| 279 | 281 |
<plugins> |
| 280 | 282 |
<plugin> |
| 281 | 283 |
<groupId>org.apache.maven.plugins</groupId> |
| ... | ... | |
| 286 | 288 |
<groupId>org.codehaus.mojo</groupId> |
| 287 | 289 |
<artifactId>wagon-maven-plugin</artifactId> |
| 288 | 290 |
<version>1.0-beta-3</version> |
| 289 |
</plugin> |
|
| 290 |
<!--plugin>
|
|
| 291 |
</plugin-->
|
|
| 292 |
<!--plugin> |
|
| 291 | 293 |
<groupId>org.eclipse.tycho</groupId> |
| 292 | 294 |
<artifactId>tycho-packaging-plugin</artifactId> |
| 293 | 295 |
<version>${tycho.version}</version-->
|
| 294 |
<!--executions>
|
|
| 296 |
<!--executions> |
|
| 295 | 297 |
<execution> |
| 296 | 298 |
<id>timestamp</id> |
| 297 | 299 |
<phase>validate</phase> |
| ... | ... | |
| 300 | 302 |
</goals> |
| 301 | 303 |
</execution> |
| 302 | 304 |
</executions--> |
| 303 |
<!-- for some reason configuration won't work here, have to define
|
|
| 305 |
<!-- for some reason configuration won't work here, have to define |
|
| 304 | 306 |
in each module --> |
| 305 |
<!--configuration>
|
|
| 307 |
<!--configuration> |
|
| 306 | 308 |
<archive> |
| 307 | 309 |
<addMavenDescriptor>false</addMavenDescriptor> |
| 308 | 310 |
</archive> |
| ... | ... | |
| 315 | 317 |
</environments> |
| 316 | 318 |
</configuration> |
| 317 | 319 |
</plugin--> |
| 318 |
</plugins>
|
|
| 319 |
</pluginManagement> |
|
| 320 |
<!--/plugins>
|
|
| 321 |
</pluginManagement-->
|
|
| 320 | 322 |
<extensions> |
| 321 |
<extension> |
|
| 322 |
<groupId>org.apache.maven.wagon</groupId> |
|
| 323 |
<artifactId>wagon-scm</artifactId> |
|
| 324 |
<version>1.0-alpha-5</version> |
|
| 325 |
</extension> |
|
| 326 |
<extension> |
|
| 327 |
<groupId>org.apache.maven.wagon</groupId> |
|
| 328 |
<artifactId>wagon-ssh</artifactId> |
|
| 329 |
<version>1.0-beta-7</version> |
|
| 330 |
</extension> |
|
| 331 |
<extension> |
|
| 332 |
<groupId>org.apache.maven.scm</groupId> |
|
| 333 |
<artifactId>maven-scm-manager-plexus</artifactId> |
|
| 334 |
<version>1.0</version> |
|
| 335 |
</extension> |
|
| 336 |
<extension> |
|
| 337 |
<groupId>org.apache.maven.scm</groupId> |
|
| 338 |
<artifactId>maven-scm-provider-svnexe</artifactId> |
|
| 339 |
<version>1.0</version> |
|
| 340 |
</extension> |
|
| 341 |
<!-- WebDAV plugin to upload snapshots --> |
|
| 342 |
<extension> |
|
| 343 |
<groupId>org.apache.maven.wagon</groupId> |
|
| 344 |
<artifactId>wagon-webdav</artifactId> |
|
| 345 |
<version>1.0-beta-2</version> |
|
| 346 |
</extension> |
|
| 323 |
<extension> |
|
| 324 |
<groupId>org.apache.maven.wagon</groupId> |
|
| 325 |
<artifactId>wagon-scm</artifactId> |
|
| 326 |
<version>1.0-alpha-5</version> |
|
| 327 |
</extension> |
|
| 328 |
<extension> |
|
| 329 |
<groupId>org.apache.maven.wagon</groupId> |
|
| 330 |
<artifactId>wagon-ssh</artifactId> |
|
| 331 |
<version>1.0-beta-7</version> |
|
| 332 |
</extension> |
|
| 333 |
<extension> |
|
| 334 |
<groupId>org.apache.maven.wagon</groupId> |
|
| 335 |
<artifactId>wagon-ssh-external</artifactId> |
|
| 336 |
<version>1.0-beta-6</version> |
|
| 337 |
</extension> |
|
| 338 |
<extension> |
|
| 339 |
<groupId>org.apache.maven.scm</groupId> |
|
| 340 |
<artifactId>maven-scm-manager-plexus</artifactId> |
|
| 341 |
<version>1.0</version> |
|
| 342 |
</extension> |
|
| 343 |
<extension> |
|
| 344 |
<groupId>org.apache.maven.scm</groupId> |
|
| 345 |
<artifactId>maven-scm-provider-svnexe</artifactId> |
|
| 346 |
<version>1.0</version> |
|
| 347 |
</extension> |
|
| 348 |
<!-- WebDAV plugin to upload snapshots --> |
|
| 349 |
<extension> |
|
| 350 |
<groupId>org.apache.maven.wagon</groupId> |
|
| 351 |
<artifactId>wagon-webdav</artifactId> |
|
| 352 |
<version>1.0-beta-2</version> |
|
| 353 |
</extension> |
|
| 347 | 354 |
</extensions> |
| 348 | 355 |
</build> |
| 349 | 356 |
<reporting> |
| ... | ... | |
| 393 | 400 |
<uniqueVersion>false</uniqueVersion> |
| 394 | 401 |
<id>wp5.e-taxonomy.eu</id> |
| 395 | 402 |
<name>Edit Maven Repository</name> |
| 396 |
<url>scpexe://160.45.63.151/var/www/wp5.e-taxonomy.eu/cdmlib/mavenrepo/</url>
|
|
| 403 |
<url>scpexe://160.45.63.151/var/www/wp5.e-taxonomy.eu/mavenrepo/</url> |
|
| 397 | 404 |
</repository> |
| 398 | 405 |
</distributionManagement> |
| 399 | 406 |
</project> |
Also available in: Unified diff
Result of first merge, updated getTaxon() String