Skip to content

Commit 141093e

Browse files
pavelhoralpavelhoral
authored
Merge pull request #6 from karelmaxa/upgrade-groovy
Upgrade Groovy to 5.0.2
2 parents b40dfc7 + ccaa60a commit 141093e

File tree

10 files changed

+499
-425
lines changed

10 files changed

+499
-425
lines changed

‎.github/workflows/build-project.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Build project
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
strategy:
11+
matrix:
12+
java: [17, 21]
13+
name: "Java ${{ matrix.java }} build"
14+
steps:
15+
- name: Checkout project
16+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
17+
- name: Set up Java
18+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
19+
with:
20+
distribution: "temurin"
21+
java-version: "${{ matrix.java }}"
22+
cache: "maven"
23+
- name: Verify build
24+
run: mvn -B verify

‎legal/CDDLv1.1.txt‎

Lines changed: 362 additions & 0 deletions
Large diffs are not rendered by default.

‎pom.xml‎

Lines changed: 87 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!--
43
~ DO NOT REMOVE COPYRIGHT NOTICES OR THIS HEADER.
54
~
@@ -24,34 +23,78 @@
2423
~ your own identifying information:
2524
~ "Portions Copyrighted [year] [name of copyright owner]"
2625
~
26+
~ Portions Copyright 2025 Wren Security.
2727
-->
28-
<project xmlns="http://maven.apache.org/POM/4.0.0"
29-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
30-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
28+
<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">
3129
<modelVersion>4.0.0</modelVersion>
3230

3331
<parent>
34-
<groupId>org.forgerock.openicf.connectors</groupId>
35-
<artifactId>connectors-parent</artifactId>
36-
<version>1.5.0.0</version>
32+
<groupId>org.wrensecurity.wrenicf.connector</groupId>
33+
<artifactId>connector-bundle-parent</artifactId>
34+
<version>1.5.3.2</version>
3735
</parent>
3836

39-
<groupId>org.forgerock.openicf.connectors</groupId>
4037
<artifactId>ssh-connector</artifactId>
41-
<version>1.4.1.0</version>
38+
<version>1.5.3.0-SNAPSHOT</version>
4239
<packaging>bundle</packaging>
4340

4441
<name>SSH Connector for Wren:ICF</name>
4542
<description>Generic SSH connector</description>
43+
4644
<url>https://github.com/WrenSecurity/wrenicf-ssh-connector</url>
47-
<inceptionYear>2017</inceptionYear>
4845

4946
<scm>
5047
<url>https://github.com/WrenSecurity/wrenicf-ssh-connector</url>
5148
<connection>scm:git:git://github.com/WrenSecurity/wrenicf-ssh-connector.git</connection>
5249
<developerConnection>scm:git:git@github.com:WrenSecurity/wrenicf-ssh-connector.git</developerConnection>
50+
<tag>HEAD</tag>
5351
</scm>
5452

53+
<distributionManagement>
54+
<snapshotRepository>
55+
<id>wrensecurity-snapshots</id>
56+
<name>Wren Security Snapshot Repository</name>
57+
<url>https://wrensecurity.jfrog.io/wrensecurity/snapshots</url>
58+
</snapshotRepository>
59+
60+
<repository>
61+
<id>wrensecurity-releases</id>
62+
<name>Wren Security Release Repository</name>
63+
<url>https://wrensecurity.jfrog.io/wrensecurity/releases</url>
64+
</repository>
65+
</distributionManagement>
66+
67+
<repositories>
68+
<repository>
69+
<id>wrensecurity-releases</id>
70+
<name>Wren Security Release Repository</name>
71+
<url>https://wrensecurity.jfrog.io/wrensecurity/releases</url>
72+
73+
<snapshots>
74+
<enabled>false</enabled>
75+
</snapshots>
76+
77+
<releases>
78+
<enabled>true</enabled>
79+
</releases>
80+
</repository>
81+
82+
<repository>
83+
<id>wrensecurity-snapshots</id>
84+
<name>Wren Security Snapshot Repository</name>
85+
<url>https://wrensecurity.jfrog.io/wrensecurity/snapshots</url>
86+
87+
<snapshots>
88+
<enabled>true</enabled>
89+
</snapshots>
90+
91+
<releases>
92+
<enabled>false</enabled>
93+
</releases>
94+
</repository>
95+
96+
</repositories>
97+
5598
<issueManagement>
5699
<system>GitHub Issues</system>
57100
<url>https://github.com/WrenSecurity/wrenicf-ssh-connector/issues</url>
@@ -68,41 +111,27 @@
68111
</mailingLists>
69112

70113
<properties>
71-
<maven.compiler.target>1.7</maven.compiler.target>
72-
<maven.compiler.source>1.7</maven.compiler.source>
114+
<pgpVerifyKeysVersion>1.9.5</pgpVerifyKeysVersion>
115+
<maven.compiler.release>17</maven.compiler.release>
116+
73117
<connectorPackage>org.forgerock.openicf.connectors.ssh</connectorPackage>
74118
<connectorClass>SSHConnector</connectorClass>
75-
<framework.compatibilityVersion>1.4</framework.compatibilityVersion>
76-
<framework.releaseVersion>1.0</framework.releaseVersion>
77-
</properties>
78-
79-
<repositories>
80-
<!-- Needed to retrieve parent POM -->
81-
<repository>
82-
<id>wrensecurity-releases</id>
83-
<name>Wren Security Release Repository</name>
84-
<url>https://wrensecurity.jfrog.io/wrensecurity/releases</url>
119+
<framework.compatibilityVersion>1.5</framework.compatibilityVersion>
120+
<framework.releaseVersion>3.2</framework.releaseVersion>
85121

