Skip to content

Commit a748a50

Browse files
jasonkhooch-githubjasonkhooch-github
authored
Merge pull request #2 from OWASP/master
pull request 18 march
2 parents e93a0b0 + 2cbdd02 commit a748a50

File tree

12 files changed

+587
-264
lines changed

12 files changed

+587
-264
lines changed

‎pom.xml‎

Lines changed: 212 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</plugins>
3333
</build>
3434
</profile>
35-
35+
3636
<profile>
3737
<id>benchmarkscore</id>
3838
<build>
@@ -85,7 +85,7 @@
8585
<plugin>
8686
<groupId>com.h3xstream.findsecbugs</groupId>
8787
<artifactId>findsecbugs-plugin</artifactId>
88-
<version>1.9.0</version>
88+
<version>1.10.1</version>
8989
</plugin>
9090
</plugins>
9191
</configuration>
@@ -300,7 +300,214 @@
300300
</plugins>
301301
</build>
302302
</profile>
303-
303+
304+
<profile>
305+
<id>deploywseeker</id>
306+
<properties>
307+
<skipTests>true</skipTests>
308+
<seeker.javaagent>-javaagent:${basedir}/tools/seeker/seeker-agent.jar</seeker.javaagent>
309+
<seeker.server.url>-Dseeker.server.url=https://server.example.com:8888</seeker.server.url>
310+
<seeker.project.key>-Dseeker.project.key=Benchmark</seeker.project.key>
311+
</properties>
312+
<build>
313+
<plugins>
314+
<plugin>
315+
<artifactId>maven-antrun-plugin</artifactId>
316+
<version>1.7</version>
317+
<executions>
318+
<execution>
319+
<id>ldap-server</id>
320+
<phase>package</phase>
321+
<goals>
322+
<goal>run</goal>
323+
</goals>
324+
<configuration>
325+
<target>
326+
<ant target="run" antfile="${basedir}/src/config/build.xml">
327+
<reference torefid="maven.compile.classpath" refid="maven.compile.classpath" />
328+
</ant>
329+
</target>
330+
</configuration>
331+
</execution>
332+
<execution>
333+
<id>database-server</id>
334+
<phase>package</phase>
335+
<goals>
336+
<goal>run</goal>
337+
</goals>
338+
<configuration>
339+
<target>
340+
<ant target="databaseServer" antfile="${basedir}/src/config/build.xml">
341+
<reference torefid="maven.compile.classpath" refid="maven.compile.classpath" />
342+
</ant>
343+
</target>
344+
</configuration>
345+
</execution>
346+
<execution>
347+
<id>database-init</id>
348+
<phase>package</phase>
349+
<goals>
350+
<goal>run</goal>
351+
</goals>
352+
<configuration>
353+
<target>
354+
<ant target="databaseInit" antfile="${basedir}/src/config/build.xml">
355+
<reference torefid="maven.compile.classpath" refid="maven.compile.classpath" />
356+
</ant>
357+
</target>
358+
</configuration>
359+
</execution>
360+
</executions>
361+
</plugin>
362+
<plugin>
363+
<groupId>org.codehaus.cargo</groupId>
364+
<artifactId>cargo-maven2-plugin</artifactId>
365+
<version>1.6.0</version>
366+
<configuration>
367+
<container>
368+
<timeout>300000</timeout>
369+
<containerId>tomcat8x</containerId>
370+
<zipUrlInstaller>
371+
<url>http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.zip</url>
372+
</zipUrlInstaller>
373+
</container>
374+
<configuration>
375+
<configfiles>
376+
<configfile>
377+
<file>${basedir}/src/config/local/server.xml</file>
378+
<todir>conf</todir>
379+
<overwrite>true</overwrite>
380+
</configfile>
381+
<configfile>
382+
<file>${basedir}/src/config/local/context.xml</file>
383+
<todir>conf</todir>
384+
<overwrite>true</overwrite>
385+
</configfile>
386+
</configfiles>
387+
<properties>
388+
<cargo.jvmargs>
389+
${seeker.javaagent} ${seeker.server.url} ${seeker.project.key} -Xss2m
390+
</cargo.jvmargs>
391+
<cargo.servlet.port>8443</cargo.servlet.port>
392+
<cargo.protocol>https</cargo.protocol>
393+
<cargo.tomcat.connector.clientAuth>false</cargo.tomcat.connector.clientAuth>
394+
<cargo.tomcat.connector.sslProtocol>TLS</cargo.tomcat.connector.sslProtocol>
395+
<cargo.tomcat.connector.keystoreFile>../../../../.keystore</cargo.tomcat.connector.keystoreFile>
396+
<cargo.tomcat.connector.keystorePass>changeit</cargo.tomcat.connector.keystorePass>
397+
<cargo.tomcat.connector.keyAlias>tomcat</cargo.tomcat.connector.keyAlias>
398+
<cargo.tomcat.httpSecure>true</cargo.tomcat.httpSecure>
399+
</properties>
400+
</configuration>
401+
</configuration>
402+
</plugin>
403+
</plugins>
404+
</build>
405+
</profile>
406+
407+
<profile>
408+
<id>deploywcxiast</id>
409+
<properties>
410+
<skipTests>true</skipTests>
411+
</properties>
412+
<build>
413+
<plugins>
414+
<plugin>
415+
<artifactId>maven-antrun-plugin</artifactId>
416+
<executions>
417+
<execution>
418+
<id>ldap-server</id>
419+
<phase>package</phase>
420+
<goals>
421+
<goal>run</goal>
422+
</goals>
423+
<configuration>
424+
<target>
425+
<ant target="run" antfile="${basedir}/src/config/build.xml">
426+
<reference torefid="maven.compile.classpath" refid="maven.compile.classpath"/>
427+
</ant>
428+
</target>
429+
</configuration>
430+
</execution>
431+
<execution>
432+
<id>database-server</id>
433+
<phase>package</phase>
434+
<goals>
435+
<goal>run</goal>
436+
</goals>
437+
<configuration>
438+
<target>
439+
<ant target="databaseServer" antfile="${basedir}/src/config/build.xml">
440+
<reference torefid="maven.compile.classpath" refid="maven.compile.classpath"/>
441+
</ant>
442+
</target>
443+
</configuration>
444+
</execution>
445+
<execution>
446+
<id>database-init</id>
447+
<phase>package</phase>
448+
<goals>
449+
<goal>run</goal>
450+
</goals>
451+
<configuration>
452+
<target>
453+
<ant target="databaseInit" antfile="${basedir}/src/config/build.xml">
454+
<reference torefid="maven.compile.classpath" refid="maven.compile.classpath"/>
455+
</ant>
456+
</target>
457+
</configuration>
458+
</execution>
459+
</executions>
460+
</plugin>
461+
<plugin>
462+
<groupId>org.codehaus.cargo</groupId>
463+
<artifactId>cargo-maven2-plugin</artifactId>
464+
<configuration>
465+
<container>
466+
<timeout>300000</timeout>
467+
<containerId>tomcat${tomcat.major.version}x</containerId>
468+
<zipUrlInstaller>
469+
<url>${tomcat.url}</url>
470+
</zipUrlInstaller>
471+
</container>
472+
<properties>
473+
<cargo.jvmargs>-XX:MaxPermSize=6G -Xms1G –Xmx8G</cargo.jvmargs>
474+
</properties>
475+
<configuration>
476+
<configfiles>
477+
<configfile>
478+
<file>${basedir}/src/config/local/server.xml</file>
479+
<todir>conf</todir>
480+
<overwrite>true</overwrite>
481+
</configfile>
482+
<configfile>
483+
<file>${basedir}/src/config/local/context.xml</file>
484+
<todir>conf</todir>
485+
<overwrite>true</overwrite>
486+
</configfile>
487+
</configfiles>
488+
<properties>
489+
<cargo.jvmargs>
490+
-Xmx4G
491+
-javaagent:${basedir}/tools/CxIAST/cx-launcher.jar
492+
-Diast.home=${basedir}/tools/CxIAST/
493+
-Xverify:none
494+
</cargo.jvmargs>
495+
<cargo.servlet.port>8443</cargo.servlet.port>
496+
<cargo.protocol>https</cargo.protocol>
497+
<cargo.tomcat.connector.clientAuth>false</cargo.tomcat.connector.clientAuth>
498+
<cargo.tomcat.connector.sslProtocol>TLS</cargo.tomcat.connector.sslProtocol>
499+
<cargo.tomcat.connector.keystoreFile>../../../../.keystore</cargo.tomcat.connector.keystoreFile>
500+
<cargo.tomcat.connector.keystorePass>changeit</cargo.tomcat.connector.keystorePass>
501+
<cargo.tomcat.connector.keyAlias>tomcat</cargo.tomcat.connector.keyAlias>
502+
<cargo.tomcat.httpSecure>true</cargo.tomcat.httpSecure>
503+
</properties>
504+
</configuration>
505+
</configuration>
506+
</plugin>
507+
</plugins>
508+
</build>
509+
</profile>
510+
304511
<profile>
305512
<id>deploywhcl</id>
306513
<properties>
@@ -495,7 +702,7 @@ But it requires getting all the Log4j2 stuff configured right, and haven't done
495702
</dependency>
496703

497704
<!-- mvn dependency:analyze says these 4 artifacts are used but not included in the pom, but adding
498-
them breaks the LDAP server startup. Maybe because apacheds-all includes them already?
705+
them breaks the LDAP server startup. Maybe because apacheds-all includes them already?
499706
<dependency>
500707
<groupId>org.apache.directory.shared</groupId>
501708
<artifactId>shared-ldap</artifactId>
@@ -665,7 +872,7 @@ But it might be needed for Java 10, because I get this error, that I don't get w
665872
-->
666873
<version>1.5.7</version>
667874
<exclusions>
668-
<!-- shared-ldap-schema module needs to be excluded to avoid multiple
875+
<!-- shared-ldap-schema module needs to be excluded to avoid multiple
669876
schema resources on the classpath -->
670877
<exclusion>
671878
<groupId>org.apache.directory.shared</groupId>

0 commit comments

Comments
 (0)