Skip to content

Riina Antikainen / Moya

Go to a project
Commit 9e0fc9cc by Juho Juopperi
Options

Merge branch 'mvnupdates' into 'master' 

Maven changes to allow 'mvn versions:set'

To allow maven to update software versions move parent to root dir and let all dependencies inherit the root, where version number is set.

Also bump dependency versions.

See merge request !264
2 parents b2662ea2 9b02f191
Inline Side-by-side
Showing with 96 additions and 109 deletions
.gitignore
......@@ -14,3 +14,4 @@
/code/*/test-output/
moya-git.properties
*/*/bin
pom.xml.versionsBackup
code/build.sh
#!/bin/sh
exec mvn -f ${0%/*}/moya-parent/pom.xml ${@:-package}
exec mvn -f ${0%/*}/pom.xml ${@:-package}
code/moya-authmodule-client/pom.xml
......@@ -4,9 +4,9 @@
<artifactId>moya-authmodule-client</artifactId>
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent-root</artifactId>
<version>1.0</version>
<relativePath>../moya-parent/pom-root.xml</relativePath>
<artifactId>moya</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
......@@ -16,4 +16,5 @@
<scope>provided</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/moya-authmodule/pom.xml
......@@ -12,13 +12,13 @@
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-authmodule-client</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
</dependency>
</dependencies>
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent-root</artifactId>
<version>1.0</version>
<relativePath>../moya-parent/pom-root.xml</relativePath>
<artifactId>moya</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
\ No newline at end of file
code/moya-beans-client/pom.xml
......@@ -9,14 +9,14 @@
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-database</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
</dependency>
</dependencies>
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId>
<version>1.0</version>
<version>1.2-SNAPSHOT</version>
<relativePath>../moya-parent/pom.xml</relativePath>
</parent>
</project>
\ No newline at end of file
code/moya-beans/pom.xml
......@@ -12,7 +12,7 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
......@@ -29,24 +29,18 @@
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans-client</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-authmodule-client</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
</dependency>
<!--
<dependency>
<groupId>javax.ejb</groupId>
<artifactId>javax.ejb-api</artifactId>
<version>3.2</version>
<scope>test</scope>
</dependency>
-->
<!-- <dependency> <groupId>javax.ejb</groupId> <artifactId>javax.ejb-api</artifactId>
<version>3.2</version> <scope>test</scope> </dependency> -->
<dependency>
<groupId>org.glassfish.main.extras</groupId>
<artifactId>glassfish-embedded-web</artifactId>
......@@ -58,7 +52,7 @@
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId>
<version>1.0</version>
<version>1.2-SNAPSHOT</version>
<relativePath>../moya-parent/pom.xml</relativePath>
</parent>
</project>
\ No newline at end of file
code/moya-cardprinter/pom.xml
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>moya-cardprinter</artifactId>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
</dependency>
</dependencies>
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId>
<version>1.0</version>
<relativePath>../moya-parent/pom.xml</relativePath>
</parent>
<artifactId>moya-cardprinter</artifactId>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
</dependency>
</dependencies>
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
\ No newline at end of file
code/moya-database/pom.xml
......@@ -48,7 +48,7 @@
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-utils</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ancoron.postgresql</groupId>
......@@ -105,7 +105,7 @@
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId>
<version>1.0</version>
<version>1.2-SNAPSHOT</version>
<relativePath>../moya-parent/pom.xml</relativePath>
</parent>
</project>
code/moya-ear/pom.xml
......@@ -34,26 +34,26 @@
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-web</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-mgmt-web</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-terminal-web</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
......@@ -63,7 +63,7 @@
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId>
<relativePath>../moya-parent/pom.xml</relativePath>
<version>1.0</version>
<version>1.2-SNAPSHOT</version>
</parent>
<profiles>
......
code/moya-mgmt-web/pom.xml
......@@ -21,13 +21,13 @@
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans-client</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<version>5.0</version>
<version>${primefaces.version}</version>
</dependency>
<dependency>
<groupId>com.ocpsoft</groupId>
......@@ -38,7 +38,7 @@
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId>
<version>1.0</version>
<version>1.2-SNAPSHOT</version>
<relativePath>../moya-parent/pom.xml</relativePath>
</parent>
</project>
code/moya-parent/pom.xml
......@@ -5,9 +5,9 @@
<artifactId>moya-parent</artifactId>
<packaging>pom</packaging>
<modules>
<module>../moya-utils</module>
<module>../moya-authmodule</module>
<module>../moya-authmodule-client</module>
<module>../moya-database</module>
<module>../moya-restpojo</module>
......@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>0.13.0</version>
<version>0.14.0</version>
</dependency>
<dependency>
<!-- Java melody dependency -->
......@@ -55,12 +55,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.4-beta1</version>
<version>4.4</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.17</version>
<version>${testng.version}</version>
<scope>test</scope>
</dependency>
<dependency>
......@@ -72,7 +72,7 @@
<dependency>
<groupId>fi.iudex</groupId>
<artifactId>utils-standalone</artifactId>
<version>1.0.12</version>
<version>1.0.13</version>
</dependency>
<dependency>
<groupId>net.sf.barcode4j</groupId>
......@@ -114,12 +114,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.10</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>fi.iudex</groupId>
......@@ -129,7 +129,7 @@
<dependency>
<groupId>net.matlux</groupId>
<artifactId>jvm-breakglass</artifactId>
<version>0.0.7</version>
<version>0.0.8</version>
</dependency>
<dependency>
<groupId>com.wordnik</groupId>
......@@ -150,8 +150,8 @@
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent-root</artifactId>
<version>1.0</version>
<relativePath>pom-root.xml</relativePath>
<artifactId>moya</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
code/moya-restpojo/pom.xml
......@@ -2,42 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>moya-restpojo</artifactId>
<groupId>fi.codecrew.moya</groupId>
<version>1.0.7</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.7</version>
</extension>
</extensions>
</build>
<distributionManagement>
<downloadUrl>http://codecrew.fi/mvn</downloadUrl>
<repository>
......@@ -47,12 +12,18 @@
</repository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.3.12</version>
<version>${swagger.version}</version>
</dependency>
</dependencies>
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
\ No newline at end of file
code/moya-terminal-web/pom.xml
......@@ -4,7 +4,7 @@
<artifactId>moya-terminal-web</artifactId>
<packaging>war</packaging>
<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
......@@ -22,23 +22,23 @@
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans-client</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<version>5.0</version>
<version>${primefaces.version}</version>
</dependency>
<dependency>
<groupId>net.bull.javamelody</groupId>
<artifactId>javamelody-core</artifactId>
<version>1.52.0</version>
<version>${javamelody.version}</version>
</dependency>
</dependencies>
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId>
<version>1.0</version>
<version>1.2-SNAPSHOT</version>
<relativePath>../moya-parent/pom.xml</relativePath>
</parent>
</project>
code/moya-utils/pom.xml
......@@ -34,7 +34,7 @@
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId>
<version>1.0</version>
<version>1.2-SNAPSHOT</version>
<relativePath>../moya-parent/pom.xml</relativePath>
</parent>
<dependencies>
......
code/moya-web/pom.xml
......@@ -22,17 +22,17 @@
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans-client</artifactId>
<version>${moya.version}</version>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.bull.javamelody</groupId>
<artifactId>javamelody-core</artifactId>
<version>1.54.0</version>
<version>${javamelody.version}</version>
</dependency>
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<version>5.1</version>
<version>${primefaces.version}</version>
</dependency>
<dependency>
......@@ -45,7 +45,7 @@
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-restpojo</artifactId>
<version>1.0.7</version>
<version>1.2-SNAPSHOT</version>
</dependency>
</dependencies>
......@@ -53,7 +53,7 @@
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId>
<version>1.0</version>
<version>1.2-SNAPSHOT</version>
<relativePath>../moya-parent/pom.xml</relativePath>
</parent>
......
code/moya-parent/pom-root.xml → code/pom.xml
......@@ -2,13 +2,19 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>moya-parent-root</artifactId>
<groupId>fi.codecrew.moya</groupId>
<version>1.0</version>
<artifactId>moya</artifactId>
<name>Moya Online Youth Accumulator</name>
<packaging>pom</packaging>
<version>1.2-SNAPSHOT</version>
<modules>
<module>moya-parent</module>
<module>moya-authmodule</module>
<module>moya-cardprinter</module>
</modules>
<properties>
<moya.version>1.0</moya.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java-version>1.8</java-version>
<!-- plugin versions -->
......@@ -22,13 +28,21 @@
<!-- EJB spec version -->
<ejb-spec-version>3.2</ejb-spec-version>
<swagger.version>1.3.12</swagger.version>
<slf4j.version>1.7.12</slf4j.version>
<logback.version>1.1.3</logback.version>
<testng.version>6.8.21</testng.version>
<javamelody.version>1.55.0</javamelody.version>
<primefaces.version>5.1</primefaces.version>
</properties>
<url>http://codecrew.fi</url>
<organization>
<name>Codecrew RY</name>
<url>http://codecrew.fi</url>
</organization>
<scm>
<connection>scm:git@gitlab.codecrew.fi:codecrew/moya.git</connection>
<url>http://gitlab.codecrew.fi</url>
</scm>
<build>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!