Skip to content

Commit 2b0a7ee

Browse files
authored
Merge pull request #161 from ebocher/fix_deploy
Fix deploy
2 parents bd92d80 + de0c8ce commit 2b0a7ee

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/CI release.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ jobs:
1616
- name: Checkout
1717
uses: actions/checkout@v2
1818

19+
# Install the GPG secret key
20+
- name: Step 2 - Import GPG Key
21+
run: |
22+
echo "${{ secrets.GPG_PUBLIC_KEY }}" | gpg --import
23+
echo "${{ secrets.GPG_SECRET_KEY }}" | gpg --import --no-tty --batch --yes
24+
env:
25+
GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
26+
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
27+
1928
# Set up the jdk using version 11 of Adoptium Temurin
2029
- name: Setup java 11 using Adoptium Temurin
2130
uses: actions/setup-java@v2
@@ -25,7 +34,7 @@ jobs:
2534
server-id: ossrh
2635
server-username: MAVEN_USERNAME
2736
server-password: MAVEN_PASSWORD
28-
gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
37+
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
2938
gpg-passphrase: MAVEN_GPG_PASSPHRASE
3039

3140
# Configure git user in order to sign release with OrbisGIS user.
@@ -34,11 +43,6 @@ jobs:
3443
git config user.email "[email protected]"
3544
git config user.name OrbisGIS
3645
37-
#Install the GPG secret key
38-
- name: Install gpg secret key
39-
run: |
40-
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
41-
gpg --list-secret-keys --keyid-format LONG
4246
4347
# Test build
4448
- name: Build test
@@ -60,9 +64,9 @@ jobs:
6064
release:prepare release:perform \
6165
-Dusername=$GITHUB_ACTOR -Dpassword=$GITHUB_TOKEN ${VERSION:+"-DdevelopmentVersion="$VERSION"-SNAPSHOT"}
6266
env:
63-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
64-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
65-
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSWORD }}
67+
MAVEN_USERNAME: ${{ secrets.MVN_CENTRAL_USERNAME }}
68+
MAVEN_PASSWORD: ${{ secrets.MVN_CENTRAL_PASSWORD }}
69+
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
6670

6771
# Export the last git tag into env.
6872
- name: Export env values

docs/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
## Changelog for v1.7.2
22

33
- Use junit-jupiter-api in test scope only #160
4+
- Remove unnecessary logger
5+
- Update github actions

src/main/java/org/cts/IdentifiableComponent.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
*/
2424
package org.cts;
2525

26-
import org.slf4j.Logger;
27-
import org.slf4j.LoggerFactory;
28-
2926
import java.util.HashMap;
3027
import java.util.List;
3128
import java.util.Map;
@@ -42,7 +39,6 @@
4239
public class IdentifiableComponent implements Identifiable {
4340

4441
private Identifier identifier;
45-
static final Logger LOGGER = LoggerFactory.getLogger(CRSHelper.class);
4642
private static Map<Identifier, IdentifiableComponent> registry = new HashMap<Identifier, IdentifiableComponent>();
4743

4844
/**
@@ -191,8 +187,6 @@ public IdentifiableComponent(Identifier identifier) {
191187
private void registerComponent() {
192188
if (!registry.containsKey(getIdentifier())) {
193189
registry.put(getIdentifier(), this);
194-
} else {
195-
LOGGER.debug("A component has already been registered for key " + getAuthorityName() + ":" + getAuthorityKey() + ".");
196190
}
197191
}
198192

0 commit comments

Comments
 (0)