apex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [26/50] [abbrv] incubator-apex-core git commit: APEX-190 Replace Maven group and artifact ID, configure ASF repositories, use apache-release profile.
Date Tue, 03 Nov 2015 02:27:27 GMT
APEX-190 Replace Maven group and artifact ID, configure ASF repositories, use apache-release
profile.


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/51ce8f95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/51ce8f95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/51ce8f95

Branch: refs/heads/master
Commit: 51ce8f95d784a07d183cc54f32033c5115f72023
Parents: 4007ec5
Author: Thomas Weise <thomas@datatorrent.com>
Authored: Tue Oct 13 17:15:27 2015 -0700
Committer: Thomas Weise <thomas@datatorrent.com>
Committed: Tue Oct 13 17:15:27 2015 -0700

----------------------------------------------------------------------
 apex-app-archetype/README.md                    |  2 +-
 apex-app-archetype/pom.xml                      |  8 +--
 .../main/resources/archetype-resources/pom.xml  | 25 ++++---
 apex-conf-archetype/README.md                   |  2 +-
 apex-conf-archetype/pom.xml                     |  8 +--
 api/pom.xml                                     | 12 ++--
 bufferserver/pom.xml                            | 14 ++--
 common/pom.xml                                  | 12 ++--
 engine/pom.xml                                  | 12 ++--
 engine/src/main/scripts/dtcli                   |  2 +-
 .../stram/client/AppPackageTest.java            |  2 +-
 .../resources/testAppPackage/mydtapp/pom.xml    |  6 +-
 pom.xml                                         | 73 ++++++--------------
 13 files changed, 77 insertions(+), 101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/apex-app-archetype/README.md
----------------------------------------------------------------------
diff --git a/apex-app-archetype/README.md b/apex-app-archetype/README.md
index 775f026..3ca588f 100644
--- a/apex-app-archetype/README.md
+++ b/apex-app-archetype/README.md
@@ -6,7 +6,7 @@ How to Generate an Apex Application Project Template
 
 Run the following command
 
-    mvn archetype:generate -DarchetypeGroupId=com.datatorrent -DarchetypeArtifactId=apex-app-archetype
-DarchetypeVersion=3.0.0 -DgroupId=com.example -Dpackage=com.example.myapexapp -DartifactId=myapexapp
-Dversion=1.0-SNAPSHOT
+    mvn archetype:generate -DarchetypeGroupId=org.apache.apex -DarchetypeArtifactId=apex-app-archetype
-DarchetypeVersion=3.2.0-incubating-SNAPSHOT -DgroupId=com.example -Dpackage=com.example.myapexapp
-DartifactId=myapexapp -Dversion=1.0-SNAPSHOT
 
 Using your favorite IDE, open the project that has just been created by the above command.
 Write your application code and optionally operator code 

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/apex-app-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/apex-app-archetype/pom.xml b/apex-app-archetype/pom.xml
index 7c9f332..f88dabf 100644
--- a/apex-app-archetype/pom.xml
+++ b/apex-app-archetype/pom.xml
@@ -23,15 +23,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.datatorrent</groupId>
-    <artifactId>dt-framework</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <groupId>org.apache.apex</groupId>
+    <artifactId>apex</artifactId>
+    <version>3.2.0-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>apex-app-archetype</artifactId>
   <packaging>maven-archetype</packaging>
 
-  <name>Apex Application Maven archetype</name>
+  <name>Apache Apex Application Maven Archetype</name>
 
   <build>
     <extensions>

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/apex-app-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/apex-app-archetype/src/main/resources/archetype-resources/pom.xml b/apex-app-archetype/src/main/resources/archetype-resources/pom.xml
index 33d1d1b..d3d0353 100644
--- a/apex-app-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/apex-app-archetype/src/main/resources/archetype-resources/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <!-- change this if you desire to use a different version of DataTorrent -->
-    <datatorrent.version>${archetypeVersion}</datatorrent.version>
+    <apex.version>${archetypeVersion}</apex.version>
     <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
   </properties>
 
@@ -99,7 +99,7 @@
                <archive>
                  <manifestEntries>
                    <Class-Path>${datatorrent.apppackage.classpath}</Class-Path>
