Skip to content

Commit

Permalink
Preparing development version 0.8.1-incubating-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
dacort committed Sep 22, 2023
1 parent 78b5126 commit 7ef7c2d
Show file tree
Hide file tree
Showing 30 changed files with 74 additions and 111 deletions.
4 changes: 2 additions & 2 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
</parent>

<groupId>org.apache.livy</groupId>
<artifactId>livy-api</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>livy-assembly</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions client-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
</parent>

<groupId>org.apache.livy</groupId>
<artifactId>livy-client-common</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions client-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
</parent>

<groupId>org.apache.livy</groupId>
<artifactId>livy-client-http</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
8 changes: 3 additions & 5 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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">
<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>
<groupId>org.apache.livy</groupId>
<artifactId>multi-scala-project-root</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<relativePath>../scala/pom.xml</relativePath>
</parent>

<artifactId>livy-core-parent</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions core/scala-2.11/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.livy</groupId>
<artifactId>livy-core_2.11</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-core-parent</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions core/scala-2.12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.livy</groupId>
<artifactId>livy-core_2.12</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-core-parent</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
8 changes: 3 additions & 5 deletions coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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">
<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>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<relativePath>../pom.xml</relativePath>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
</parent>

<artifactId>livy-coverage-report</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Following steps use Ubuntu as development environment but most of the instructio
$ mvn clean package -Pscala-2.12 -Pspark3 -DskipITs -DskipTests
```

This generates a zip file for livy similar to `assembly/target/apache-livy-0.8.0-incubating_2.12-bin.zip`. It's useful to use the `clean` target to avoid mixing with previously built dependencies/versions.
This generates a zip file for livy similar to `assembly/target/apache-livy-0.8.1-incubating-SNAPSHOT_2.12-bin.zip`. It's useful to use the `clean` target to avoid mixing with previously built dependencies/versions.

### Build container images locally
* Build livy-dev-base, livy-dev-spark, livy-dev-server container images using provided script `build-images.sh`
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ HIVE_PACKAGE="apache-hive-${HIVE_VERSION}-bin.tar.gz"
SPARK_VERSION=3.2.3
SPARK_PACKAGE="spark-${SPARK_VERSION}-bin-without-hadoop.tgz"
SCALA_VERSION=2.12
LIVY_VERSION="0.8.0-incubating_${SCALA_VERSION}"
LIVY_VERSION="0.8.1-incubating-SNAPSHOT_${SCALA_VERSION}"
LIVY_PACKAGE="apache-livy-${LIVY_VERSION}-bin.zip"
LOCALLY_BUILT_LIVY_PACKAGE="${SCRIPT_DIR}/../../assembly/target/${LIVY_PACKAGE}"

Expand Down
2 changes: 1 addition & 1 deletion dev/docker/livy-dev-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

FROM livy-dev-spark:latest

ARG LIVY_VERSION=0.8.0-incubating
ARG LIVY_VERSION=0.8.1-incubating-SNAPSHOT
ARG ROOT_PATH=/opt

RUN apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion docs/_data/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
# Apache Project configurations
#
name: Apache Livy
version: 0.8.0-incubating
version: 0.8.1-incubating-SNAPSHOT

podling: true
8 changes: 3 additions & 5 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,19 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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">
<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>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.livy</groupId>
<artifactId>livy-examples</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
8 changes: 3 additions & 5 deletions integration-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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">
<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>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<relativePath>../pom.xml</relativePath>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
</parent>

<artifactId>livy-integration-test</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
25 changes: 8 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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">
<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>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Livy Project Parent POM</name>
<description>Livy Project</description>
Expand Down Expand Up @@ -1104,19 +1102,12 @@
</goals>
<configuration>
<target>
<echo message="execRoot: ${execution.root}, buildDir: ${project.build.directory}"/>
<copy file="${execution.root}/scalastyle.xml"
tofile="${project.build.directory}/scalastyle.xml" />
<replace file="${project.build.directory}/scalastyle.xml"
token="{{COPYRIGHT_HEADER}}"
value="${copyright.header}" />
<copy file="${execution.root}/checkstyle.xml"
tofile="${project.build.directory}/checkstyle.xml" />
<echo file="${project.build.directory}/checkstyle.header"
message="${copyright.header}" />
<replace file="${project.build.directory}/checkstyle.xml"
token="{{HEADER_FILE}}"
value="${project.build.directory}/checkstyle.header" />
<echo message="execRoot: ${execution.root}, buildDir: ${project.build.directory}" />
<copy file="${execution.root}/scalastyle.xml" tofile="${project.build.directory}/scalastyle.xml" />
<replace file="${project.build.directory}/scalastyle.xml" token="{{COPYRIGHT_HEADER}}" value="${copyright.header}" />
<copy file="${execution.root}/checkstyle.xml" tofile="${project.build.directory}/checkstyle.xml" />
<echo file="${project.build.directory}/checkstyle.header" message="${copyright.header}" />
<replace file="${project.build.directory}/checkstyle.xml" token="{{HEADER_FILE}}" value="${project.build.directory}/checkstyle.header" />
</target>
</configuration>
</execution>
Expand Down
8 changes: 3 additions & 5 deletions python-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,19 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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">
<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>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.livy</groupId>
<artifactId>livy-python-api</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion python-api/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

setup(
name='livy-python-api',
version="0.8.0-incubating",
version="0.8.1-incubating-SNAPSHOT",
packages=["livy", "livy-tests"],
package_dir={
"": "src/main/python",
Expand Down
8 changes: 3 additions & 5 deletions repl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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">
<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>
<groupId>org.apache.livy</groupId>
<artifactId>multi-scala-project-root</artifactId>
<relativePath>../scala/pom.xml</relativePath>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
</parent>

<artifactId>livy-repl-parent</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<dependencies>
Expand Down
8 changes: 3 additions & 5 deletions repl/scala-2.11/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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">
<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>org.apache.livy</groupId>
<artifactId>livy-repl_2.11</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-repl-parent</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
8 changes: 3 additions & 5 deletions repl/scala-2.12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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">
<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>org.apache.livy</groupId>
<artifactId>livy-repl_2.12</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-repl-parent</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion rsc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
8 changes: 3 additions & 5 deletions scala-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,18 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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">
<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>
<groupId>org.apache.livy</groupId>
<artifactId>multi-scala-project-root</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<relativePath>../scala/pom.xml</relativePath>
</parent>

<artifactId>livy-scala-api-parent</artifactId>
<version>0.8.0-incubating</version>
<version>0.8.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<dependencies>
Expand Down
Loading

0 comments on commit 7ef7c2d

Please sign in to comment.