Maven: Clean-up maven project structure and update "sign" profile in o.e.tcf.repo/pom.xml

2 files changed, 13 insertions, 99 deletions

diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index 5ef939b98..7c3b75a18 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -8,17 +8,24 @@
 		<maven>3.0</maven>
 	</prerequisites>
 
-	<parent>
-		<groupId>org.eclipse</groupId>
-		<artifactId>eclipse-parent</artifactId>
-		<version>3</version>
-	</parent>
-	
 	<groupId>org.eclipse.tcf</groupId>
 	<artifactId>org.eclipse.tcf.maven-config</artifactId>
 	<version>1.0.0-SNAPSHOT</version> 
 	<packaging>pom</packaging>
 	<name>TCF and Target Explorer, Maven Configuration Master</name>
+
+	<licenses>
+		<license>
+			<name>Eclipse Public License</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<organization>
+		<name>Eclipse Foundation</name>
+		<url>http://www.eclipse.org/</url>
+	</organization>
 	
 	<properties>
 		<!-- Define version id's to be used in the plugins section -->
@@ -46,20 +53,6 @@
 		<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/S20120428190502/repository/</orbit-site>
   	</properties>
 
-	<licenses>
-		<license>
-			<name>Eclipse Public License v1.0</name>
-			<comments>
-       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.htm
-      </comments>
-		</license>
-	</licenses>
-
 	<repositories>
 		<repository>
 			<id>platform</id>
@@ -90,10 +83,6 @@
 
 	<pluginRepositories>
 		<pluginRepository>
-			<id>maven.eclipse.org</id>
-			<url>http://mavem.eclipse.org/nexus/content/groups/public/</url>
-		</pluginRepository>
-		<pluginRepository>
 			<id>sonatype</id>
 			<url>https://repository.sonatype.org/content/repositories/public</url>
   			<snapshots>
diff --git a/admin/settings.xml b/admin/settings.xml
deleted file mode 100644
index 314b102b4..000000000
--- a/admin/settings.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-
-<!--
-  Eclipse.org committers or build engineers should uncomment this section and fill in as
-  appropriate for releasing and deploying items to the Nexus repository.  Add as many
-  server entries as you need.  These should correspond to your Distribution management ids as well.
-
-   <servers>
-      <server>
-        <id>eclipse-milestone</id>
-        <username>my_login</username>
-        <password>my_password</password>
-        <privateKey>${user.home}/.ssh/id_dsa</privateKey>
-      </server>
-   </servers>
--->
-   <mirrors>
-     <mirror>
-       <id>eclipse-central</id>
-       <mirrorOf>central</mirrorOf>
-       <url>http://maven.eclipse.org/nexus/content/groups/central/</url>
-     </mirror>
-     <mirror>
-       <id>eclipse-repositories</id>
-       <mirrorOf>milestone,integration,nightly,*</mirrorOf>
-       <url>http://maven.eclipse.org/nexus/content/groups/public/</url>
-     </mirror>
-   </mirrors>
-
-<profiles>
-    <profile>
-      <id>milestone</id>
-      <activation><activeByDefault>false</activeByDefault></activation>
-      <repositories>
-        <repository>
-          <id>milestone</id>
-          <name>Milestone releases</name>
-          <url>http://maven.eclipse.org/milestone</url>
-          <snapshots><enabled>false</enabled></snapshots>
-        </repository>
-      </repositories>  
-    </profile>
-    <profile>
-      <id>integration</id>
-      <activation><activeByDefault>false</activeByDefault></activation>
-      <repositories>
-        <repository>
-          <id>integration</id>
-          <name>Integration releases</name>
-          <url>http://maven.eclipse.org/integration</url>
-          <snapshots><enabled>true</enabled></snapshots>
-        </repository>
-      </repositories>  
-    </profile>
-    <profile>
-      <id>nightly</id>
-      <activation><activeByDefault>false</activeByDefault></activation>
-      <repositories>
-        <repository>
-          <id>nightly</id>
-          <name>Nightly releases</name>
-          <url>http://maven.eclipse.org/nightly</url>
-          <snapshots><enabled>true</enabled></snapshots>
-        </repository>
-      </repositories>  
-    </profile>
-  </profiles>
-
-  <activeProfiles>
-      <activeProfile>milestone</activeProfile>
-      <activeProfile>nightly</activeProfile>
-  </activeProfiles>
-
-</settings>