86-
<snapshots>
87-
<enabled>false</enabled>
88-
</snapshots>
89-
90-
<releases>
91-
<enabled>true</enabled>
92-
</releases>
93-
</repository>
94-
</repositories>
122+
<openicf.maven.plugin.version>1.5.0</openicf.maven.plugin.version>
123+
</properties>
95124

96125
<dependencies>
97-
<dependency>
98-
<groupId>org.forgerock.openicf.framework</groupId>
99-
<artifactId>connector-framework</artifactId>
126+
<dependency>
127+
<groupId>org.wrensecurity.wrenicf.framework</groupId>
128+
<artifactId>connector-framework-core</artifactId>
100129
</dependency>
101130

102131
<dependency>
103-
<groupId>org.codehaus.groovy</groupId>
104-
<artifactId>groovy-all</artifactId>
105-
<version>2.4.7</version>
132+
<groupId>org.apache.groovy</groupId>
133+
<artifactId>groovy</artifactId>
134+
<version>5.0.2</version>
106135
<scope>provided</scope>
107136
</dependency>
108137

@@ -115,50 +144,50 @@
115144
<dependency>
116145
<groupId>com.jcraft</groupId>
117146
<artifactId>jsch</artifactId>
118-
<version>0.1.53</version>
147+
<version>0.1.55</version>
119148
</dependency>
120149

121150
<dependency>
122-
<groupId>org.testng</groupId>
123-
<artifactId>testng</artifactId>
124-
<scope>test</scope>
151+
<groupId>org.wrensecurity.wrenicf.connector</groupId>
152+
<artifactId>groovy-connector</artifactId>
153+
<version>1.5.3.0</version>
125154
</dependency>
126155

127156
<dependency>
128-
<groupId>org.forgerock.openicf.framework</groupId>
129-
<artifactId>connector-framework-internal</artifactId>
130-
<scope>test</scope>
157+
<groupId>ch.qos.logback</groupId>
158+
<artifactId>logback-classic</artifactId>
159+
<version>1.2.13</version>
131160
</dependency>
132161

133162
<dependency>
134-
<groupId>org.forgerock.openicf.framework</groupId>
135-
<artifactId>connector-test-common</artifactId>
163+
<groupId>org.testng</groupId>
164+
<artifactId>testng</artifactId>
165+
<version>7.8.0</version>
136166
<scope>test</scope>
137167
</dependency>
138168

139169
<dependency>
140-
<groupId>${project.groupId}</groupId>
141-
<artifactId>groovy-connector</artifactId>
142-
<version>1.4.3.0</version>
170+
<groupId>org.wrensecurity.wrenicf.framework</groupId>
171+
<artifactId>connector-framework-internal</artifactId>
172+
<scope>test</scope>
143173
</dependency>
144174

145175
<dependency>
146-
<groupId>ch.qos.logback</groupId>
147-
<artifactId>logback-classic</artifactId>
148-
<version>1.1.5</version>
176+
<groupId>org.wrensecurity.wrenicf.framework</groupId>
177+
<artifactId>connector-framework-test</artifactId>
178+
<scope>test</scope>
149179
</dependency>
150180
</dependencies>
151181

152182
<build>
153183
<plugins>
154184
<plugin>
155-
<groupId>org.codehaus.gmaven</groupId>
156-
<artifactId>gmaven-plugin</artifactId>
157-
<version>1.5</version>
185+
<groupId>org.codehaus.gmavenplus</groupId>
186+
<artifactId>gmavenplus-plugin</artifactId>
187+
<version>4.2.1</version>
158188

159189
<configuration>
160-
<providerSelection>2.0</providerSelection>
161-
<sourceEncoding>UTF-8</sourceEncoding>
190+
<targetBytecode>${maven.compiler.release}</targetBytecode>
162191
</configuration>
163192

164193
<executions>
@@ -167,36 +196,16 @@
167196
<goal>generateStubs</goal>
168197
<goal>compile</goal>
169198
<goal>generateTestStubs</goal>
170-
<goal>testCompile</goal>
199+
<goal>compileTests</goal>
171200
</goals>
172201
</execution>
173202
</executions>
174-
175-
<dependencies>
176-
<dependency>
177-
<groupId>org.codehaus.gmaven.runtime</groupId>
178-
<artifactId>gmaven-runtime-2.0</artifactId>
179-
<version>1.5</version>
180-
</dependency>
181-
182-
<dependency>
183-
<groupId>org.codehaus.groovy</groupId>
184-
<artifactId>groovy-all</artifactId>
185-
<version>2.2.2</version>
186-
</dependency>
187-
</dependencies>
188203
</plugin>
189204

190205
<plugin>
191206
<groupId>org.apache.felix</groupId>
192207
<artifactId>maven-bundle-plugin</artifactId>
193208
<extensions>true</extensions>
194-
195-
<configuration>
196-
<instructions>
197-
<Require-Bundle>groovy-all</Require-Bundle>
198-
</instructions>
199-
</configuration>
200209
</plugin>
201210

202211
<plugin>

‎src/main/docbkx/chap-install-ssh-connector.xml‎

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)