Skip to content

Commit cd75e4d

Browse files
author
chvote-etat-de-geneve
committed
Fix pom versioning to prepare github release for #8 
1 parent 55786d2 commit cd75e4d

File tree

7 files changed

+37
-23
lines changed

7 files changed

+37
-23
lines changed

‎admin-offline/pom.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<parent>
55
<groupId>ch.ge.ve</groupId>
66
<artifactId>base-pom</artifactId>
7-
<version>1.0.0.17-SNAPSHOT</version>
7+
<version>1.0.0.16</version>
88
<relativePath>../base-pom/pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<groupId>ch.ge.ve</groupId> <!-- needed by version maven plugin -->
1313
<artifactId>admin-offline</artifactId>
14-
<version>5.2.1.9-SNAPSHOT</version>
14+
<version>5.2.1.10</version>
1515
<packaging>jar</packaging>
1616
<name>Admin offline</name>
1717
<description>
@@ -23,14 +23,14 @@
2323
</description>
2424

2525
<scm>
26-
<connection>${scm.base.url}/trunk/admin-offline</connection>
27-
<developerConnection>${scm.base.url}/trunk/admin-offline</developerConnection>
26+
<connection>${scm.base.url}/branches/201702VP/admin-offline</connection>
27+
<developerConnection>${scm.base.url}/branches/201702VP/admin-offline</developerConnection>
2828
</scm>
2929

3030
<properties>
31-
<commons.version>5.2.1.8-SNAPSHOT</commons.version>
32-
<oracle.jre.version>8u101</oracle.jre.version>
33-
<oracle.jre.path>jre1.8.0_101</oracle.jre.path>
31+
<commons.version>5.2.1.7</commons.version>
32+
<oracle.jre.version>8u112</oracle.jre.version>
33+
<oracle.jre.path>jre1.8.0_112</oracle.jre.path>
3434
</properties>
3535

3636
<dependencies>
@@ -86,6 +86,7 @@
8686
<groupId>org.objenesis</groupId>
8787
<artifactId>objenesis</artifactId>
8888
</dependency>
89+
8990
<dependency>
9091
<groupId>org.testfx</groupId>
9192
<artifactId>testfx-core</artifactId>
@@ -94,7 +95,7 @@
9495
<groupId>org.testfx</groupId>
9596
<artifactId>testfx-junit</artifactId>
9697
</dependency>
97-
<dependency>
98+
<dependency>
9899
<groupId>org.testfx</groupId>
99100
<artifactId>openjfx-monocle</artifactId>
100101
<version>1.8.0_20</version>

‎admin-offline/src/test/groovy/ch/ge/ve/offlineadmin/services/KeyGeneratorTest.groovy

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import java.time.Instant
2929
import java.time.temporal.ChronoUnit
3030

3131
import static ch.ge.ve.offlineadmin.util.SecurityConstants.*
32-
import static java.time.temporal.ChronoUnit.*
3332

