[RELEASE][PREPARATION] correction because it not need the profiles

Signed-off-by: bertty <[email protected]>
apache · Oct 12, 2021 · 6b7b96d · 6b7b96d
1 parent c4ad143
commit 6b7b96d
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -86,8 +86,8 @@ before_script:
 #  - chmod +x ./docs/script/cibuild
 script:
   #- jdk_switcher use openjdk8
-  - mvn clean install -Pdistro,scala-11 "${mvn_opts[@]}" &> result.log
-  - mvn clean install -Pdistro,scala-12 "${mvn_opts[@]}" &>> result.log
+  #- mvn clean install -Pdistro,scala-11 "${mvn_opts[@]}" &> result.log
+  - mvn clean install "${mvn_opts[@]}" &>> result.log
   #- mvn clean install -Pdistro,scala-13 "${mvn_opts[@]}" &>> result.log # This is not working for now because of Spark and Flink not supporting Scala 2.13
   - cat /home/travis/build/apache/incubator-wayang/target/rat.txt || echo "file doesn't exist"
   - tail -n 2000 result.log

diff --git a/README.md b/README.md
@@ -60,16 +60,16 @@ If you need to rebuild Wayang, e.g., to use a different Scala version, you can s
 1. Adapt the version variables (e.g., `spark.version`) in the main `pom.xml` file.
 2. Build Wayang with the adapted versions.
     ```shell
-    $ mvn clean install -Pscala-{11,12}
+    $ mvn clean install
     ```
-> **NOTE:** In current maven setup the version of scala are tie to the Java version, you can compile the profile `scala-11` with Java 8 and profile `scala-12` with Java 11 
+> **NOTE:** In current maven setup the version of scala are tie to the Java version, you can compile the profile `scala-11` with Java 8 and profile `scala-12` with Java 11
 
-> **NOTE:** For compiling the code and testing the code it required to have installed hadoop in your machine 
+> **NOTE:** For compiling the code and testing the code it required to have installed hadoop in your machine
 
 > **NOTE:**  the `standalone` profile to fix Hadoop and Spark versions, so that Wayang apps do not explicitly need to declare the corresponding dependencies.
-> 
+>
 > Also, note the `distro` profile, which assembles a binary Wayang distribution.
-    To activate these profiles, you need to specify them when running maven, i.e.,
+To activate these profiles, you need to specify them when running maven, i.e.,
 
 ```shell
 mvn clean install -P<profile name>

diff --git a/build.md b/build.md
@@ -21,7 +21,7 @@
 Apache Wayang has different dependencies, for compiling, it needs to add some profile in the compilation to enable maven works properly.
 
  ```shell
-mvn clean compile -P scala-11
+mvn clean compile 
 ```
 
 The line before is because the plugin the Antlr is not needed in all the modules, as well it has happened with Scala language.

diff --git a/jenkins.pom b/jenkins.pom
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>22</version>
+        <version>24</version>
     </parent>
 
     <groupId>org.apache.wayang</groupId>

diff --git a/pom.xml b/pom.xml
@@ -858,6 +858,46 @@
                 <additionalparam>-Xdoclint:none</additionalparam>
             </properties>
         </profile>
+
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <finalName>apache-${project.artifactId}-${project.version}-incubating</finalName>
+                <resources>
+                    <resource>
+                        <directory>${project.basedir}</directory>
+                        <includes>
+                            <include>DISCLAIMER</include>
+                            <include>LICENSE</include>
+                            <include>NOTICE</include>
+                            <include>RELEASE_NOTES</include>
+                            <include>README.md</include>
+                        </includes>
+                    </resource>
+                </resources>
+                <plugins>
+                    <!-- Create a source-release artifact that contains the fully buildable
+                         project directory source structure. This is the artifact which is
+                         the official subject of any release vote. -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>source-release-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <finalName>apache-${project.artifactId}-${project.version}-incubating</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <dependencyManagement>