Author: struberg
Date: Tue Dec 18 18:03:57 2012
New Revision: 1423556
URL: http://svn.apache.org/viewvc?rev=1423556&view=rev
Log:
fix maven setup poms after refactoring the structure
Added:
commons/sandbox/privilizer/trunk/modules/pom.xml (with props)
commons/sandbox/privilizer/trunk/modules/privilizer/pom.xml (with props)
Modified:
commons/sandbox/privilizer/trunk/modules/privilizer/api/pom.xml
commons/sandbox/privilizer/trunk/modules/privilizer/weaver/pom.xml
commons/sandbox/privilizer/trunk/pom.xml
Added: commons/sandbox/privilizer/trunk/modules/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/privilizer/trunk/modules/pom.xml?rev=1423556&view=auto
==============================================================================
--- commons/sandbox/privilizer/trunk/modules/pom.xml (added)
+++ commons/sandbox/privilizer/trunk/modules/pom.xml Tue Dec 18 18:03:57 2012
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+
+ Copyright the original author or authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ -->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>commons-weaver</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>commons-weaver-modules-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Commons Weaver Modules aggregator project</name>
+ <modules>
+ <module>privilizer</module>
+ </modules>
+</project>
Propchange: commons/sandbox/privilizer/trunk/modules/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/sandbox/privilizer/trunk/modules/privilizer/api/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/privilizer/trunk/modules/privilizer/api/pom.xml?rev=1423556&r1=1423555&r2=1423556&view=diff
==============================================================================
--- commons/sandbox/privilizer/trunk/modules/privilizer/api/pom.xml (original)
+++ commons/sandbox/privilizer/trunk/modules/privilizer/api/pom.xml Tue Dec 18
18:03:57 2012
@@ -20,12 +20,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-privilizer-parent</artifactId>
+ <artifactId>commons-weaver-privilizer-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
+
<artifactId>commons-privilizer-api</artifactId>
<name>Commons Privilizer API</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+
</project>
Added: commons/sandbox/privilizer/trunk/modules/privilizer/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/privilizer/trunk/modules/privilizer/pom.xml?rev=1423556&view=auto
==============================================================================
--- commons/sandbox/privilizer/trunk/modules/privilizer/pom.xml (added)
+++ commons/sandbox/privilizer/trunk/modules/privilizer/pom.xml Tue Dec 18
18:03:57 2012
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright the original author or authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ -->
+<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-weaver-modules-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>commons-weaver-privilizer-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Commons Weaver Privilizer Parent POM</name>
+
+ <description>
+ Privilizer provides machinery to automate the handling of Java Security
access controls in code.
+ </description>
+
+ <modules>
+ <module>api</module>
+ <module>weaver</module>
+ </modules>
+</project>
Propchange: commons/sandbox/privilizer/trunk/modules/privilizer/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/sandbox/privilizer/trunk/modules/privilizer/weaver/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/privilizer/trunk/modules/privilizer/weaver/pom.xml?rev=1423556&r1=1423555&r2=1423556&view=diff
==============================================================================
--- commons/sandbox/privilizer/trunk/modules/privilizer/weaver/pom.xml
(original)
+++ commons/sandbox/privilizer/trunk/modules/privilizer/weaver/pom.xml Tue Dec
18 18:03:57 2012
@@ -20,20 +20,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-privilizer-parent</artifactId>
+ <artifactId>commons-weaver-privilizer-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
+
<artifactId>commons-privilizer</artifactId>
<name>Commons Privilizer</name>
- <description>Privilizer provides machinery to automate the handling of Java
Security access controls in code.
+ <description>
+ Privilizer provides machinery to automate the handling of Java Security
access controls in code.
</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-privilizer-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Modified: commons/sandbox/privilizer/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/privilizer/trunk/pom.xml?rev=1423556&r1=1423555&r2=1423556&view=diff
==============================================================================
--- commons/sandbox/privilizer/trunk/pom.xml (original)
+++ commons/sandbox/privilizer/trunk/pom.xml Tue Dec 18 18:03:57 2012
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
- --><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/xsd/maven-4.0.0.xsd";>
+ -->
+<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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -24,19 +25,21 @@
<version>9</version>
</parent>
- <artifactId>commons-privilizer-parent</artifactId>
+ <artifactId>commons-weaver</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Commons Privilizer Parent POM</name>
+ <name>Commons Weaver Parent POM</name>
- <description>Privilizer provides machinery to automate the handling of Java
Security access controls in code.
+ <description>
+ Commons Weaver provides an easy way to 'enhance' compiled classes with
+ new functionality by generating ('weaving') bytecode into those classes.
</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
+ <maven.compile.source>1.6</maven.compile.source>
+ <maven.compile.target>1.6</maven.compile.target>
<commons.componentid>privilizer</commons.componentid>
<commons.release.version>1.0</commons.release.version>
<commons.rc.version>RC1</commons.rc.version>
@@ -59,19 +62,17 @@
<url>http://svn.apache.org/viewvc/commons/sandbox/privilizer/trunk/</url>
</scm>
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <name>Apache Website</name>
+
<url>scp://people.apache.org/www/commons.apache.org/sandbox/privilizer/</url>
+ </site>
+ </distributionManagement>
+
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-privilizer-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-privilizer</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
@@ -84,17 +85,12 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-privilizer-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>${maven.compile.source}</source>
+ <target>${maven.compile.target}</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
@@ -166,19 +162,13 @@
</plugins>
</build>
- <distributionManagement>
- <site>
- <id>website</id>
- <name>Apache Website</name>
-
<url>scp://people.apache.org/www/commons.apache.org/sandbox/privilizer/</url>
- </site>
- </distributionManagement>
-
<modules>
- <module>api</module>
- <module>weaver</module>
- <module>maven-plugin</module>
+<!--X TODO enable again
+ <module>processor</module>
+-->
+ <module>modules</module>
<module>example</module>
+ <module>maven-plugin</module>
<module>ant</module>
</modules>
</project>
