Fix pom versioning to prepare github release for #8

republique-et-canton-de-geneve · Dec 19, 2016 · cd75e4d · cd75e4d
1 parent 55786d2
commit cd75e4d
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 23 deletions.
diff --git a/admin-offline/pom.xml b/admin-offline/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>ch.ge.ve</groupId>
         <artifactId>base-pom</artifactId>
-        <version>1.0.0.17-SNAPSHOT</version>
+        <version>1.0.0.16</version>
         <relativePath>../base-pom/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>ch.ge.ve</groupId>      <!-- needed by version maven plugin -->
     <artifactId>admin-offline</artifactId>
-    <version>5.2.1.9-SNAPSHOT</version>
+    <version>5.2.1.10</version>
     <packaging>jar</packaging>
     <name>Admin offline</name>
     <description>
@@ -23,14 +23,14 @@
     </description>
 
     <scm>
-        <connection>${scm.base.url}/trunk/admin-offline</connection>
-        <developerConnection>${scm.base.url}/trunk/admin-offline</developerConnection>
+        <connection>${scm.base.url}/branches/201702VP/admin-offline</connection>
+        <developerConnection>${scm.base.url}/branches/201702VP/admin-offline</developerConnection>
     </scm>
 
     <properties>
-        <commons.version>5.2.1.8-SNAPSHOT</commons.version>
-        <oracle.jre.version>8u101</oracle.jre.version>
-        <oracle.jre.path>jre1.8.0_101</oracle.jre.path>
+        <commons.version>5.2.1.7</commons.version>
+        <oracle.jre.version>8u112</oracle.jre.version>
+        <oracle.jre.path>jre1.8.0_112</oracle.jre.path>
     </properties>
 
     <dependencies>
@@ -86,6 +86,7 @@
             <groupId>org.objenesis</groupId>
             <artifactId>objenesis</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.testfx</groupId>
             <artifactId>testfx-core</artifactId>
@@ -94,7 +95,7 @@
             <groupId>org.testfx</groupId>
             <artifactId>testfx-junit</artifactId>
         </dependency>
-        <dependency>
+		<dependency>
             <groupId>org.testfx</groupId>
             <artifactId>openjfx-monocle</artifactId>
             <version>1.8.0_20</version>

diff --git a/admin-offline/src/test/groovy/ch/ge/ve/offlineadmin/services/KeyGeneratorTest.groovy b/admin-offline/src/test/groovy/ch/ge/ve/offlineadmin/services/KeyGeneratorTest.groovy
@@ -29,7 +29,6 @@ import java.time.Instant
 import java.time.temporal.ChronoUnit
 
 import static ch.ge.ve.offlineadmin.util.SecurityConstants.*
-import static java.time.temporal.ChronoUnit.*
 
 /**
  * This test suit aims at covering the {@link KeyGenerator} service.
@@ -112,11 +111,11 @@ class KeyGeneratorTest extends Specification {
         def keyPair = generator.generateKeyPair()
 
         // the certificate generation truncates the milliseconds, so just check one minute sooner
-        def before = Instant.now().minus(1, MINUTES)
+        def before = Instant.now().minus(1, ChronoUnit.MINUTES)
 
         when:
         def certificate = generator.generateCertificate(keyPair)
-        def after = Instant.now().plus(365, DAYS)
+        def after = Instant.now().plus(365, ChronoUnit.DAYS)
 
         then:
         certificate.getSubjectDN().getName() == "C=Switzerland, OU=My organisational unit, O=My organisation, CN=My common name"
@@ -135,7 +134,7 @@ class KeyGeneratorTest extends Specification {
         def keyStore = generator.createKeyStore(keyPair.getPrivate(), certificate, password)
 
         then:
-        keyStore.getCertificate("ctrl").getPublicKey() == keyPair.getPublic()
-        keyStore.getKey("ctrl", password) == keyPair.getPrivate()
+        keyStore.getCertificate("ctrl").getPublicKey().equals(keyPair.getPublic())
+        keyStore.getKey("ctrl", password).equals(keyPair.getPrivate())
     }
 }
diff --git a/base-pom/pom.xml b/base-pom/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>ch.ge.ve</groupId>
     <artifactId>base-pom</artifactId>
-    <version>1.0.0.17-SNAPSHOT</version>
+    <version>1.0.0.16</version>
 
     <packaging>pom</packaging>
     <name>Base pom</name>
@@ -40,8 +40,8 @@
     </distributionManagement>
 
     <scm>
-        <connection>${scm.base.url}/trunk/base-pom</connection>
-        <developerConnection>${scm.base.url}/trunk/base-pom</developerConnection>
+        <connection>${scm.base.url}/branches/201702VP/base-pom</connection>
+        <developerConnection>${scm.base.url}/branches/201702VP/base-pom</developerConnection>
     </scm>
 
     <properties>
@@ -382,6 +382,20 @@
                     <artifactId>versions-maven-plugin</artifactId>
                     <version>${versions-maven-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>ch.ge.sidp.ve</groupId>
+                    <artifactId>jarbytecodehash-maven-plugin</artifactId>
+                    <version>${jarbytecodehash-maven-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>compute_hashes</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>hash</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>

diff --git a/commons-base/commons-crypto/pom.xml b/commons-base/commons-crypto/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>ch.ge.ve</groupId>
         <artifactId>commons-base</artifactId>
-        <version>5.2.1.8-SNAPSHOT</version>
+        <version>5.2.1.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/commons-base/commons-file-utils/pom.xml b/commons-base/commons-file-utils/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>ch.ge.ve</groupId>
         <artifactId>commons-base</artifactId>
-        <version>5.2.1.8-SNAPSHOT</version>
+        <version>5.2.1.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/commons-base/commons-properties/pom.xml b/commons-base/commons-properties/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>ch.ge.ve</groupId>
         <artifactId>commons-base</artifactId>
-        <version>5.2.1.8-SNAPSHOT</version>
+        <version>5.2.1.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/commons-base/pom.xml b/commons-base/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>ch.ge.ve</groupId>
         <artifactId>base-pom</artifactId>
-        <version>1.0.0.17-SNAPSHOT</version>
+        <version>1.0.0.16</version>
         <relativePath>../base-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>ch.ge.ve</groupId>         <!-- needed by version maven plugin -->
     <artifactId>commons-base</artifactId>
-    <version>5.2.1.8-SNAPSHOT</version>
+    <version>5.2.1.7</version>
 
     <packaging>pom</packaging>
     <name>Common modules (opensource)</name>
@@ -23,8 +23,8 @@
     </modules>
 
     <scm>
-        <connection>${scm.base.url}/trunk/commons-base</connection>
-        <developerConnection>${scm.base.url}/trunk/commons-base</developerConnection>
+        <connection>${scm.base.url}/branches/201702VP/commons-base</connection>
+        <developerConnection>${scm.base.url}/branches/201702VP/commons-base</developerConnection>
     </scm>
 
     <properties>