Skip to content

Commit

Permalink
LRQA-68365 Clean up directory logic
Browse files Browse the repository at this point in the history
  • Loading branch information
vicnate5 authored and brianchandotcom committed Aug 2, 2021
1 parent 12600d6 commit 67673fc
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 25 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
/dist
/intellij
/jacoco
/modules/.releng/dxp/apps/lcs
/modules/dxp/apps/lcs
/modules/node_modules_cache
/modules/private/node_modules_cache
/nbproject/private
Expand Down
2 changes: 1 addition & 1 deletion build-test-batch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5456,7 +5456,7 @@ log.sanitizer.enabled=false</echo>
<then>
<gradle-execute dir="modules" outputproperty="modules.project.paths" task="printProjectPath">
<arg value="--quiet" />
<arg value="-Dbuild.exclude.dirs=private/apps/osb-lcs,third-party" />
<arg value="-Dbuild.exclude.dirs=third-party" />
</gradle-execute>

<loadresource property="modules.test.class.group">
Expand Down
4 changes: 0 additions & 4 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@
-e '!portal-impl/src/portal-*.properties' \
-e '!portal-impl/src/system-*.properties' \
\
-e '!modules/.releng/dxp/apps/lcs' \
-e '!modules/dxp/apps/lcs' \
\
-X .

#
Expand Down Expand Up @@ -318,7 +315,6 @@
build.repository.private.username=
build.services.baseline.enabled=true
build.services.skip.read.only=true
#build.setup.profile.dxp.app.lcs.version=7.0.5
build.setup.profile.dxp.commit.id=

##
Expand Down
15 changes: 0 additions & 15 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1043,18 +1043,6 @@ This target has been renamed to "snapshot-bundle". Please call "snapshot-bundle"

<antcall inheritAll="false" target="update-gradle-properties" />

<if>
<and>
<isset property="build.setup.profile.dxp.app.lcs.version" />
<not>
<equals arg1="${build.setup.profile.dxp.app.lcs.version}" arg2="" />
</not>
</and>
<then>
<setup-dxp-app dxp.app.name="lcs" dxp.app.version="${build.setup.profile.dxp.app.lcs.version}" />
</then>
</if>

<if>
<equals arg1="${build.patcher.replace.release.info.tokens}" arg2="true" />
<then>
Expand All @@ -1071,9 +1059,6 @@ This target has been renamed to "snapshot-bundle". Please call "snapshot-bundle"
/>
</delete>

<delete dir="${project.dir}/modules/.releng/dxp/apps/lcs" failonerror="false" />
<delete dir="${project.dir}/modules/dxp/apps/lcs" failonerror="false" />

<update-gradle-properties />

<if>
Expand Down
1 change: 0 additions & 1 deletion source-formatter.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
**/tools/sdk/**,\
**/webapps/**,\
definitions/web-facesconfig_1_2.xml,\
modules/dxp/apps/lcs/**,\
modules/sdk/gradle-plugins-workspace/src/gradleTest/distBundleZip/plugins-sdk/**,\
portal-impl/src/portal-ext.properties,\
portal-web/docroot/dtd/**
Expand Down
2 changes: 0 additions & 2 deletions test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1107,10 +1107,8 @@
test.batch.dist.source.includes=\
**/*.class,\
**/*.profile-dxp.properties,\
modules/.releng/dxp/apps/lcs/**/*,\
modules/core/portal-bootstrap/build/system.packages.extra.mf,\
modules/core/portal-bootstrap/lib/biz.aQute.bnd.annotation.jar,\
modules/dxp/apps/lcs/**/*,\
plugins/marketplace/*,\
sql/**/*.sql,\
sql/lportal.properties,\
Expand Down

0 comments on commit 67673fc

Please sign in to comment.