Unverified Commit 866b8c2d authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

updated package names

parent e8e09aa7

.gitlab-ci.yml

+0 −5
Original line number Original line Diff line number Diff line
@@ -3,11 +3,6 @@ image: maven:3.6.2-jdk-8 
build:

build:

  stage: build

  stage: build

  script:

  script:

    - git clone https://github.com/sparql-generate/sparql-generate.git

    - cd sparql-generate

    - cd sparql-generate-parent

    - mvn install -Pskip

    - cd ../..

    - mvn package

    - mvn package

  artifacts:

  artifacts:

    paths:

    paths:

pom.xml

+6 −6
Original line number Original line Diff line number Diff line
@@ -3,9 +3,9 @@ 
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	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">

	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>

	<modelVersion>4.0.0</modelVersion>

	<groupId>fr.emse.gitlab.saref</groupId>

	<groupId>fr.mines-stetienne.ci.saref</groupId>

	<artifactId>saref-pipeline</artifactId>

	<artifactId>saref-pipeline</artifactId>

	<version>1.0-SNAPSHOT</version>

	<version>1.0</version>

	<packaging>jar</packaging>

	<packaging>jar</packaging>





	<name>SAREF-Pipeline</name>

	<name>SAREF-Pipeline</name>
@@ -65,7 +65,7 @@ 
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

		<project.scm.id>git</project.scm.id>

		<project.scm.id>git</project.scm.id>

		<sparql-generate.version>2.0-SNAPSHOT</sparql-generate.version>

		<sparql-generate.version>2.0.0</sparql-generate.version>

	</properties>

	</properties>





	<dependencies>

	<dependencies>
@@ -139,17 +139,17 @@ 
			<version>3.13.0</version>

			<version>3.13.0</version>

		</dependency>

		</dependency>

		<dependency>

		<dependency>

			<groupId>fr.emse.ci</groupId>

			<groupId>fr.mines-stetienne.ci.sparql-generate</groupId>

			<artifactId>sparql-generate-xml</artifactId>

			<artifactId>sparql-generate-xml</artifactId>

			<version>${sparql-generate.version}</version>

			<version>${sparql-generate.version}</version>

		</dependency>

		</dependency>

		<dependency>

		<dependency>

			<groupId>fr.emse.ci</groupId>

			<groupId>fr.mines-stetienne.ci.sparql-generate</groupId>

			<artifactId>sparql-generate-markdown</artifactId>

			<artifactId>sparql-generate-markdown</artifactId>

			<version>${sparql-generate.version}</version>

			<version>${sparql-generate.version}</version>

		</dependency>

		</dependency>

		<dependency>

		<dependency>

			<groupId>fr.emse.ci</groupId>

			<groupId>fr.mines-stetienne.ci.sparql-generate</groupId>

			<artifactId>sparql-generate-jena</artifactId>

			<artifactId>sparql-generate-jena</artifactId>

			<version>${sparql-generate.version}</version>

			<version>${sparql-generate.version}</version>

		</dependency>

		</dependency>

src/main/java/fr/emse/gitlab/saref/CLIExecution.java→src/main/java/fr/mines_stetienne/ci/saref/CLIExecution.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 

 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 */

 */

package fr.emse.gitlab.saref;

package fr.mines_stetienne.ci.saref;





import java.io.Console;

import java.io.Console;

import java.io.File;

import java.io.File;
@@ -40,7 +40,7 @@ import org.apache.commons.io.IOUtils; 
import org.slf4j.Logger;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.slf4j.LoggerFactory;





import fr.emse.gitlab.saref.SAREFPipeline.Mode;

import fr.mines_stetienne.ci.saref.SAREFPipeline.Mode;





/**

/**

 *

 *

src/main/java/fr/emse/gitlab/saref/Main.java→src/main/java/fr/mines_stetienne/ci/saref/Main.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 

 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 */

 */

package fr.emse.gitlab.saref;

package fr.mines_stetienne.ci.saref;





import java.awt.Desktop;

import java.awt.Desktop;

import java.awt.GraphicsEnvironment;

import java.awt.GraphicsEnvironment;
@@ -37,10 +37,10 @@ import org.apache.commons.io.IOUtils; 
import org.slf4j.Logger;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.slf4j.LoggerFactory;





import fr.emse.gitlab.saref.SAREFPipeline.Mode;

import fr.mines_stetienne.ci.saref.SAREFPipeline.Mode;

import fr.emse.gitlab.saref.gui.MainFrame;

import fr.mines_stetienne.ci.saref.gui.MainFrame;

import fr.emse.gitlab.saref.managers.RepositoryManager;

import fr.mines_stetienne.ci.saref.managers.RepositoryManager;

import fr.emse.gitlab.saref.tests.TestSuites;

import fr.mines_stetienne.ci.saref.tests.TestSuites;





/**

/**

 *

 *

src/main/java/fr/emse/gitlab/saref/SAREF.java→src/main/java/fr/mines_stetienne/ci/saref/SAREF.java

+7 −6
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 

 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 */

 */

package fr.emse.gitlab.saref;

package fr.mines_stetienne.ci.saref;





import java.io.File;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileInputStream;
@@ -40,11 +40,11 @@ import org.apache.jena.atlas.RuntimeIOException; 
import org.apache.jena.riot.Lang;

import org.apache.jena.riot.Lang;

import org.slf4j.Logger;

import org.slf4j.Logger;





import fr.emse.gitlab.saref.entities.SAREFCore;

import fr.mines_stetienne.ci.saref.entities.SAREFCore;

import fr.emse.gitlab.saref.entities.SAREFExtension;

import fr.mines_stetienne.ci.saref.entities.SAREFExtension;

import fr.emse.gitlab.saref.entities.SAREFNamedGraph;

import fr.mines_stetienne.ci.saref.entities.SAREFNamedGraph;

import fr.emse.gitlab.saref.entities.SAREFProject;

import fr.mines_stetienne.ci.saref.entities.SAREFProject;

import fr.emse.gitlab.saref.entities.SAREFVersionName;

import fr.mines_stetienne.ci.saref.entities.SAREFVersionName;





/**

/**

*

*
@@ -70,6 +70,7 @@ public class SAREF { 
	public static final String NAME_SOURCES = "sources";

	public static final String NAME_SOURCES = "sources";

	public static final String NAME_SOURCES_PORTAL = "portal";

	public static final String NAME_SOURCES_PORTAL = "portal";





	public static final boolean IGNORE_OOPS = true;

	

	

	// project acronym

	// project acronym

	public static final String REGEX_ACRONYM_VAR = "acronym";

	public static final String REGEX_ACRONYM_VAR = "acronym";