cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1073742 - in /cayenne/main/trunk/framework: cayenne-client/pom.xml cayenne-jdk1.6-unpublished/ cayenne-server/pom.xml pom.xml
Date Wed, 23 Feb 2011 13:56:56 GMT
Author: aadamchik
Date: Wed Feb 23 13:56:56 2011
New Revision: 1073742

URL: http://svn.apache.org/viewvc?rev=1073742&view=rev
Log:
CAY-1544 Remove jdk1.6 module from Cayenne sources

Removed:
    cayenne/main/trunk/framework/cayenne-jdk1.6-unpublished/
Modified:
    cayenne/main/trunk/framework/cayenne-client/pom.xml
    cayenne/main/trunk/framework/cayenne-server/pom.xml
    cayenne/main/trunk/framework/pom.xml

Modified: cayenne/main/trunk/framework/cayenne-client/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-client/pom.xml?rev=1073742&r1=1073741&r2=1073742&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-client/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-client/pom.xml Wed Feb 23 13:56:56 2011
@@ -100,63 +100,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>java6</id>
-			<activation>
-				<jdk>1.6</jdk>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.cayenne.unpublished</groupId>
-					<artifactId>cayenne-jdk1.6-unpublished</artifactId>
-					<version>${version}</version>
-					<scope>provided</scope>
-				</dependency>
-			</dependencies>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.cayenne.build-tools</groupId>
-						<artifactId>maven-cayenne-build-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>aggregate-all</id>
-								<phase>package</phase>
-								<goals>
-									<goal>aggregate-bin</goal>
-									<goal>aggregate-sources</goal>
-								</goals>
-								<configuration>
-									<excludesFile>src/main/aggregator/excludes.txt</excludesFile>
-									<artifactItems>
-										<artifactItem>
-											<groupId>org.apache.cayenne.unpublished</groupId>
-											<artifactId>cayenne-di-unpublished</artifactId>
-											<version>${version}</version>
-										</artifactItem>
-										<artifactItem>
-											<groupId>org.apache.cayenne.unpublished</groupId>
-											<artifactId>cayenne-jdk1.5-unpublished</artifactId>
-											<version>${version}</version>
-										</artifactItem>
-										<artifactItem>
-											<groupId>org.apache.cayenne.unpublished</groupId>
-											<artifactId>cayenne-jdk1.6-unpublished</artifactId>
-											<version>${version}</version>
-										</artifactItem>
-										<artifactItem>
-											<groupId>org.apache.cayenne.unpublished</groupId>
-											<artifactId>cayenne-legal-unpublished</artifactId>
-											<version>${version}</version>
-										</artifactItem>
-									</artifactItems>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>

Modified: cayenne/main/trunk/framework/cayenne-server/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-server/pom.xml?rev=1073742&r1=1073741&r2=1073742&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-server/pom.xml Wed Feb 23 13:56:56 2011
@@ -98,62 +98,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>java6</id>
-			<activation>
-				<jdk>1.6</jdk>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.cayenne.unpublished</groupId>
-					<artifactId>cayenne-jdk1.6-unpublished</artifactId>
-					<version>${version}</version>
-					<scope>provided</scope>
-				</dependency>
-			</dependencies>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.cayenne.build-tools</groupId>
-						<artifactId>maven-cayenne-build-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>aggregate-all</id>
-								<phase>package</phase>
-								<goals>
-									<goal>aggregate-bin</goal>
-									<goal>aggregate-sources</goal>
-								</goals>
-								<configuration>
-									<artifactItems>
-										<artifactItem>
-											<groupId>org.apache.cayenne.unpublished</groupId>
-											<artifactId>cayenne-di-unpublished</artifactId>
-											<version>${version}</version>
-										</artifactItem>
-										<artifactItem>
-											<groupId>org.apache.cayenne.unpublished</groupId>
-											<artifactId>cayenne-jdk1.5-unpublished</artifactId>
-											<version>${version}</version>
-										</artifactItem>
-										<artifactItem>
-											<groupId>org.apache.cayenne.unpublished</groupId>
-											<artifactId>cayenne-jdk1.6-unpublished</artifactId>
-											<version>${version}</version>
-										</artifactItem>
-										<artifactItem>
-											<groupId>org.apache.cayenne.unpublished</groupId>
-											<artifactId>cayenne-legal-unpublished</artifactId>
-											<version>${version}</version>
-										</artifactItem>
-									</artifactItems>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>

Modified: cayenne/main/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/pom.xml?rev=1073742&r1=1073741&r2=1073742&view=diff
==============================================================================
--- cayenne/main/trunk/framework/pom.xml (original)
+++ cayenne/main/trunk/framework/pom.xml Wed Feb 23 13:56:56 2011
@@ -60,25 +60,6 @@
 				<module>maven-cayenne-plugin</module>
 			</modules>
 		</profile>
-		<profile>
-			<id>java6</id>
-			<activation>
-				<jdk>1.6</jdk>
-			</activation>
-			<modules>
-				<module>cayenne-legal-unpublished</module>
-				<module>cayenne-di-unpublished</module>
-				<module>cayenne-jdk1.5-unpublished</module>
-				<module>cayenne-jdk1.6-unpublished</module>
-				<module>cayenne-project-unpublished</module>
-				<module>cayenne-wocompat-unpublished</module>
-				<module>cayenne-server</module>
-				<module>cayenne-client</module>
-				<module>cayenne-tools</module>
-				<module>cayenne-lifecycle</module>
-				<module>maven-cayenne-plugin</module>
-			</modules>
-		</profile>
 	</profiles>
 	
 	<repositories>



Mime
View raw message