Commit e2a90693 authored by Nicola Fulvio Calabria's avatar Nicola Fulvio Calabria
Browse files

revert to version without revision

parent a5c45149

.gitlab-ci.yml

+2 −40
Original line number Diff line number Diff line
@@ -13,26 +13,11 @@ build: 
  artifacts:

    paths:

      - target/vospace-datamodel.jar

      - flattened-pom.xml

      - pom.xml

    expire_in: 7 days

  only:

    - master



build-test:

  stage: build

  tags:

    - docker

  image: maven:3.6.3-openjdk-14

  script:

    - mvn clean package -DskipTests -DfinalName=vospace-datamodel-test -Drevision=0.0.2-TEST

  artifacts:

    paths:

      - target/vospace-datamodel-test.jar

      - flattened-pom.xml

    expire_in: 7 days

  only:

    - test



test:

  stage: test

  tags:
@@ -44,17 +29,6 @@ test: 
  only:

    - master



test-test:

  stage: test

  tags:

    - docker

  script:

    - mvn clean test

    - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print "coverage=" 100*covered/instructions }' target/site/jacoco/jacoco.csv

  coverage: '/coverage=\d+\.\d+/'

  only:

    - test



deploy:

  stage: deploy

  tags:
@@ -63,20 +37,8 @@ deploy: 
    - mvn deploy:deploy-file

        -Dfile=target/vospace-datamodel.jar

        -DrepositoryId=ia2.snapshots

        -DpomFile=flattened-pom.xml

        -DpomFile=pom.xml

        -Durl=${IA2_MVN_REPO_SNAPSHOTS}

  only:

    - master

deploy-test:

  stage: deploy

  tags:

    - docker

  script:

    - mvn deploy:deploy-file

        -Dfile=target/vospace-datamodel-test.jar

        -DrepositoryId=ia2.snapshots

        -DpomFile=flattened-pom.xml

        -Durl=${IA2_MVN_REPO_SNAPSHOTS}

  only:

    - test

pom.xml

+2 −29
Original line number Diff line number Diff line
@@ -3,13 +3,12 @@ 
    <modelVersion>4.0.0</modelVersion>

    <groupId>it.oats.inaf</groupId>

    <artifactId>vospace-datamodel</artifactId>

    <version>${revision}</version>

    <version>0.0.2-SNAPSHOT</version>

    <packaging>jar</packaging>

    <properties>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

        <maven.compiler.source>14</maven.compiler.source>

        <maven.compiler.target>14</maven.compiler.target>

	<revision>0.0.2-SNAPSHOT</revision>

        <finalName>${project.artifactId}-${project.version}</finalName>

    </properties>
@@ -61,32 +60,6 @@ 
    <build>

        <finalName>${finalName}</finalName>

        <plugins>        

            <plugin>

                <groupId>org.codehaus.mojo</groupId>

                <artifactId>flatten-maven-plugin</artifactId>

                <version>1.3.0</version>

                <configuration>

                    <updatePomFile>true</updatePomFile>

                    <flattenMode>resolveCiFriendliesOnly</flattenMode>

                    <flattenedPomFilename>flattened-pom.xml</flattenedPomFilename>

                </configuration>

                <executions>

                    <execution>

                        <id>flatten</id>

                        <phase>process-resources</phase>

                        <goals>

                            <goal>flatten</goal>

                        </goals>

                    </execution>

                    <execution>

                        <id>flatten.clean</id>

                        <phase>clean</phase>

                        <goals>

                            <goal>clean</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>            

            <plugin>

                <artifactId>maven-surefire-plugin</artifactId>

                <version>2.22.2</version>