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

SOAPUIOS-548 update-bouncecastle-version #544

Merged
merged 6 commits into from
Nov 10, 2020
Merged

SOAPUIOS-548 update-bouncecastle-version #544

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54ad3af
SOAPUIOS-548 update-bouncecastle-version
Nov 9, 2020
4c7ebb9
SOAPUIOS-548 implement review suggestions. use single pom version.
Nov 9, 2020
a79fd9c
Merge branch 'next' of https://github.com/SmartBear/soapui into SOAPU…
Nov 9, 2020
12bd221
Merge branch 'next' of https://github.com/SmartBear/soapui into SOAPU…
Nov 9, 2020
1add53a
Merge branch 'next' of https://github.com/SmartBear/soapui into SOAPU…
Nov 10, 2020
848141b
Merge branch 'next' of https://github.com/SmartBear/soapui into SOAPU…
Nov 10, 2020
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
2 changes: 1 addition & 1 deletion soapui-maven-plugin/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<classpathentry kind="var" path="MAVEN_REPO/xalan/jars/xalan-2.7.1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xercesImpl-2.9.1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/wss4j/jars/wss4j-1.5.8.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/bouncycastle/jars/bcprov-jdk15-144.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/org/bouncycastle/jars/bcprov-jdk15on-1.64.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jtidy/jars/jtidy-r872-jdk15.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/javax.jms/jars/jms-1.1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/hermesjms/jars/hermes-1.14.jar"/>
Expand Down
8 changes: 4 additions & 4 deletions soapui-maven-plugin/plugin.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<ant:pathelement location="${plugin.getDependencyPath('xalan:xalan')}"/>
<ant:pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<ant:pathelement location="${plugin.getDependencyPath('wss4j:wss4j')}"/>
<ant:pathelement location="${plugin.getDependencyPath('bouncycastle:bcprov')}"/>
<ant:pathelement location="${plugin.getDependencyPath('org.bouncycastle:bcprov-jdk15on')}"/>
<ant:pathelement location="${plugin.getDependencyPath('jtidy:jtidy')}"/>
<ant:pathelement location="${plugin.getDependencyPath('javax.jms:jms')}"/>
<ant:pathelement location="${plugin.getDependencyPath('hermesjms:hermes')}"/>
Expand Down Expand Up @@ -314,7 +314,7 @@
<ant:pathelement location="${plugin.getDependencyPath('xalan:xalan')}"/>
<ant:pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<ant:pathelement location="${plugin.getDependencyPath('wss4j:wss4j')}"/>
<ant:pathelement location="${plugin.getDependencyPath('bouncycastle:bcprov')}"/>
<ant:pathelement location="${plugin.getDependencyPath('org.bouncycastle:bcprov-jdk15on')}"/>
<ant:pathelement location="${plugin.getDependencyPath('jtidy:jtidy')}"/>
<ant:pathelement location="${plugin.getDependencyPath('javax.jms:jms')}"/>
<ant:pathelement location="${plugin.getDependencyPath('hermesjms:hermes')}"/>
Expand Down Expand Up @@ -428,7 +428,7 @@
<ant:pathelement location="${plugin.getDependencyPath('xalan:xalan')}"/>
<ant:pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<ant:pathelement location="${plugin.getDependencyPath('wss4j:wss4j')}"/>
<ant:pathelement location="${plugin.getDependencyPath('bouncycastle:bcprov')}"/>
<ant:pathelement location="${plugin.getDependencyPath('org.bouncycastle:bcprov-jdk15on')}"/>
<ant:pathelement location="${plugin.getDependencyPath('jtidy:jtidy')}"/>
<ant:pathelement location="${plugin.getDependencyPath('javax.jms:jms')}"/>
<ant:pathelement location="${plugin.getDependencyPath('hermesjms:hermes')}"/>
Expand Down Expand Up @@ -597,7 +597,7 @@
<ant:pathelement location="${plugin.getDependencyPath('xalan:xalan')}"/>
<ant:pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<ant:pathelement location="${plugin.getDependencyPath('wss4j:wss4j')}"/>
<ant:pathelement location="${plugin.getDependencyPath('bouncycastle:bcprov')}"/>
<ant:pathelement location="${plugin.getDependencyPath('org.bouncycastle:bcprov-jdk15on')}"/>
<ant:pathelement location="${plugin.getDependencyPath('jtidy:jtidy')}"/>
<ant:pathelement location="${plugin.getDependencyPath('javax.jms:jms')}"/>
<ant:pathelement location="${plugin.getDependencyPath('hermesjms:hermes')}"/>
Expand Down
16 changes: 13 additions & 3 deletions soapui-maven-plugin/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,16 @@
<groupId>com.narupley</groupId>
<artifactId>not-going-to-be-commons-ssl</artifactId>
<version>${not-going-to-be-commons-ssl.version}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand Down Expand Up @@ -262,9 +272,9 @@
<type>jar</type>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov</artifactId>
<version>jdk15-144</version>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.64</version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can add bouncycastle in the root pom with the specified version, and you won't need to specify version in child projects then.

<type>jar</type>
</dependency>
<dependency>
Expand Down
16 changes: 13 additions & 3 deletions soapui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,16 @@
<groupId>com.narupley</groupId>
<artifactId>not-going-to-be-commons-ssl</artifactId>
<version>${not-going-to-be-commons-ssl.version}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand Down Expand Up @@ -543,9 +553,9 @@
<version>2.7.1</version>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>144</version>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.64</version>
</dependency>
<dependency>
<groupId>jtidy</groupId>
Expand Down