Skip to content

Commit

Permalink
LPS-38337 Add missing portal-pacl and util-slf4j artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
mikakoivisto committed Jul 29, 2013
1 parent ece7e61 commit 8588841
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 0 deletions.
12 changes: 12 additions & 0 deletions build-maven.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,20 +93,24 @@ for GPG setup instructions.
<target name="jar-javadoc">
<ant dir="portal-client" target="jar-javadoc" inheritAll="false" />
<ant dir="portal-impl" target="jar-javadoc" inheritAll="false" />
<ant dir="portal-pacl" target="jar-javadoc" inheritAll="false" />
<ant dir="portal-service" target="jar-javadoc" inheritAll="false" />
<ant dir="support-tomcat" target="jar-javadoc" inheritAll="false" />
<ant dir="util-bridges" target="jar-javadoc" inheritAll="false" />
<ant dir="util-java" target="jar-javadoc" inheritAll="false" />
<ant dir="util-slf4j" target="jar-javadoc" inheritAll="false" />
<ant dir="util-taglib" target="jar-javadoc" inheritAll="false" />
</target>

<target name="jar-sources">
<ant dir="portal-client" target="jar-sources" inheritAll="false" />
<ant dir="portal-impl" target="jar-sources" inheritAll="false" />
<ant dir="portal-pacl" target="jar-sources" inheritAll="false" />
<ant dir="portal-service" target="jar-sources" inheritAll="false" />
<ant dir="support-tomcat" target="jar-sources" inheritAll="false" />
<ant dir="util-bridges" target="jar-sources" inheritAll="false" />
<ant dir="util-java" target="jar-sources" inheritAll="false" />
<ant dir="util-slf4j" target="jar-sources" inheritAll="false" />
<ant dir="util-taglib" target="jar-sources" inheritAll="false" />
</target>

Expand Down Expand Up @@ -165,6 +169,10 @@ Run "ant -f build-dist.xml all zip-portal-war" to generate that file.
dir="portal-impl"
includes="portal-impl.jar,portal-impl-javadoc.jar,portal-impl-sources.jar"
/>
<fileset
dir="portal-pacl"
includes="portal-pacl.jar,portal-pacl-javadoc.jar,portal-pacl-sources.jar"
/>
<fileset
dir="portal-service"
includes="portal-service.jar,portal-service-javadoc.jar,portal-service-sources.jar"
Expand All @@ -181,6 +189,10 @@ Run "ant -f build-dist.xml all zip-portal-war" to generate that file.
dir="util-java"
includes="util-java.jar,util-java-javadoc.jar,util-java-sources.jar"
/>
<fileset
dir="util-slf4j"
includes="util-slf4j.jar,util-slf4j-javadoc.jar,util-slf4j-sources.jar"
/>
<fileset
dir="util-taglib"
includes="util-taglib.jar,util-taglib-javadoc.jar,util-taglib-sources.jar"
Expand Down
20 changes: 20 additions & 0 deletions tools/maven/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
<param name="packaging" value="jar" />
</antcall>

<antcall target="deploy-artifact">
<param name="artifact.id" value="portal-pacl" />
<param name="packaging" value="jar" />
</antcall>

<antcall target="deploy-artifact">
<param name="artifact.id" value="portal-parent" />
<param name="packaging" value="pom" />
Expand Down Expand Up @@ -76,6 +81,11 @@
<param name="packaging" value="jar" />
</antcall>

<antcall target="deploy-artifact">
<param name="artifact.id" value="util-slf4j" />
<param name="packaging" value="jar" />
</antcall>

<antcall target="deploy-artifact">
<param name="artifact.id" value="util-taglib" />
<param name="packaging" value="jar" />
Expand Down Expand Up @@ -228,6 +238,11 @@
<param name="packaging" value="jar" />
</antcall>

<antcall target="install-artifact">
<param name="artifact.id" value="portal-pacl" />
<param name="packaging" value="jar" />
</antcall>

<antcall target="install-artifact">
<param name="artifact.id" value="portal-parent" />
<param name="packaging" value="pom" />
Expand Down Expand Up @@ -258,6 +273,11 @@
<param name="packaging" value="jar" />
</antcall>

<antcall target="install-artifact">
<param name="artifact.id" value="util-slf4j" />
<param name="packaging" value="jar" />
</antcall>

<antcall target="install-artifact">
<param name="artifact.id" value="util-taglib" />
<param name="packaging" value="jar" />
Expand Down
41 changes: 41 additions & 0 deletions tools/maven/portal-pacl.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-parent</artifactId>
<version>@version@</version>
</parent>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-pacl</artifactId>
<name>Liferay Portal PACL</name>
<version>@version@</version>
<description>Contains implementation for the portal security manager.</description>
<dependencies>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-impl</artifactId>
<version>@version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-service</artifactId>
<version>@version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>util-bridges</artifactId>
<version>@version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>util-java</artifactId>
<version>@version@</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
23 changes: 23 additions & 0 deletions tools/maven/util-slf4j.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-parent</artifactId>
<version>@version@</version>
</parent>
<groupId>com.liferay.portal</groupId>
<artifactId>util-slf4j</artifactId>
<name>Liferay Util SLF4J</name>
<version>@version@</version>
<description>Contains Liferay SLF4J Binding. Classes are loaded separately for each plugin.</description>
<dependencies>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-service</artifactId>
<version>@version@</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

0 comments on commit 8588841

Please sign in to comment.