Skip to content

Commit

Permalink
[#72] Update poms from Zcode to Zscript
Browse files Browse the repository at this point in the history
  • Loading branch information
@susanw1
susanw1 committed Jul 28, 2023
1 parent 9afdaac commit 5dee832
Show file tree
Hide file tree
Showing 27 changed files with 96 additions and 96 deletions.
6 changes: 3 additions & 3 deletions acceptance-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<artifactId>zcode-all</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-all</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>acceptance-tests</artifactId>
<name>Zcode Acceptance Tests</name>
<name>Zscript Acceptance Tests</name>

<dependencies>
<dependency>
Expand Down
10 changes: 5 additions & 5 deletions clients/java-client-lib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<artifactId>zcode-clients</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-clients</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>zcode-java-client</artifactId>
<artifactId>zscript-java-client</artifactId>
<name>Java Client</name>

<dependencies>
<dependency>
<groupId>org.zcode</groupId>
<artifactId>zcode-model</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions clients/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<artifactId>zcode-all</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-all</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>zcode-clients</artifactId>
<name>Zcode Clients</name>
<artifactId>zscript-clients</artifactId>
<name>Zscript Clients</name>
<packaging>pom</packaging>

<modules>
Expand Down
8 changes: 4 additions & 4 deletions model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<artifactId>zcode-all</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-all</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>zcode-model</artifactId>
<name>Zcode Model</name>
<artifactId>zscript-model</artifactId>
<name>Zscript Model</name>

<properties>
</properties>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
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.zcode</groupId>
<artifactId>zcode-all</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-all</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Zcode</name>
<name>Zscript</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -212,15 +212,15 @@
<inceptionYear>2019</inceptionYear>

<organization>
<name>Zcode Team</name>
<name>Zscript Team</name>
<url>https://groups.google.com/g/zcode-group</url>
</organization>

<licenses>
<license>
<name>MIT</name>
<url>https://opensource.org/licenses/MIT</url>
<comments>Zcode itself, except for implementation components where
<comments>Zscript itself, except for implementation components where
specifically indicated</comments>
</license>
</licenses>
Expand All @@ -232,13 +232,13 @@
<url>https://www.linkedin.com/in/susan-witts/</url>
<timezone>Europe/London</timezone>
<email>[email protected]</email>
<organization>Zcode Team</organization>
<organization>Zscript Team</organization>
</developer>
<developer>
<name>More-Wrong</name>
<url>https://github.com/More-Wrong/</url>
<timezone>Europe/London</timezone>
<organization>Zcode Team</organization>
<organization>Zscript Team</organization>
</developer>
</developers>

Expand Down
10 changes: 5 additions & 5 deletions receivers/jvm/java-receiver-acceptance-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<artifactId>zcode-receivers-jvm</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-receivers-jvm</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>java-receiver-acceptance-tests</artifactId>
<name>Zcode Acceptance Tests for Java</name>
<name>Zscript Acceptance Tests for Java</name>

<dependencies>
<dependency>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>acceptance-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>java-receiver</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions receivers/jvm/java-receiver-token/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<artifactId>zcode-receivers-jvm</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-receivers-jvm</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>java-receiver-token</artifactId>
<name>Zcode Receiver Using Token Buffer in Java</name>
<name>Zscript Receiver Using Token Buffer in Java</name>

<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions receivers/jvm/java-receiver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<artifactId>zcode-receivers-jvm</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-receivers-jvm</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>java-receiver</artifactId>
<name>Zcode Receiver in Java</name>
<name>Zscript Receiver in Java</name>

<dependencies>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions receivers/jvm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<artifactId>zcode-receivers</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-receivers</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>zcode-receivers-jvm</artifactId>
<artifactId>zscript-receivers-jvm</artifactId>
<packaging>pom</packaging>
<name>Zcode JVM Receiver</name>
<name>Zscript JVM Receiver</name>

<properties></properties>

Expand Down
4 changes: 2 additions & 2 deletions receivers/language-definition/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.zcode</groupId>
<artifactId>zcode-receivers</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-receivers</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

Expand Down
12 changes: 6 additions & 6 deletions receivers/native/arduino/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<artifactId>zcode-receivers-native</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-receivers-native</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>zcode-receivers-arduino</artifactId>
<artifactId>zscript-receivers-arduino</artifactId>
<packaging>nar</packaging>
<name>Zcode Arduino Receiver</name>
<name>Zscript Arduino Receiver</name>

<properties>
<generic-core-version>${project.version}</generic-core-version>
Expand All @@ -28,7 +28,7 @@

<dependencies>
<dependency>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>generic-receiver-core</artifactId>
<version>${generic-core-version}</version>
<type>nar</type>
Expand Down Expand Up @@ -111,7 +111,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>Zcode</finalName>
<finalName>Zscript</finalName>
<descriptors>
<descriptor>src/assembly/assemble-arduino-lib.xml</descriptor>
</descriptors>
Expand Down
6 changes: 3 additions & 3 deletions receivers/native/arm/no-os/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<artifactId>zcode-receivers-arm</artifactId>
<groupId>net.zscript</groupId>
<artifactId>zscript-receivers-arm</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>arm-no-os</artifactId>
<packaging>pom</packaging>
<name>Zcode ARM Bare Metal (no OS) Receiver</name>
<name>Zscript ARM Bare Metal (no OS) Receiver</name>

<modules>
<module>stm32</module>
Expand Down
6 changes: 3 additions & 3 deletions receivers/native/arm/no-os/stm32/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>arm-no-os</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>arm-no-os-stm32</artifactId>
<packaging>nar</packaging>
<name>Zcode STM32 Bare Metal (no OS) Receiver</name>
<name>Zscript STM32 Bare Metal (no OS) Receiver</name>

<dependencies>
<dependency>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>arm-no-os</artifactId>
<version>${project.version}</version>
<type>pom</type>
Expand Down
6 changes: 3 additions & 3 deletions receivers/native/arm/no-os/stm32f0/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>arm-no-os</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>arm-no-os-stm32f0</artifactId>
<packaging>nar</packaging>
<name>Zcode STM32F0 Bare Metal (no OS) Receiver</name>
<name>Zscript STM32F0 Bare Metal (no OS) Receiver</name>

<dependencies>
<dependency>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>arm-no-os-stm32</artifactId>
<version>${project.version}</version>
<type>nar</type>
Expand Down
10 changes: 5 additions & 5 deletions receivers/native/arm/no-os/stm32f030x8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>arm-no-os</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>arm-no-os-stm32f030x8</artifactId>
<packaging>nar</packaging>
<name>Zcode STM32F030x8 Bare Metal (no OS) Receiver</name>
<name>Zscript STM32F030x8 Bare Metal (no OS) Receiver</name>


<dependencies>
<dependency>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>generic-receiver-core</artifactId>
<version>${project.version}</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>arm-no-os-stm32f0</artifactId>
<version>${project.version}</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>arm-no-os-stm32</artifactId>
<version>${project.version}</version>
<type>nar</type>
Expand Down
6 changes: 3 additions & 3 deletions receivers/native/arm/no-os/stm32g4/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>arm-no-os</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>arm-no-os-stm32g4</artifactId>
<packaging>nar</packaging>
<name>Zcode STM32G4 Bare Metal (no OS) Receiver</name>
<name>Zscript STM32G4 Bare Metal (no OS) Receiver</name>

<dependencies>
<dependency>
<groupId>org.zcode</groupId>
<groupId>net.zscript</groupId>
<artifactId>arm-no-os-stm32</artifactId>
<version>${project.version}</version>
<type>nar</type>
Expand Down
Loading

0 comments on commit 5dee832

Please sign in to comment.