-                   <DT-Engine-Version>${datatorrent.version}</DT-Engine-Version>
+                   <DT-Engine-Version>${apex.version}</DT-Engine-Version>
                    <DT-App-Package-Name>${project.artifactId}</DT-App-Package-Name>
                    <DT-App-Package-Version>${project.version}</DT-App-Package-Version>
                    <DT-App-Package-Display-Name>${project.name}</DT-App-Package-Display-Name>
@@ -256,7 +256,14 @@
     <dependency>
       <groupId>com.datatorrent</groupId>
       <artifactId>malhar-library</artifactId>
-      <version>${datatorrent.version}</version>
+      <version>3.1.1</version>
+      <!-- remove when switching to malhar version that depends on apex-common as shown
below -->
+      <exclusions>
+        <exclusion>
+          <groupId>com.datatorrent</groupId>
+          <artifactId>dt-common</artifactId>
+        </exclusion>
+      </exclusions>
       <!-- 
            If you know that your application does not need transitive dependencies pulled
in by malhar-library,
            uncomment the following to reduce the size of your app package.
@@ -271,9 +278,9 @@
       -->
     </dependency>
     <dependency>
-      <groupId>com.datatorrent</groupId>
-      <artifactId>dt-common</artifactId>
-      <version>${datatorrent.version}</version>
+      <groupId>org.apache.apex</groupId>
+      <artifactId>apex-common</artifactId>
+      <version>${apex.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -283,9 +290,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.datatorrent</groupId>
-      <artifactId>dt-engine</artifactId>
-      <version>${datatorrent.version}</version>
+      <groupId>org.apache.apex</groupId>
+      <artifactId>apex-engine</artifactId>
+      <version>${apex.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/apex-conf-archetype/README.md
----------------------------------------------------------------------
diff --git a/apex-conf-archetype/README.md b/apex-conf-archetype/README.md
index d54876c..2bcd18a 100644
--- a/apex-conf-archetype/README.md
+++ b/apex-conf-archetype/README.md
@@ -6,7 +6,7 @@ How to Generate a Apex App Configuration Project Template
 
 Run the following command
 
-    mvn archetype:generate -DarchetypeGroupId=com.datatorrent -DarchetypeArtifactId=apex-conf-archetype
-DarchetypeVersion=3.0.0 -DgroupId=com.example -Dpackage=com.example.myapexapp -DartifactId=myapexconf
-Dversion=1.0-SNAPSHOT
+    mvn archetype:generate -DarchetypeGroupId=org.apache.apex -DarchetypeArtifactId=apex-conf-archetype
-DarchetypeVersion=3.2.0-incubating-SNAPSHOT -DgroupId=com.example -Dpackage=com.example.myapexapp
-DartifactId=myapexconf -Dversion=1.0-SNAPSHOT
 
 Using your favorite IDE, open the project that has just been created by the above command.
 Write your application code and optionally operator code 

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/apex-conf-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/apex-conf-archetype/pom.xml b/apex-conf-archetype/pom.xml
index e5b4d3e..7caf93f 100644
--- a/apex-conf-archetype/pom.xml
+++ b/apex-conf-archetype/pom.xml
@@ -23,15 +23,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.datatorrent</groupId>
-    <artifactId>dt-framework</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <groupId>org.apache.apex</groupId>
+    <artifactId>apex</artifactId>
+    <version>3.2.0-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>apex-conf-archetype</artifactId>
   <packaging>maven-archetype</packaging>
 
-  <name>Apex App Configuration Maven archetype</name>
+  <name>Apache Apex App Configuration Maven Archetype</name>
 
   <build>
     <extensions>

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 8c330dc..a44d8a6 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -24,13 +24,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.datatorrent</groupId>
-    <artifactId>dt-framework</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <groupId>org.apache.apex</groupId>
+    <artifactId>apex</artifactId>
+    <version>3.2.0-incubating-SNAPSHOT</version>
   </parent>
 
-  <artifactId>dt-api</artifactId>
-  <name>DataTorrent API</name>
+  <artifactId>apex-api</artifactId>
+  <name>Apache Apex API</name>
   <packaging>jar</packaging>
 
   <repositories>
@@ -139,7 +139,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>com.datatorrent</groupId>
       <artifactId>netlet</artifactId>
       <version>1.2.0</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/bufferserver/pom.xml
----------------------------------------------------------------------
diff --git a/bufferserver/pom.xml b/bufferserver/pom.xml
index 6317470..1346ba7 100644
--- a/bufferserver/pom.xml
+++ b/bufferserver/pom.xml
@@ -23,15 +23,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.datatorrent</groupId>
-    <artifactId>dt-framework</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <groupId>org.apache.apex</groupId>
+    <artifactId>apex</artifactId>
+    <version>3.2.0-incubating-SNAPSHOT</version>
   </parent>
 
-  <artifactId>dt-bufferserver</artifactId>
+  <artifactId>apex-bufferserver</artifactId>
   <description>Interface for nodes from 2 different containers to talk to each other.</description>
 
-  <name>Buffer Server</name>
+  <name>Apache Apex Buffer Server</name>
 
   <build>
     <plugins>
@@ -65,8 +65,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.datatorrent</groupId>
-      <artifactId>dt-common</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apex-common</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 520d09a..6ee0305 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -23,13 +23,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.datatorrent</groupId>
-    <artifactId>dt-framework</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <groupId>org.apache.apex</groupId>
+    <artifactId>apex</artifactId>
+    <version>3.2.0-incubating-SNAPSHOT</version>
   </parent>
 
-  <artifactId>dt-common</artifactId>
-  <name>Base Library</name>
+  <artifactId>apex-common</artifactId>
+  <name>Apache Apex Common Library</name>
   <packaging>jar</packaging>
 
   <build>
@@ -83,7 +83,7 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>dt-api</artifactId>
+      <artifactId>apex-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index 3efd33f..5d30a8e 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -23,15 +23,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.datatorrent</groupId>
-    <artifactId>dt-framework</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <groupId>org.apache.apex</groupId>
+    <artifactId>apex</artifactId>
+    <version>3.2.0-incubating-SNAPSHOT</version>
   </parent>
 
-  <artifactId>dt-engine</artifactId>
+  <artifactId>apex-engine</artifactId>
   <packaging>jar</packaging>
 
-  <name>Streaming Application Manager</name>
+  <name>Apache Apex Stream Processing Engine</name>
 
   <build>
     <finalName>${project.artifactId}</finalName>
@@ -165,7 +165,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>dt-bufferserver</artifactId>
+      <artifactId>apex-bufferserver</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/engine/src/main/scripts/dtcli
----------------------------------------------------------------------
diff --git a/engine/src/main/scripts/dtcli b/engine/src/main/scripts/dtcli
index d7f9d76..e254215 100755
--- a/engine/src/main/scripts/dtcli
+++ b/engine/src/main/scripts/dtcli
@@ -67,7 +67,7 @@ fi
 
 if [ -f "$MVN_GENERATED_PATH" ]; then
   # development launch mode
-  DT_CORE_JAR="$BUILD_DIR/dt-engine.jar"
+  DT_CORE_JAR="$BUILD_DIR/apex-engine.jar"
   if [ ! -f "$DT_CORE_JAR" ]; then
     echoerr "Error: Cannot find $DT_CORE_JAR";
     exit 1;

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/engine/src/test/java/com/datatorrent/stram/client/AppPackageTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/client/AppPackageTest.java b/engine/src/test/java/com/datatorrent/stram/client/AppPackageTest.java
index 1224115..8fb4b1b 100644
--- a/engine/src/test/java/com/datatorrent/stram/client/AppPackageTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/client/AppPackageTest.java
@@ -84,7 +84,7 @@ public class AppPackageTest
   {
     Assert.assertEquals("mydtapp", json.getString("appPackageName"));
     Assert.assertEquals("1.0-SNAPSHOT", json.getString("appPackageVersion"));
-    Assert.assertEquals("3.0.0", json.getString("dtEngineVersion"));
+    Assert.assertEquals("3.2.0-incubating-SNAPSHOT", json.getString("dtEngineVersion"));
     Assert.assertEquals("lib/*.jar", json.getJSONArray("classPath").getString(0));
 
     JSONObject application = json.getJSONArray("applications").getJSONObject(0);

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/engine/src/test/resources/testAppPackage/mydtapp/pom.xml
----------------------------------------------------------------------
diff --git a/engine/src/test/resources/testAppPackage/mydtapp/pom.xml b/engine/src/test/resources/testAppPackage/mydtapp/pom.xml
index abbca75..3b1e799 100644
--- a/engine/src/test/resources/testAppPackage/mydtapp/pom.xml
+++ b/engine/src/test/resources/testAppPackage/mydtapp/pom.xml
@@ -33,7 +33,7 @@
 
   <properties>
     <!-- change this if you desire to use a different version of DataTorrent -->
-    <datatorrent.version>3.0.0</datatorrent.version>
+    <datatorrent.version>3.2.0-incubating-SNAPSHOT</datatorrent.version>
     <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
   </properties>
 
@@ -184,8 +184,8 @@
   <dependencies>
     <!-- add your dependencies here -->
     <dependency>
-      <groupId>com.datatorrent</groupId>
-      <artifactId>dt-common</artifactId>
+      <groupId>org.apache.apex</groupId>
+      <artifactId>apex-common</artifactId>
       <version>${datatorrent.version}</version>
       <scope>provided</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/51ce8f95/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2c14ce8..a7ccc90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,9 +22,15 @@
 <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>
 
-  <groupId>com.datatorrent</groupId>
-  <artifactId>dt-framework</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>16</version>
+  </parent>
+
+  <groupId>org.apache.apex</groupId>
+  <artifactId>apex</artifactId>
+  <version>3.2.0-incubating-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Apex Core</name>
@@ -43,6 +49,7 @@
   </licenses>
 
   <repositories>
+    <!-- added for semantic versioning check, won't be needed once we publish to central
-->
     <repository>
       <snapshots>
         <enabled>false</enabled>
@@ -63,7 +70,7 @@
     <jersey.version>1.9</jersey.version>
     <!-- do not change jetty version as later versions have problems with DefaultServlet
-->
     <jetty.version>8.1.10.v20130312</jetty.version>
-    <maven.deploy.repo.classifier></maven.deploy.repo.classifier>
+    <maven.deploy.repo.classifier/>
     <license.skip>true</license.skip>
     <checkstyle.console>false</checkstyle.console>
   </properties>
@@ -340,30 +347,29 @@
   </build>
   <profiles>
     <profile>
-      <id>release</id>
+      <id>apache-release</id>
       <modules>
       </modules>
       <properties>
         <maven.compiler.debug>false</maven.compiler.debug>
         <maven.compiler.optimize>true</maven.compiler.optimize>
         <maven.deploy.skip>false</maven.deploy.skip>
-        <!-- always generate on release build -->
-        <generate-revision-info-phase>generate-resources</generate-revision-info-phase>
-        <distMgmtDevUrl>internal.repo::default::file://${project.build.directory}/mvn-repo</distMgmtDevUrl>
-        <distMgmtUrl>dav:http://www.datatorrent.com:8081/nexus/content/repositories</distMgmtUrl>
+        <distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>
+        <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+        <distMgmtReleaseId>apache.staging.https</distMgmtReleaseId>
+        <distMgmtReleaseUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtReleaseUrl>
+        <distMgmtDevUrl>file://${project.build.directory}/mvn-repo</distMgmtDevUrl>
         <package.prefix>/opt/datatorrent</package.prefix>
         <package.groupname>dtorrent</package.groupname>
       </properties>
       <distributionManagement>
         <repository>
-          <id>releases</id>
-          <name>DataTorrent Repository</name>
-          <url>${distMgmtUrl}/${maven.deploy.repo.classifier}releases/</url>
+          <id>${distMgmtReleaseId}</id>
+          <url>${distMgmtReleaseUrl}</url>
         </repository>
         <snapshotRepository>
-          <id>snapshots</id>
-          <name>DataTorrent Snapshots</name>
-          <url>${distMgmtUrl}/${maven.deploy.repo.classifier}snapshots/</url>
+          <id>${distMgmtSnapshotsId}</id>
+          <url>${distMgmtSnapshotsUrl}</url>
         </snapshotRepository>
       </distributionManagement>
       <build>
@@ -381,43 +387,6 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-site-plugin</artifactId>
-            <version>3.2</version>
-          </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <version>2.7</version>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <!-- build javadoc jars per jar for publishing to maven -->
-                <id>module-javadocs</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-                <configuration>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>


Mime
View raw message