Skip to content

Commit

Permalink
Upgrade security plugin
Browse files Browse the repository at this point in the history
The security plugin is now deployed to nexus so the build has been
updated accordingly
  • Loading branch information
rpokorny committed Nov 16, 2015
1 parent 27f7241 commit 5e2c3ae
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ owf.build.org=owf
owf.build.rev=2.6
owf.security.module=ozone-security
owf.security.org=org.ozoneplatform
owf.security.rev=3.27
owf.security.rev=3.28
plugins.build-test-data=2.1.2
plugins.database-migration=1.4.0
plugins.pretty-time=2.1.3.Final-1.0.1
Expand Down
12 changes: 9 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -447,18 +447,24 @@
</target>

<target name="stage-security">
<mkdir dir="${staging.dir}/${owf.security.module}" />

<!-- Unzip sample Spring configuration files -->
<unzip src="${staging.dir}/${owf.security.module}-project-${owf.security.rev}.zip"
dest="${staging.dir}/${owf.security.module}">
<patternset>
<include name="owf-security-${owf.security.rev}/src/main/resources/spring/**" />
<include name="src/main/resources/spring/**" />
</patternset>
<filtermapper>
<replacestring from="owf-security-${owf.security.rev}/src/main/resources/spring/" to="" />
<replacestring from="src/main/resources/spring/" to="" />
</filtermapper>
</unzip>

<delete dir="${staging.dir}/${owf.security.module}/owf-security-${owf.security.rev}" />
<!-- this will be an empty directory tree due to the filtermapper above -->
<delete dir="${staging.dir}/${owf.security.module}/src" />

<copy file="${staging.dir}/${owf.security.module}-project-${owf.security.rev}.zip"
tofile="${staging.dir}/${owf.security.module}/${owf.security.module}-project.zip" />

<!-- Add default sample Spring configuration to Tomcat CLASSPATH -->
<copy todir="${tomcat.dir}/lib">
Expand Down
6 changes: 3 additions & 3 deletions ivysettings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
</filesystem>
<ibiblio name="nexus" m2compatible="true" root="http://repo1.maven.org/maven2"/>

<url name="ozone-security">
<artifact pattern="https://github.com/ozoneplatform/owf-security/archive/[revision].[ext]" />
</url>
<!--<url name="ozone-security">-->
<!--<artifact pattern="https://github.com/ozoneplatform/owf-security/archive/[revision].[ext]" />-->
<!--</url>-->
<!-- <url name="ozoneplatform">
<artifact pattern="https://github.com/ozoneplatform/[module]/archive/[revision].[ext]" />
</url> -->
Expand Down

0 comments on commit 5e2c3ae

Please sign in to comment.