Project

General

Profile

« Previous | Next » 

Revision d35eb644

Added by Andreas Kohlbecker over 2 years ago

  • ID d35eb644063bee8dab58edcb026a6e08b3806c10
  • Parent e0f57c31

modify pom for preprelease

View differences:

pom.xml
4 4
  <modelVersion>4.0.0</modelVersion>
5 5
  <groupId>eu.etaxonomy</groupId>
6 6
  <artifactId>cdm-server</artifactId>
7
  <version>5.26.0-SNAPSHOT</version>
7
  <version>5.26.0-PRE</version>
8 8
  <packaging>jar</packaging>
9 9
  <name>CDM Community Standalone Server</name>
10 10

  
11 11
  <properties>
12 12
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13 13
    <jetty-version>9.4.26.v20200117</jetty-version>
14
    <javadoc.opts>-Xdoclint:none</javadoc.opts>
15
  </properties>
14
	<javadoc.opts>-Xdoclint:none</javadoc.opts>
15
	<cdm.version>5.26.0-SNAPSHOT</cdm.version>
16
</properties>
16 17

  
17 18
  <scm>
18 19
    <!-- see section Provider Configuration in http://maven.apache.org/scm/subversion.html 
......
156 157
    <resources>
157 158
      <!-- ${basedir}/src/main/resources -->
158 159
      <resource>
159
        <!-- replace the project-version placeholder in the version.properties 
160
        <!-- replace the cdm.version placeholder in the version.properties 
160 161
          file. This property can then be used to retrieve the version number in the 
161 162
          Bootloader -->
162 163
        <targetPath>${project.build.directory}/classes</targetPath>
......
339 340
              <overWriteReleases>true</overWriteReleases>
340 341
              <artifactItems>
341 342
                <artifactItem>
342
                  <!-- copy the cdm-webapp-${project.version}.war 
343
                  <!-- copy the cdm-webapp-${cdm.version}.war 
343 344
                    to the build dir -->
344 345
                  <groupId>eu.etaxonomy</groupId>
345 346
                  <artifactId>cdm-webapp</artifactId>
346
                  <version>${project.version}</version>
347
                  <version>${cdm.version}</version>
347 348
                  <type>war</type>
348 349
                  <!-- <classifier> [classifier - optional] </classifier> -->
349 350
                  <overWrite>true</overWrite>
350
                  <destFileName>cdm-webapp-${project.version}.war</destFileName>
351
                  <destFileName>cdm-webapp-${cdm.version}.war</destFileName>
351 352
                  <outputDirectory>
352 353
                    ${project.build.directory}
353 354
                  </outputDirectory>
......
422 423
            <phase>install</phase>
423 424
            <configuration>
424 425
              <tasks>
425
                <property name="project.fullversionstring" value="${project.version}" />
426
                <property name="project.version" value="${project.version}" />
426
                <property name="project.fullversionstring" value="${cdm.version}" />
427
                <property name="cdm.version" value="${cdm.version}" />
427 428
                <ant antfile="${project.basedir}/src/main/installer/linux/build-deb.xml" dir="${project.basedir}" />
428 429
              </tasks>
429 430
            </configuration>
......
440 441
        <version>1.3.2</version>
441 442
        <executions>
442 443
          <execution>
443
            <phase>install</phase>
444
            <!-- <phase>install</phase> --><!-- DISABLED -->
444 445
            <goals>
445 446
              <goal>exec</goal>
446 447
            </goals>
......
480 481
                    <descriptorRef>artifact</descriptorRef>
481 482
                    <!--
482 483
                         1. The maven plugin copies the jar to the artifacts assembly location at:
483
                            ./target/docker/eu.etaxonomy/cdm-server/${project.version}/build/maven/cdm-server-${project.version}.jar
484
                         2. a tar is being created at target/docker/eu.etaxonomy/cdm-server/${project.version}/tmp/docker-build.tar 
484
                            ./target/docker/eu.etaxonomy/cdm-server/${cdm.version}/build/maven/cdm-server-${cdm.version}.jar
485
                         2. a tar is being created at target/docker/eu.etaxonomy/cdm-server/${cdm.version}/tmp/docker-build.tar 
485 486
                            which contains all files located in /target/docker/production and the artifacts. 
486 487
                            Artifacts are put into the folder maven/ inside the tar archive
487 488
                         3. The tar archive is passed to the docker daemon and is used as working directory for the build 
......
551 552
        </executions>
552 553
        <configuration>
553 554
          <fromDir>target</fromDir>
554
          <includes>*${project.version}*.deb,*${project.version}*.jar,*${project.version}*.exe</includes>
555
          <url>scpexe://wp5.e-taxonomy.eu/var/www/download/cdmserver/${project.version}</url>
555
          <includes>*${cdm.version}*.deb,*${cdm.version}*.jar,*${cdm.version}*.exe</includes>
556
          <url>scpexe://wp5.e-taxonomy.eu/var/www/download/cdmserver/${cdm.version}</url>
556 557
          <serverId>wp5.e-taxonomy.eu</serverId>
557 558
        </configuration>
558 559
      </plugin>
......
658 659
      <!-- <dependency> -->
659 660
      <!--   <groupId>eu.etaxonomy</groupId>  -->
660 661
      <!--   <artifactId>cdm-webapp</artifactId> -->
661
      <!--   <version>${project.version}</version>  -->
662
      <!--   <version>${cdm.version}</version>  -->
662 663
      <!--   <type>war</type> -->
663 664
      <!-- </dependency> -->
664 665
      
......
769 770
    <dependency>
770 771
      <groupId>eu.etaxonomy</groupId>
771 772
      <artifactId>cdmlib-db</artifactId>
772
      <version>${project.version}</version>
773
      <version>${cdm.version}</version>
773 774
    </dependency>
774 775
  </dependencies>
775 776

  

Also available in: Unified diff