Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

mcobbett 1949 jackson core vuln fix uplift #87

Merged
merged 1 commit into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ lib/
dependency-reduced-pom.xml

# Don't check-in IDE specific files if we can help it.
.vscode
.vscode
temp/
20 changes: 11 additions & 9 deletions build-locally.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export ORIGINAL_DIR=$(pwd)

cd "${BASEDIR}/.."
WORKSPACE_DIR=$(pwd)
cd $BASEDIR


#-----------------------------------------------------------------------------------------
Expand Down Expand Up @@ -118,7 +119,7 @@ while [ "$1" != "" ]; do
case $1 in
-p | --passphrase )
shift
export pg_passphrase="$1"
export gpg_passphrase="$1"
;;
-h | --help ) usage
exit
Expand All @@ -142,6 +143,8 @@ if [[ "${gpg_passphrase}" == "" ]]; then
fi
fi

info "gpg passphrase is $gpg_passphrase"


#-----------------------------------------------------------------------------------------
# Main logic.
Expand All @@ -164,24 +167,23 @@ else
info "Over-ridden by caller using the LOGS_DIR variable."
fi

export LOGS_DIR=$BASEDIR/temp
rm -fr $BASEDIR/temp
mkdir -p $BASEDIR/temp

info "Using source code at ${source_dir}"
cd ${BASEDIR}/${source_dir}

log_file=${LOGS_DIR}/${project}.txt
info "Log will be placed at ${log_file}"

h2 "Building..."
cat << EOF

Using this command:
cmd="mvn clean install -Dgpg.passphrase=${gpg_passphrase}"

mvn clean install -Dgpg.passphrase=\$GPG_PASSPHRASE
2>&1 >> ${log_file}

EOF

mvn clean install -Dgpg.passphrase=${gpg_passphrase} \
2>&1 >> ${log_file}
info "Using command: $cmd"
$cmd 2>&1 >> ${log_file}
rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to build ${project}" ; info "See log file at ${log_file}" ; exit 1 ; fi
success "Built OK"

Expand Down
4 changes: 2 additions & 2 deletions com.auth0.jwt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-wrapping-parent</artifactId>
<version>0.35.0</version>
<version>0.37.0</version>
</parent>

<artifactId>com.auth0.jwt</artifactId>
<version>4.4.0</version>
<version>4.4.1</version>
<packaging>bundle</packaging>

<name>Galasa wrapped version of auth0 JWT</name>
Expand Down
2 changes: 1 addition & 1 deletion com.google.gson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-wrapping-parent</artifactId>
<version>0.35.0</version>
<version>0.37.0</version>
</parent>

<artifactId>gson</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.jcraft.jsch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-wrapping-parent</artifactId>
<version>0.35.0</version>
<version>0.37.0</version>
</parent>

<artifactId>com.jcraft.jsch</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion io.grpc.java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-wrapping-parent</artifactId>
<version>0.35.0</version>
<version>0.37.0</version>
</parent>

<artifactId>io.grpc.java</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jakarta.transaction/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-wrapping-parent</artifactId>
<version>0.35.0</version>
<version>0.37.0</version>
</parent>

<artifactId>jta</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion kafka.clients/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-wrapping-parent</artifactId>
<version>0.35.0</version>
<version>0.37.0</version>
</parent>

<artifactId>kafka.clients</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>dev.galasa</groupId>
<artifactId>galasa-wrapping-parent</artifactId>
<version>0.35.0</version>
<version>0.37.0</version>
<packaging>pom</packaging>

<name>Galasa OSGi Wrapping</name>
Expand All @@ -29,8 +29,8 @@
</developers>

<modules>
<module>com.jcraft.jsch</module>
<module>com.auth0.jwt</module>
<module>com.jcraft.jsch</module>
<module>com.google.gson</module>
<module>jakarta.transaction</module>
<module>io.grpc.java</module>
Expand Down
Loading