From 8602ed93733f0e4defa9bfe976c4fd0f0b958773 Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Mon, 10 Jul 2023 16:40:36 +0200
Subject: [PATCH] Renames "js" and "ts" languages to "javascript"

See:
* https://github.com/green-code-initiative/ecoCode-javascript/pull/14#discussion_r1257548418
* https://github.com/green-code-initiative/ecoCode-javascript/pull/14#discussion_r1257564032
---
 ecocode-rules-specifications/pom.xml           | 16 ++--------------
 .../main/assembly/{js.xml => javascript.xml}   |  4 ++--
 .../src/main/assembly/ts.xml                   | 18 ------------------
 .../EC11/{js => javascript}/EC11.asciidoc      |  0
 .../EC12/{js => javascript}/EC12.asciidoc      |  0
 .../EC13/{ts => javascript}/EC13.asciidoc      |  0
 .../rules/EC8/{js => javascript}/EC8.asciidoc  |  0
 .../rules/EC9/{js => javascript}/EC9.asciidoc  |  0
 8 files changed, 4 insertions(+), 34 deletions(-)
 rename ecocode-rules-specifications/src/main/assembly/{js.xml => javascript.xml} (87%)
 delete mode 100644 ecocode-rules-specifications/src/main/assembly/ts.xml
 rename ecocode-rules-specifications/src/main/rules/EC11/{js => javascript}/EC11.asciidoc (100%)
 rename ecocode-rules-specifications/src/main/rules/EC12/{js => javascript}/EC12.asciidoc (100%)
 rename ecocode-rules-specifications/src/main/rules/EC13/{ts => javascript}/EC13.asciidoc (100%)
 rename ecocode-rules-specifications/src/main/rules/EC8/{js => javascript}/EC8.asciidoc (100%)
 rename ecocode-rules-specifications/src/main/rules/EC9/{js => javascript}/EC9.asciidoc (100%)

diff --git a/ecocode-rules-specifications/pom.xml b/ecocode-rules-specifications/pom.xml
index d1857eb63..18d229400 100644
--- a/ecocode-rules-specifications/pom.xml
+++ b/ecocode-rules-specifications/pom.xml
@@ -178,26 +178,14 @@
 						</configuration>
 					</execution>
 					<execution>
-						<id>assembly-js</id>
+						<id>assembly-javascript</id>
 						<phase>prepare-package</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>
 						<configuration>
 							<descriptors>
-								<descriptor>${project.basedir}/src/main/assembly/js.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-					<execution>
-						<id>assembly-ts</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/main/assembly/ts.xml</descriptor>
+								<descriptor>${project.basedir}/src/main/assembly/javascript.xml</descriptor>
 							</descriptors>
 						</configuration>
 					</execution>
diff --git a/ecocode-rules-specifications/src/main/assembly/js.xml b/ecocode-rules-specifications/src/main/assembly/javascript.xml
similarity index 87%
rename from ecocode-rules-specifications/src/main/assembly/js.xml
rename to ecocode-rules-specifications/src/main/assembly/javascript.xml
index d5d72ca1e..9b7dbd84d 100644
--- a/ecocode-rules-specifications/src/main/assembly/js.xml
+++ b/ecocode-rules-specifications/src/main/assembly/javascript.xml
@@ -1,7 +1,7 @@
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 https://maven.apache.org/xsd/assembly-2.1.1.xsd">
-	<id>js</id>
+	<id>javascript</id>
 	<formats>
 		<format>jar</format>
 	</formats>
@@ -10,7 +10,7 @@
 		<fileSet>
 			<directory>${project.build.outputDirectory}</directory>
 			<includes>
-				<include>io/ecocode/rules/js/*.*</include>
+				<include>io/ecocode/rules/javascript/*.*</include>
 			</includes>
 			<outputDirectory/>
 		</fileSet>
diff --git a/ecocode-rules-specifications/src/main/assembly/ts.xml b/ecocode-rules-specifications/src/main/assembly/ts.xml
deleted file mode 100644
index ec0100661..000000000
--- a/ecocode-rules-specifications/src/main/assembly/ts.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 https://maven.apache.org/xsd/assembly-2.1.1.xsd">
-	<id>ts</id>
-	<formats>
-		<format>jar</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${project.build.outputDirectory}</directory>
-			<includes>
-				<include>io/ecocode/rules/ts/*.*</include>
-			</includes>
-			<outputDirectory/>
-		</fileSet>
-	</fileSets>
-</assembly>
diff --git a/ecocode-rules-specifications/src/main/rules/EC11/js/EC11.asciidoc b/ecocode-rules-specifications/src/main/rules/EC11/javascript/EC11.asciidoc
similarity index 100%
rename from ecocode-rules-specifications/src/main/rules/EC11/js/EC11.asciidoc
rename to ecocode-rules-specifications/src/main/rules/EC11/javascript/EC11.asciidoc
diff --git a/ecocode-rules-specifications/src/main/rules/EC12/js/EC12.asciidoc b/ecocode-rules-specifications/src/main/rules/EC12/javascript/EC12.asciidoc
similarity index 100%
rename from ecocode-rules-specifications/src/main/rules/EC12/js/EC12.asciidoc
rename to ecocode-rules-specifications/src/main/rules/EC12/javascript/EC12.asciidoc
diff --git a/ecocode-rules-specifications/src/main/rules/EC13/ts/EC13.asciidoc b/ecocode-rules-specifications/src/main/rules/EC13/javascript/EC13.asciidoc
similarity index 100%
rename from ecocode-rules-specifications/src/main/rules/EC13/ts/EC13.asciidoc
rename to ecocode-rules-specifications/src/main/rules/EC13/javascript/EC13.asciidoc
diff --git a/ecocode-rules-specifications/src/main/rules/EC8/js/EC8.asciidoc b/ecocode-rules-specifications/src/main/rules/EC8/javascript/EC8.asciidoc
similarity index 100%
rename from ecocode-rules-specifications/src/main/rules/EC8/js/EC8.asciidoc
rename to ecocode-rules-specifications/src/main/rules/EC8/javascript/EC8.asciidoc
diff --git a/ecocode-rules-specifications/src/main/rules/EC9/js/EC9.asciidoc b/ecocode-rules-specifications/src/main/rules/EC9/javascript/EC9.asciidoc
similarity index 100%
rename from ecocode-rules-specifications/src/main/rules/EC9/js/EC9.asciidoc
rename to ecocode-rules-specifications/src/main/rules/EC9/javascript/EC9.asciidoc