Skip to content

Commit

Permalink
Merge branch 'od11.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@vrichard12
vrichard12 committed Aug 24, 2020
2 parents edf0f1e + 2b740e5 commit 649cf87
Show file tree
Hide file tree
Showing 648 changed files with 1,658,123 additions and 12,797 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.repositoryMaven/
bin/
*~
*.rej
Expand Down
4 changes: 2 additions & 2 deletions addons/cinematic/features/fr.gouv.mindef.safran.cinematic.gen.html.feature/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/cinematic/plugins/fr.gouv.mindef.safran.cinematic.gen.html.ui/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
8 changes: 4 additions & 4 deletions addons/cinematic/plugins/fr.gouv.mindef.safran.cinematic.gen.html/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand All @@ -31,8 +31,8 @@
<plugins>
<plugin>
<groupId>org.eclipse.acceleo</groupId>
<artifactId>org.eclipse.acceleo.maven.compatibility</artifactId>
<version>3.6.4-SNAPSHOT</version>
<artifactId>org.eclipse.acceleo.maven</artifactId>
<version>3.6.4</version>
<executions>
<execution>
<phase>compile</phase>
Expand Down
14 changes: 1 addition & 13 deletions ...def.safran.cinematic.gen.html/src/fr/gouv/mindef/safran/cinematic/gen/html/main/Main.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2008, 2019 Obeo.
* Copyright (c) 2008, 2020 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -346,18 +346,6 @@ public String[] getTemplateNames() {
@Override
public void registerPackages(ResourceSet resourceSet) {
super.registerPackages(resourceSet);
if (!isInWorkspace(org.obeonetwork.dsl.cinematic.CinematicPackage.class)) {
resourceSet.getPackageRegistry().put(org.obeonetwork.dsl.cinematic.CinematicPackage.eINSTANCE.getNsURI(), org.obeonetwork.dsl.cinematic.CinematicPackage.eINSTANCE);
}
if (!isInWorkspace(org.obeonetwork.dsl.cinematic.view.ViewPackage.class)) {
resourceSet.getPackageRegistry().put(org.obeonetwork.dsl.cinematic.view.ViewPackage.eINSTANCE.getNsURI(), org.obeonetwork.dsl.cinematic.view.ViewPackage.eINSTANCE);
}
if (!isInWorkspace(org.obeonetwork.dsl.cinematic.flow.FlowPackage.class)) {
resourceSet.getPackageRegistry().put(org.obeonetwork.dsl.cinematic.flow.FlowPackage.eINSTANCE.getNsURI(), org.obeonetwork.dsl.cinematic.flow.FlowPackage.eINSTANCE);
}
if (!isInWorkspace(org.obeonetwork.dsl.cinematic.toolkits.ToolkitsPackage.class)) {
resourceSet.getPackageRegistry().put(org.obeonetwork.dsl.cinematic.toolkits.ToolkitsPackage.eINSTANCE.getNsURI(), org.obeonetwork.dsl.cinematic.toolkits.ToolkitsPackage.eINSTANCE);
}

/*
* If you want to change the content of this method, do NOT forget to change the "@generated"
Expand Down
56 changes: 28 additions & 28 deletions addons/cinematic/plugins/fr.gouv.mindef.safran.cinematic.gen.html/tasks/main.xml
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="main" name="fr.gouv.mindef.safran.cinematic.gen.html">
<property name="ECLIPSE_HOME" value="../../../../../../../_DEV/OD4IS/tools/ObeoDesigner-Team"/>
<property name="ECLIPSE_WORKSPACE" value="../../../../../../../_DEV/OD4IS/workspaces/runtime-New_configuration"/>
<property name="ECLIPSE_HOME" value="../../../../../../../../../eclipse/ObeoDesigner/OD_11/Migration IS/OD-11.3.0"/>
<property name="ECLIPSE_WORKSPACE" value="../../../../../../../../../eclipse/ObeoDesigner/OD_11/Migration IS/OD-11.3.0/workspace"/>

<!-- The classpath with only the dependencies used by the project -->
<path id="fr.gouv.mindef.safran.cinematic.gen.html.libraryclasspath">
<pathelement location="${ECLIPSE_WORKSPACE}/fr.gouv.mindef.safran.cinematic.gen.html/bin"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.14.0.v20180417-0825.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.15.300.v20190508-0543.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.13.0.v20180409-1500.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.1.100.v20180331-1743.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.10.0.v20180412-1130.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.10.0.v20180427-1454.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.8.0.v20180426-1327.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.7.100.v20180510-1129.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.7.0.v20180426-1644.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.500.v20171221-2204.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.14.0.v20180529-1144.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.14.0.v20180527-1134.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.cdo_4.6.100.v20180919-1309.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.cdo.common_4.7.0.v20180919-1309.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.12.0.v20180125-1130.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.14.0.v20180129-1548.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.net4j.util_3.8.0.v20180919-1309.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.9.0.v20180611-1119.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.1.500.v20190516-1407.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.10.400.v20190516-1504.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.10.400.v20190506-1457.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.8.400.v20190516-1504.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.7.400.v20190516-1504.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.7.300.v20190215-2048.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.4.200.v20190516-1504.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.19.0.v20190822-1451.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.16.0.v20190625-1131.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.cdo_4.6.100.v20191029-1530.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.cdo.common_4.7.0.v20191029-1530.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.14.0.v20190528-0725.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.16.0.v20190528-0725.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.net4j.util_3.8.0.v20191029-1530.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.10.300.v20190603-1146.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.4.300.v20180611-1119.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.9.0.v20180611-1119.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.7.4.201807201001.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.7.4.201807201001.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.7.4.201807201001.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.7.4.201807201001.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.7.4.201807201001.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.14.0.v20180418-0836.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.13.0.v20180319-0813.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.8.300.v20190603-1146.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.10.300.v20190603-1146.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.7.8.201902261618.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.7.8.201902261618.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.7.8.201902261618.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.7.8.201902261618.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.7.8.201902261618.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.19.0.v20190822-1451.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.19.0.v20190821-1536.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/com.google.guava_21.0.0.v20170206-1425.jar"/>
</path>

Expand Down
4 changes: 2 additions & 2 deletions addons/graalextensions/features/fr.gouv.mindef.safran.graal.extensions.feature/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/graalextensions/plugins/fr.gouv.mindef.safran.graal.extensions.edit/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/graalextensions/plugins/fr.gouv.mindef.safran.graal.extensions/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/lifecycle/features/fr.gouv.mindef.safran.project.lifecycle.feature/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/lifecycle/plugins/fr.gouv.mindef.safran.project.lifecycle.doc/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/lifecycle/plugins/fr.gouv.mindef.safran.project.lifecycle.ui/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/lifecycle/plugins/fr.gouv.mindef.safran.project.lifecycle/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/scaffolding/features/fr.gouv.mindef.safran.database.scaffold.feature/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/scaffolding/features/fr.gouv.mindef.safran.database.ui.feature/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/scaffolding/plugins/fr.gouv.mindef.safran.database.doc/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/scaffolding/plugins/fr.gouv.mindef.safran.database.scaffold.edit/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/scaffolding/plugins/fr.gouv.mindef.safran.database.scaffold.editor/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/scaffolding/plugins/fr.gouv.mindef.safran.database.scaffold/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions addons/scaffolding/plugins/fr.gouv.mindef.safran.database.tests/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2019 Obeo.
Copyright (c) 2017, 2020 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.obeonetwork</groupId>
<artifactId>parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.3.0-SNAPSHOT</version>
<relativePath>../../../../releng/org.obeonetwork.informationsystem.parent/pom.xml</relativePath>
</parent>

Expand Down
Loading

0 comments on commit 649cf87

Please sign in to comment.