Bug 470000 - Remove (or reduce) dependency on aspectj bundles

Change-Id: Ibe5343cacf9cfb126ec8bab22cc9a414d6b28514
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>

16 files changed, 51 insertions, 194 deletions

diff --git a/features/org.eclipse.equinox.core.feature/feature.xml b/features/org.eclipse.equinox.core.feature/feature.xml
index 16db012c1..b0491fde2 100644
--- a/features/org.eclipse.equinox.core.feature/feature.xml
+++ b/features/org.eclipse.equinox.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.core.feature"
       label="%featureName"
-      version="1.2.100.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.equinox.core.feature/pom.xml b/features/org.eclipse.equinox.core.feature/pom.xml
index 90652b422..53f251186 100644
--- a/features/org.eclipse.equinox.core.feature/pom.xml
+++ b/features/org.eclipse.equinox.core.feature/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.core.feature</artifactId>
-  <version>1.2.100-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.equinox.core.sdk/feature.xml b/features/org.eclipse.equinox.core.sdk/feature.xml
index 64e3d439a..9e8213ab8 100644
--- a/features/org.eclipse.equinox.core.sdk/feature.xml
+++ b/features/org.eclipse.equinox.core.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.core.sdk"
       label="%featureName"
-      version="3.11.0.qualifier"
+      version="3.12.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -421,4 +421,47 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.equinox.weaving.caching"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.weaving.caching.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.weaving.caching.j9"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.weaving.caching.j9.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.weaving.hook"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.weaving.hook.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.eclipse.equinox.core.sdk/pom.xml b/features/org.eclipse.equinox.core.sdk/pom.xml
index ab8d994a8..892e00b9f 100644
--- a/features/org.eclipse.equinox.core.sdk/pom.xml
+++ b/features/org.eclipse.equinox.core.sdk/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.core.sdk</artifactId>
-  <version>3.11.0-SNAPSHOT</version>
+  <version>3.12.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.equinox.sdk/feature.xml b/features/org.eclipse.equinox.sdk/feature.xml
index 3fc1fbc6b..aba098082 100644
--- a/features/org.eclipse.equinox.sdk/feature.xml
+++ b/features/org.eclipse.equinox.sdk/feature.xml
@@ -36,10 +36,6 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.equinox.weaving.sdk"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.equinox.core.feature"
          version="0.0.0"/>
 
diff --git a/features/org.eclipse.equinox.server.core/feature.xml b/features/org.eclipse.equinox.server.core/feature.xml
index f58320da7..5d92ab231 100644
--- a/features/org.eclipse.equinox.server.core/feature.xml
+++ b/features/org.eclipse.equinox.server.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.server.core"
       label="%featureName"
-      version="1.3.100.qualifier"
+      version="1.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.equinox.server.core/pom.xml b/features/org.eclipse.equinox.server.core/pom.xml
index 2755ff4eb..471a81fc8 100644
--- a/features/org.eclipse.equinox.server.core/pom.xml
+++ b/features/org.eclipse.equinox.server.core/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.server.core</artifactId>
-  <version>1.3.100-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.equinox.server.servletbridge/feature.xml b/features/org.eclipse.equinox.server.servletbridge/feature.xml
index 056029262..db2cd9e3b 100644
--- a/features/org.eclipse.equinox.server.servletbridge/feature.xml
+++ b/features/org.eclipse.equinox.server.servletbridge/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.server.servletbridge"
       label="%featureName"
-      version="1.0.101.qualifier"
+      version="1.0.200.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.equinox.server.servletbridge/pom.xml b/features/org.eclipse.equinox.server.servletbridge/pom.xml
index 1d1b050f6..50653dd55 100644
--- a/features/org.eclipse.equinox.server.servletbridge/pom.xml
+++ b/features/org.eclipse.equinox.server.servletbridge/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.server.servletbridge</artifactId>
-  <version>1.0.101-SNAPSHOT</version>
+  <version>1.0.200-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.equinox.weaving.sdk/.project b/features/org.eclipse.equinox.weaving.sdk/.project
deleted file mode 100644
index dec161ec2..000000000
--- a/features/org.eclipse.equinox.weaving.sdk/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.weaving.sdk</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.equinox.weaving.sdk/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.equinox.weaving.sdk/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d2..000000000
--- a/features/org.eclipse.equinox.weaving.sdk/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/features/org.eclipse.equinox.weaving.sdk/build.properties b/features/org.eclipse.equinox.weaving.sdk/build.properties
deleted file mode 100644
index f1d0c0e7e..000000000
--- a/features/org.eclipse.equinox.weaving.sdk/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               feature.properties
-
-generate.plugin@org.eclipse.equinox.weaving.aspectj.source=org.eclipse.equinox.weaving.aspectj
-generate.plugin@org.eclipse.equinox.weaving.caching.source=org.eclipse.equinox.weaving.caching
-generate.plugin@org.eclipse.equinox.weaving.caching.j9.source=org.eclipse.equinox.weaving.caching.j9
-generate.plugin@org.eclipse.equinox.weaving.hook.source=org.eclipse.equinox.weaving.hook
diff --git a/features/org.eclipse.equinox.weaving.sdk/feature.properties b/features/org.eclipse.equinox.weaving.sdk/feature.properties
deleted file mode 100644
index 9d6a11a3a..000000000
--- a/features/org.eclipse.equinox.weaving.sdk/feature.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Equinox Weaving SDK
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Equinox Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Equinox Project Repository
-
-# "description" property - description of the feature
-description=A description of Equinox Weaving
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM - initial API and implementation\n
-################ end of copyright property ####################################
diff --git a/features/org.eclipse.equinox.weaving.sdk/feature.xml b/features/org.eclipse.equinox.weaving.sdk/feature.xml
deleted file mode 100644
index 5966ed274..000000000
--- a/features/org.eclipse.equinox.weaving.sdk/feature.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.equinox.weaving.sdk"
-      label="%featureName"
-      version="1.1.100.qualifier"
-      provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <plugin
-         id="org.eclipse.equinox.weaving.aspectj"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.weaving.aspectj.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.weaving.caching"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.weaving.caching.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.weaving.caching.j9"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.weaving.caching.j9.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.weaving.hook"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.weaving.hook.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.equinox.weaving.sdk/forceQualifierUpdate.txt b/features/org.eclipse.equinox.weaving.sdk/forceQualifierUpdate.txt
deleted file mode 100644
index 4df138ebc..000000000
--- a/features/org.eclipse.equinox.weaving.sdk/forceQualifierUpdate.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# To force a version qualifier update add the bug here
-Bug 403352 - Update all parent versions to match our build stream
- -- Force update for luna
-Bug 458346 - Unusual, hard to decipher error in I-build
diff --git a/features/org.eclipse.equinox.weaving.sdk/pom.xml b/features/org.eclipse.equinox.weaving.sdk/pom.xml
deleted file mode 100644
index fd3dcedf4..000000000
--- a/features/org.eclipse.equinox.weaving.sdk/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <artifactId>rt.equinox.bundles</artifactId>
-    <groupId>org.eclipse.equinox.bundles</groupId>
-    <version>4.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.equinox.feature</groupId>
-  <artifactId>org.eclipse.equinox.weaving.sdk</artifactId>
-  <version>1.1.100-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-</project>