This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-j2r. See https://gitlab.nuiton.org/nuiton/nuiton-j2r.git commit 2791efc834509ffb262c74f9832f564b773659aa Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue May 5 16:08:29 2020 +0200 Fix releasable build [skip ci] --- pom.xml | 55 ++++--------------------------------- src/main/assembly/deps.xml | 66 -------------------------------------------- src/main/assembly/full.xml | 68 ---------------------------------------------- src/site/site.xml | 2 +- 4 files changed, 6 insertions(+), 185 deletions(-) diff --git a/pom.xml b/pom.xml index 2762f07..784c047 100644 --- a/pom.xml +++ b/pom.xml @@ -25,8 +25,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mop</artifactId> - <version>1-SNAPSHOT</version> + <artifactId>nuitonpom</artifactId> + <version>11.8-SNAPSHOT</version> </parent> <artifactId>nuiton-j2r</artifactId> @@ -102,10 +102,7 @@ </scm> <properties> - - <!-- redmine project Id --> - <projectName>nuiton-j2r</projectName> - <projectGroup>nuiton</projectGroup> + <gitlabProjectName>nuiton-j2r</gitlabProjectName> <license.licenseName>gpl_v3</license.licenseName> @@ -150,7 +147,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>4.13</version> <scope>test</scope> </dependency> @@ -165,53 +162,11 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </dependency> </dependencies> </plugin> </plugins> </pluginManagement> </build> - - <profiles> - - <!-- create assemblies only at release time --> - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - - <plugins> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> - - </plugins> - - </build> - </profile> - - </profiles> </project> diff --git a/src/main/assembly/deps.xml b/src/main/assembly/deps.xml deleted file mode 100644 index 40fcbc5..0000000 --- a/src/main/assembly/deps.xml +++ /dev/null @@ -1,66 +0,0 @@ -<!-- - #%L - Nuiton Java-2-R - %% - Copyright (C) 2006 - 2012 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<assembly> - <id>deps</id> - <formats> - <format>zip</format> - </formats> - <!-- This don't support SNAPSHOT --> - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <excludes> - <exclude>junit:junit</exclude> - <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> - </excludes> - <scope>runtime</scope> - </dependencySet> - </dependencySets> - <fileSets> - <fileSet> - <directory>target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>*-sources.jar</exclude> - <exclude>*-javadoc.jar</exclude> - </excludes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <includes> - <include>README*</include> - <include>LICENSE*</include> - <include>pom.xml</include> - </includes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <directory>target/classes</directory> - <includes> - <include>THIRD-PARTY.txt</include> - </includes> - </fileSet> - </fileSets> -</assembly> diff --git a/src/main/assembly/full.xml b/src/main/assembly/full.xml deleted file mode 100644 index 2230d63..0000000 --- a/src/main/assembly/full.xml +++ /dev/null @@ -1,68 +0,0 @@ -<!-- - #%L - Nuiton Java-2-R - %% - Copyright (C) 2006 - 2012 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<assembly> - <id>full</id> - <formats> - <format>zip</format> - </formats> - <!-- This don't support SNAPSHOT --> - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <excludes> - <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> - </excludes> - <scope>runtime</scope> - </dependencySet> - </dependencySets> - <fileSets> - <fileSet> - <directory>target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>*-sources.jar</exclude> - </excludes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <includes> - <include>README*</include> - <include>LICENSE*</include> - <include>pom.xml</include> - </includes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <directory>target/classes</directory> - <includes> - <include>THIRD-PARTY.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>src</directory> - <!--useDefaultExcludes>true</useDefaultExcludes--> - </fileSet> - </fileSets> -</assembly> diff --git a/src/site/site.xml b/src/site/site.xml index c227806..9dd1288 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -49,7 +49,7 @@ </links> <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.name}" href="${this.url}/index.html"/> </breadcrumbs> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.