Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GPU-1805: Scan image and dependency updates #1630

Open
wants to merge 4 commits into
base: f-gpu-1579
Choose a base branch
from
Open

GPU-1805: Scan image and dependency updates #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68254f2
Scan docker images
npomaroli Oct 10, 2024
3d54604
Update some dependencies
npomaroli Oct 10, 2024
052eea8
Fix indentation
npomaroli Oct 10, 2024
336d008
Fix repositories for test plugins
npomaroli Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Jenkinsfile.split
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ properties([
booleanParam(name: 'runDeploy', defaultValue: false, description: "Whether to run the deploy steps."),
booleanParam(name: 'runDeployTesting', defaultValue: false, description: "Whether to run the testing deploy steps."),
booleanParam(name: 'runDocker', defaultValue: false, description: "Whether to run the docker steps."),
booleanParam(name: 'omitScan', defaultValue: false, description: "Omit scanning the docker images"),
booleanParam(name: 'runMavenBuild', defaultValue: false, description: "Whether to run the maven build steps."),
booleanParam(name: 'runIntegrationTests', defaultValue: false, description: "Whether to run integration tests."),
booleanParam(name: 'consistencyChecks', defaultValue: false, description: "Whether to do consistency checks for every test. Enabling this will increase overall test runtime."),
Expand Down Expand Up @@ -347,10 +348,21 @@ stage("Setup Build Environment") {
sh "rm server/target/*sources.jar || true"
sh "rm server/target/*javadoc.jar || true"
sh "cd server ; docker build --network=host -t " + registryHost + "/gentics/mesh:latest -t " + registryHost + "/gentics/mesh:" + version + " . ; cd .. "

if (!params.omitScan) {
scanImage image: registryHost + "/gentics/mesh:" + version, exitCode: 1
}

// connectors
def mavenVersion = MavenHelper.getVersion()
sh "cd .docker ; cp ../connectors/hsqldb/target/mesh-database-connector-hsqldb-" + mavenVersion + ".jar ./mesh-connector.jar ; docker build --network=host -t " + registryHost + "/gentics/mesh-hsqldb:latest -t " + registryHost + "/gentics/mesh-hsqldb:" + version + " --build-arg MESH_VERSION=" + version + " --build-arg MESH_REGISTRY_HOST=" + registryHost + " . ; rm -f mesh-connector.jar ; cd .."
sh "cd .docker ; cp ../connectors/mariadb/target/mesh-database-connector-mariadb-" + mavenVersion + ".jar ./mesh-connector.jar ; docker build --network=host -t " + registryHost + "/gentics/mesh-mariadb:latest -t " + registryHost + "/gentics/mesh-mariadb:" + version + " --build-arg MESH_VERSION=" + version + " --build-arg MESH_REGISTRY_HOST=" + registryHost + " . ; rm -f mesh-connector.jar ; cd .."

if (!params.omitScan) {
scanImage image: registryHost + "/gentics/mesh-hsqldb:" + version, exitCode: 1
scanImage image: registryHost + "/gentics/mesh-mariadb:" + version, exitCode: 1
}

} else {
echo "Docker build skipped.."
}
Expand Down
20 changes: 18 additions & 2 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<graphql-filter.version>3.0.3</graphql-filter.version>
<pf4j.version>3.11.0</pf4j.version>
<asm.version>3.3.1</asm.version>
<spring.security.version>5.5.7</spring.security.version>
<spring.security.version>6.3.3</spring.security.version>
<elasticsearch.client.version>1.1.1</elasticsearch.client.version>
<hazelcast.version>3.12.13</hazelcast.version>
<jackson.version>2.17.0</jackson.version>
Expand All @@ -43,6 +43,7 @@
<bytebuddy.version>1.12.9</bytebuddy.version>
<ehcache.version>3.10.18</ehcache.version>
<handlebars.version>4.3.1</handlebars.version>
<hsqldb.version>2.7.3</hsqldb.version>
</properties>

<!-- IMPORTANT: Always keep dependencies in-sync with mesh-plugin-parent pom in order to avoid duplicate libraries in shaded plugin jars -->
Expand Down Expand Up @@ -120,6 +121,11 @@
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
</dependency>

<!-- HTTP Client -->
<dependency>
Expand Down Expand Up @@ -241,7 +247,7 @@
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.3.0</version>
<version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.simpleframework</groupId>
Expand All @@ -258,6 +264,11 @@
<artifactId>toxiproxy</artifactId>
<version>${testcontainers.version}</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
<version>2.0.6.1</version>
</dependency>

<!-- RX -->
<dependency>
Expand Down Expand Up @@ -536,6 +547,11 @@
<artifactId>mesh-database-connector-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
</dependency>

<!-- Vertx Hazelcast cluster manager -->
<dependency>
Expand Down
1 change: 0 additions & 1 deletion connectors/hsqldb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.6.1</version>
</dependency>
<dependency>
<groupId>com.gentics.mesh</groupId>
Expand Down
1 change: 0 additions & 1 deletion database-tests/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.6.1</version>
</dependency>

<!-- Tests -->
Expand Down
2 changes: 1 addition & 1 deletion test-scanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>maven-surefire-common</artifactId>
<version>3.0.0-M5</version>
<version>3.5.1</version>
</dependency>
</dependencies>
</project>
3 changes: 1 addition & 2 deletions tests/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
<artifactId>jdom2</artifactId>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions tests/common/src/main/java/com/gentics/mesh/maven/MavenUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import java.util.Iterator;
import java.util.List;

import org.jdom.Document;
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
import org.jdom2.Document;
import org.jdom2.Element;
import org.jdom2.input.SAXBuilder;


public final class MavenUtilities {
Expand Down
3 changes: 1 addition & 2 deletions tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
<artifactId>jdom2</artifactId>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
17 changes: 14 additions & 3 deletions tests/tests-core/src/test/plugins/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,23 @@

<repositories>
<repository>
<id>maven.gentics.com</id>
<name>Gentics Maven Repository</name>
<url>https://maven.gentics.com/maven2</url>
<id>gentics.nexus.releases-oss</id>
<name>Gentics Nexus OSS Maven Repository</name>
<url>https://repo.gentics.com/repository/maven-releases-oss/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>gentics.nexus.snapshots</id>
<name>Gentics Snapshots Repository</name>
<url>https://repo.gentics.com/repository/maven-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
Expand Down