3433
/**
3534
* This test suit aims at covering the {@link KeyGenerator} service.
@@ -112,11 +111,11 @@ class KeyGeneratorTest extends Specification {
112111
def keyPair = generator.generateKeyPair()
113112

114113
// the certificate generation truncates the milliseconds, so just check one minute sooner
115-
def before = Instant.now().minus(1, MINUTES)
114+
def before = Instant.now().minus(1, ChronoUnit.MINUTES)
116115

117116
when:
118117
def certificate = generator.generateCertificate(keyPair)
119-
def after = Instant.now().plus(365, DAYS)
118+
def after = Instant.now().plus(365, ChronoUnit.DAYS)
120119

121120
then:
122121
certificate.getSubjectDN().getName() == "C=Switzerland, OU=My organisational unit, O=My organisation, CN=My common name"
@@ -135,7 +134,7 @@ class KeyGeneratorTest extends Specification {
135134
def keyStore = generator.createKeyStore(keyPair.getPrivate(), certificate, password)
136135

137136
then:
138-
keyStore.getCertificate("ctrl").getPublicKey() == keyPair.getPublic()
139-
keyStore.getKey("ctrl", password) == keyPair.getPrivate()
137+
keyStore.getCertificate("ctrl").getPublicKey().equals(keyPair.getPublic())
138+
keyStore.getKey("ctrl", password).equals(keyPair.getPrivate())
140139
}
141140
}

‎base-pom/pom.xml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>ch.ge.ve</groupId>
99
<artifactId>base-pom</artifactId>
10-
<version>1.0.0.17-SNAPSHOT</version>
10+
<version>1.0.0.16</version>
1111

1212
<packaging>pom</packaging>
1313
<name>Base pom</name>
@@ -40,8 +40,8 @@
4040
</distributionManagement>
4141

4242
<scm>
43-
<connection>${scm.base.url}/trunk/base-pom</connection>
44-
<developerConnection>${scm.base.url}/trunk/base-pom</developerConnection>
43+
<connection>${scm.base.url}/branches/201702VP/base-pom</connection>
44+
<developerConnection>${scm.base.url}/branches/201702VP/base-pom</developerConnection>
4545
</scm>
4646

4747
<properties>
@@ -382,6 +382,20 @@
382382
<artifactId>versions-maven-plugin</artifactId>
383383
<version>${versions-maven-plugin.version}</version>
384384
</plugin>
385+
<plugin>
386+
<groupId>ch.ge.sidp.ve</groupId>
387+
<artifactId>jarbytecodehash-maven-plugin</artifactId>
388+
<version>${jarbytecodehash-maven-plugin.version}</version>
389+
<executions>
390+
<execution>
391+
<id>compute_hashes</id>
392+
<phase>package</phase>
393+
<goals>
394+
<goal>hash</goal>
395+
</goals>
396+
</execution>
397+
</executions>
398+
</plugin>
385399
<plugin>
386400
<groupId>org.codehaus.mojo</groupId>
387401
<artifactId>sonar-maven-plugin</artifactId>

‎commons-base/commons-crypto/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>ch.ge.ve</groupId>
55
<artifactId>commons-base</artifactId>
6-
<version>5.2.1.8-SNAPSHOT</version>
6+
<version>5.2.1.7</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎commons-base/commons-file-utils/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>ch.ge.ve</groupId>
55
<artifactId>commons-base</artifactId>
6-
<version>5.2.1.8-SNAPSHOT</version>
6+
<version>5.2.1.7</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎commons-base/commons-properties/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>ch.ge.ve</groupId>
55
<artifactId>commons-base</artifactId>
6-
<version>5.2.1.8-SNAPSHOT</version>
6+
<version>5.2.1.7</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎commons-base/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<parent>
55
<groupId>ch.ge.ve</groupId>
66
<artifactId>base-pom</artifactId>
7-
<version>1.0.0.17-SNAPSHOT</version>
7+
<version>1.0.0.16</version>
88
<relativePath>../base-pom/pom.xml</relativePath>
99
</parent>
1010

1111
<groupId>ch.ge.ve</groupId> <!-- needed by version maven plugin -->
1212
<artifactId>commons-base</artifactId>
13-
<version>5.2.1.8-SNAPSHOT</version>
13+
<version>5.2.1.7</version>
1414

1515
<packaging>pom</packaging>
1616
<name>Common modules (opensource)</name>
@@ -23,8 +23,8 @@
2323
</modules>
2424

2525
<scm>
26-
<connection>${scm.base.url}/trunk/commons-base</connection>
27-
<developerConnection>${scm.base.url}/trunk/commons-base</developerConnection>
26+
<connection>${scm.base.url}/branches/201702VP/commons-base</connection>
27+
<developerConnection>${scm.base.url}/branches/201702VP/commons-base</developerConnection>
2828
</scm>
2929

3030
<properties>

0 commit comments

Comments
 (0)