From 23f686805c6403453279292704cf526e264aa22f Mon Sep 17 00:00:00 2001 From: aai <aai@kereval.com> Date: Mon, 18 Oct 2021 17:41:29 +0200 Subject: [PATCH] Clean pom of sub-modules --- archetype/generated-validator/pom.xml | 17 ---- hl7templates/gocmodel-jar/pom.xml | 82 +---------------- hl7templates/hl7templates-api-jar/pom.xml | 88 +------------------ .../hl7templates-generator-jar/pom.xml | 82 +---------------- hl7templates/hl7templates-model-jar/pom.xml | 71 --------------- .../hl7templates-packager-jar/pom.xml | 47 +--------- 6 files changed, 8 insertions(+), 379 deletions(-) diff --git a/archetype/generated-validator/pom.xml b/archetype/generated-validator/pom.xml index 34db8e9..c4ba5c0 100644 --- a/archetype/generated-validator/pom.xml +++ b/archetype/generated-validator/pom.xml @@ -13,23 +13,6 @@ <module>validator-archetype</module> </modules> - <properties> - <git.user.name>git</git.user.name> - <git.user.token>git</git.user.token> - <git.project.url> - https://${git.user.name}:${git.user.token}@gitlab.inria.fr/gazelle/validator/archetype/generated-validator.git - </git.project.url> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> - </properties> - - - <scm> - <connection>scm:git:${git.project.url}</connection> - <url>scm:git:${git.project.url}</url> - <developerConnection>scm:git:${git.project.url}</developerConnection> - <tag>HEAD</tag> -</scm> <build> diff --git a/hl7templates/gocmodel-jar/pom.xml b/hl7templates/gocmodel-jar/pom.xml index 6f8be01..4bbf897 100644 --- a/hl7templates/gocmodel-jar/pom.xml +++ b/hl7templates/gocmodel-jar/pom.xml @@ -37,14 +37,6 @@ </mailingList> </mailingLists> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -60,10 +52,6 @@ <!-- <exclude>**/*Test.java</exclude>--> <!-- </excludes>--> <argLine>-Dfile.encoding=UTF-8 -Xmx2048m</argLine> - <systemPropertyVariables> - <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile> - </systemPropertyVariables> - <systemProperties> <property> <name>java.util.logging.config.file</name> @@ -139,29 +127,6 @@ </configuration> </plugin> -<!-- <plugin>--> -<!-- <groupId>org.jacoco</groupId>--> -<!-- <artifactId>jacoco-maven-plugin</artifactId>--> -<!-- <version>0.7.9</version>--> -<!-- <executions>--> -<!-- <execution>--> -<!-- <id>default-prepare-agent</id>--> -<!-- <goals>--> -<!-- <goal>prepare-agent</goal>--> -<!-- </goals>--> -<!-- </execution>--> -<!-- <execution>--> -<!-- <id>default-report</id>--> -<!-- <phase>prepare-package</phase>--> -<!-- <goals>--> -<!-- <goal>report</goal>--> -<!-- </goals>--> -<!-- <configuration>--> -<!-- <dataFile>target/jacoco.exec</dataFile>--> -<!-- </configuration>--> -<!-- </execution>--> -<!-- </executions>--> -<!-- </plugin>--> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> @@ -261,52 +226,7 @@ </reporting> - <properties> - <additionalparam>-Xdoclint:none</additionalparam> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> - <sonar.jacoco.reportPaths>target/jacoco.exec</sonar.jacoco.reportPaths> - <git.user.name>git</git.user.name> - <git.user.token>git</git.user.token> - <git.project.url> - https://${git.user.name}:${git.user.token}@gitlab.inria.fr/gazelle/library/hl7templates/gocmodel-jar.git - </git.project.url> - </properties> - - <scm> - <connection>scm:git:${git.project.url}</connection> - <url>scm:git:${git.project.url}</url> - <developerConnection>scm:git:${git.project.url}</developerConnection> - <tag>HEAD</tag> - </scm> - - - <distributionManagement> - <repository> - <id>sumo</id> - <url>https://gazelle.ihe.net/nexus/content/repositories/releases/</url> - </repository> - <snapshotRepository> - <id>sumo</id> - <url>https://gazelle.ihe.net/nexus/content/repositories/snapshots/</url> - </snapshotRepository> - </distributionManagement> - - <repositories> - <repository> - <id>irisa-sumo</id> - <name>Sumo Irisa Public Maven Repository Group</name> - <url>https://gazelle.ihe.net/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> + <dependencies> <dependency> diff --git a/hl7templates/hl7templates-api-jar/pom.xml b/hl7templates/hl7templates-api-jar/pom.xml index ce455c6..bae1964 100644 --- a/hl7templates/hl7templates-api-jar/pom.xml +++ b/hl7templates/hl7templates-api-jar/pom.xml @@ -23,10 +23,7 @@ <system>JIRA</system> <url>https://gazelle.ihe.net/jira/projects/GOC/</url> </issueManagement> - <ciManagement> - <url>https://gazelle.ihe.net/jenkins/view/GOC/job/hl7templates-api/</url> - <system>Jenkins</system> - </ciManagement> + <inceptionYear>2016</inceptionYear> <mailingLists> <mailingList> @@ -37,14 +34,7 @@ </mailingLists> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - </plugins> - </pluginManagement> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -57,9 +47,6 @@ <version>2.20</version> <configuration> <argLine>-Dfile.encoding=UTF-8 -DHL7TEMP_RESOURCES_PATH=../hl7templates-resources/</argLine> - <systemPropertyVariables> - <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile> - </systemPropertyVariables> </configuration> <dependencies> <dependency> @@ -69,29 +56,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.9</version> - <executions> - <execution> - <id>default-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>default-report</id> - <phase>prepare-package</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <dataFile>target/jacoco.exec</dataFile> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> @@ -110,55 +74,7 @@ </plugins> </reporting> - <properties> - <sonar.jdbc.url>jdbc:postgresql:sonar</sonar.jdbc.url> - <sonar.jdbc.driver>org.postgresql.Driver</sonar.jdbc.driver> - <sonar.jdbc.username>gazelle</sonar.jdbc.username> - <sonar.jdbc.password>gazelle</sonar.jdbc.password> - <sonar.host.url>http://localhost:9000</sonar.host.url> - <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> - <sonar.jacoco.reportPaths>target/jacoco.exec</sonar.jacoco.reportPaths> - <git.user.name>git</git.user.name> - <git.user.token>git</git.user.token> - <git.project.url> - https://${git.user.name}:${git.user.token}@gitlab.inria.fr/gazelle/library/hl7templates/hl7templates-api.git - </git.project.url> - </properties> - - <scm> - <connection>scm:git:${git.project.url}</connection> - <url>scm:git:${git.project.url}</url> - <developerConnection>scm:git:${git.project.url}</developerConnection> - <tag>HEAD</tag> - </scm> - - - <distributionManagement> - <repository> - <id>sumo</id> - <url>https://gazelle.ihe.net/nexus/content/repositories/releases/</url> - </repository> - <snapshotRepository> - <id>sumo</id> - <url>https://gazelle.ihe.net/nexus/content/repositories/snapshots/</url> - </snapshotRepository> - </distributionManagement> - <repositories> - <repository> - <id>irisa-sumo</id> - <name>Sumo Irisa Public Maven Repository Group</name> - <url>https://gazelle.ihe.net/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> <dependencies> diff --git a/hl7templates/hl7templates-generator-jar/pom.xml b/hl7templates/hl7templates-generator-jar/pom.xml index b931aae..6905507 100644 --- a/hl7templates/hl7templates-generator-jar/pom.xml +++ b/hl7templates/hl7templates-generator-jar/pom.xml @@ -49,14 +49,7 @@ </developers> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - </plugins> - </pluginManagement> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -69,9 +62,6 @@ <version>2.20</version> <configuration> <argLine>-Dfile.encoding=UTF-8</argLine> - <systemPropertyVariables> - <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile> - </systemPropertyVariables> </configuration> <dependencies> <dependency> @@ -117,29 +107,6 @@ <verbose>true</verbose> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.9</version> - <executions> - <execution> - <id>default-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>default-report</id> - <phase>prepare-package</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <dataFile>target/jacoco.exec</dataFile> - </configuration> - </execution> - </executions> - </plugin> <plugin> @@ -245,51 +212,8 @@ </plugins> </reporting> - <properties> - <additionalparam>-Xdoclint:none</additionalparam> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> - <sonar.jacoco.reportPaths>target/jacoco.exec</sonar.jacoco.reportPaths> - <git.user.name>git</git.user.name> - <git.user.token>git</git.user.token> - <git.project.url> - https://${git.user.name}:${git.user.token}@gitlab.inria.fr/gazelle/library/hl7templates/hl7templates-api.git - </git.project.url> - </properties> - - <scm> - <connection>scm:git:${git.project.url}</connection> - <url>scm:git:${git.project.url}</url> - <developerConnection>scm:git:${git.project.url}</developerConnection> - <tag>HEAD</tag> - </scm> - - <distributionManagement> - <repository> - <id>sumo</id> - <url>https://gazelle.ihe.net/nexus/content/repositories/releases/</url> - </repository> - <snapshotRepository> - <id>sumo</id> - <url>https://gazelle.ihe.net/nexus/content/repositories/snapshots/</url> - </snapshotRepository> - </distributionManagement> - - <repositories> - <repository> - <id>irisa-sumo</id> - <name>Sumo Irisa Public Maven Repository Group</name> - <url>https://gazelle.ihe.net/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> + + <dependencies> <dependency> diff --git a/hl7templates/hl7templates-model-jar/pom.xml b/hl7templates/hl7templates-model-jar/pom.xml index 9de5bac..29de2a6 100644 --- a/hl7templates/hl7templates-model-jar/pom.xml +++ b/hl7templates/hl7templates-model-jar/pom.xml @@ -38,14 +38,6 @@ </mailingLists> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -58,9 +50,6 @@ <version>2.20</version> <configuration> <argLine>-Dfile.encoding=UTF-8</argLine> - <systemPropertyVariables> - <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile> - </systemPropertyVariables> </configuration> <dependencies> @@ -105,26 +94,6 @@ <verbose>true</verbose> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.9</version> - <executions> - <execution> - <id>default-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>default-report</id> - <phase>prepare-package</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> @@ -231,49 +200,9 @@ </plugins> </reporting> - <properties> - <additionalparam>-Xdoclint:none</additionalparam> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <git.user.name>git</git.user.name> - <git.user.token>git</git.user.token> - <git.project.url> - https://${git.user.name}:${git.user.token}@gitlab.inria.fr/gazelle/library/hl7templates/hl7templates-model-jar.git - </git.project.url> - </properties> - <scm> - <connection>scm:git:${git.project.url}</connection> - <url>scm:git:${git.project.url}</url> - <developerConnection>scm:git:${git.project.url}</developerConnection> - <tag>HEAD</tag> - </scm> - <distributionManagement> - <repository> - <id>sumo</id> - <url>https://gazelle.ihe.net/nexus/content/repositories/releases/</url> - </repository> - <snapshotRepository> - <id>sumo</id> - <url>https://gazelle.ihe.net/nexus/content/repositories/snapshots/</url> - </snapshotRepository> - </distributionManagement> - <repositories> - <repository> - <id>irisa-sumo</id> - <name>Sumo Irisa Public Maven Repository Group</name> - <url>https://gazelle.ihe.net/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> <dependencies> <dependency> diff --git a/hl7templates/hl7templates-packager-jar/pom.xml b/hl7templates/hl7templates-packager-jar/pom.xml index c438c62..81a9024 100644 --- a/hl7templates/hl7templates-packager-jar/pom.xml +++ b/hl7templates/hl7templates-packager-jar/pom.xml @@ -91,19 +91,7 @@ </plugins> </reporting> - <properties> - <sonar.jdbc.url>jdbc:postgresql:sonar</sonar.jdbc.url> - <sonar.jdbc.driver>org.postgresql.Driver</sonar.jdbc.driver> - <sonar.jdbc.username>gazelle</sonar.jdbc.username> - <sonar.jdbc.password>gazelle</sonar.jdbc.password> - <sonar.host.url>http://localhost:9000</sonar.host.url> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <git.user.name>git</git.user.name> - <git.user.token>git</git.user.token> - <git.project.url> - https://${git.user.name}:${git.user.token}@gitlab.inria.fr/gazelle/library/hl7templates/hl7templates-packager-jar.git - </git.project.url> - </properties> + <description>Packaging of the hl7templates validator generated</description> <issueManagement> @@ -116,38 +104,7 @@ <url>http://gazelle.ihe.net/jenkins/</url> </ciManagement> - <scm> - <url>https://scm.gforge.inria.fr/anonscm/svn/gazelle/validators/hl7templates/hl7templates-packager-jar/trunk</url> - <connection>scm:svn:svn+ssh://scm.gforge.inria.fr/svn/gazelle/validators/hl7templates/hl7templates-packager-jar/trunk</connection> - <developerConnection>scm:svn:svn+ssh://scm.gforge.inria.fr/svn/gazelle/validators/hl7templates/hl7templates-packager-jar/trunk</developerConnection> - </scm> - - <distributionManagement> - <repository> - <id>sumo</id> - <url>http://gazelle.ihe.net/nexus/content/repositories/releases/</url> - </repository> - <snapshotRepository> - <id>sumo</id> - <url>http://gazelle.ihe.net/nexus/content/repositories/snapshots/</url> - </snapshotRepository> - </distributionManagement> - - <repositories> - <repository> - <id>irisa-sumo</id> - <name>Sumo Irisa Public Maven Repository Group</name> - <url>http://gazelle.ihe.net/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> + <dependencies> <dependency> -- GitLab