Skip to content

Commit

Permalink
FIPS-8557/FIPS-8593 :: #9 : Use Maven dependecies instead of custom u…
Browse files Browse the repository at this point in the history 
…pdate-site

Change-Id: I7b7f95c09b155da1d986622ea885f40609c2ec41
  • Loading branch information
@hd42
Christoph Läubrich authored and hd42 committed Feb 15, 2022
1 parent ac9111b commit 347bc6c
Show file tree
Hide file tree
Showing 19 changed files with 341 additions and 35 deletions.
4 changes: 3 additions & 1 deletion org.faktorips.abstracttest/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ bin.includes = META-INF/,\
LICENSE.txt

src.includes = agpl-3.0.txt,\
LICENSE.txt
LICENSE.txt
additional.bundles = org.hamcrest.core,\
org.mockito.mockito-core
295 changes: 279 additions & 16 deletions org.faktorips.aggregator/targets/2019-03/eclipse-2019-03.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="Target for Faktor-IPS Base (2019-03)" sequenceNumber="261">
<target name="Target for Faktor-IPS Base (2019-03)" sequenceNumber="262">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.google.inject" version="0.0.0"/>
Expand Down Expand Up @@ -39,24 +39,287 @@
<unit id="org.eclipse.xsd.feature.group" version="0.0.0"/>
<unit id="org.slf4j.api" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<repository location="https://update.faktorzehn.org/p2repositories/2019-03/"/>
<repository location="https://update.faktorzehn.org/p2repositories/2019-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="de.faktorzehn.thirdparty.libs.feature.group" version="0.0.0"/>
<repository location="https://drone.faktorzehn.de/p2/thirdparty-1.7"/>
<repository location="https://update.faktorzehn.org/p2repositories/egit/updates-5.3/"/>
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://update.faktorzehn.org/p2repositories/babel/2018-12"/>
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_modeling.emf_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_technology.egit_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_technology.jgit_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_tools.gef_de.feature.group" version="0.0.0"/>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Maven Library Bundles" missingManifest="error" type="Maven">
<dependencies>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.2.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>3.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
<version>1.2.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<version>3.0.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-tools</artifactId>
<version>3.0.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-jxc</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>1.2.15</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.8.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.4.0-b180830.0359</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>3.0.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.joda</groupId>
<artifactId>joda-convert</artifactId>
<version>1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.joda</groupId>
<artifactId>joda-convert</artifactId>
<version>1.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
<version>1.8</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>1.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.2</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Wrapped Mapen Dependecies" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>com.sun.xml.bind.external</groupId>
<artifactId>relaxng-datatype</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.bind.external</groupId>
<artifactId>rngom</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.dtd-parser</groupId>
<artifactId>dtd-parser</artifactId>
<version>1.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>2.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>codemodel</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>xsom</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
</dependencies>
<instructions><![CDATA[
Bundle-Name: Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: ${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
DynamicImport-Package: *
]]></instructions>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Fix Hamcrest" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<type>jar</type>
</dependency>
</dependencies>
<instructions><![CDATA[
Bundle-Name: hamcrest-core derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion} without split-packages
Bundle-SymbolicName: org.hamcrest.core
Export-Package: org.hamcrest;version="1.3.0",org.hamcrest.core;version="1.3.0",org.hamcrest.internal;version="1.3.0";x-internal:=true
Bundle-Version: 1.3.0.zz-NO-SPLIT_PCK-v201303031735
]]></instructions>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://update.faktorzehn.org/p2repositories/babel/2018-12"/>
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_modeling.emf_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_technology.egit_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_technology.jgit_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_tools.gef_de.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://update.faktorzehn.org/p2repositories/egit/updates-5.3/"/>
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="0.0.0"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<launcherArgs>
Expand Down
10 changes: 7 additions & 3 deletions org.faktorips.devtools.core.refactor.test/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@ Bundle-Version: 22.6.0.qualifier
Bundle-Localization: plugin
Fragment-Host: org.faktorips.devtools.core.refactor
Require-Bundle: org.faktorips.devtools.stdbuilder,
org.faktorips.abstracttest.core;bundle-version="21.6.0",
org.hamcrest.core;bundle-version="1.3.0",
org.mockito.mockito-core
org.faktorips.abstracttest.core;bundle-version="21.6.0"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: Faktor Zehn GmbH
Import-Package: org.junit;version="4.5.0",
org.hamcrest;version="1.3.0",
org.hamcrest.core;version="1.3.0",
org.mockito;version="1.9.5",
org.mockito.runners;version="1.9.5",
org.mockito.stubbing;version="1.9.5",
org.mockito.verification;version="1.9.5",
org.faktorips.testsupport

2 changes: 2 additions & 0 deletions org.faktorips.devtools.core.refactor.test/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ bin.includes = META-INF/,\
LICENSE.txt
src.includes = agpl-3.0.txt,\
LICENSE.txt
additional.bundles = org.hamcrest.core,\
org.mockito.mockito-core
compilerArg=-g
2 changes: 2 additions & 0 deletions org.faktorips.devtools.core.test/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ compilerArg=-g

src.includes = agpl-3.0.txt,\
LICENSE.txt
additional.bundles = org.hamcrest.core,\
org.mockito.mockito-core
5 changes: 3 additions & 2 deletions org.faktorips.devtools.core.ui.test/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ Bundle-SymbolicName: org.faktorips.devtools.core.ui.test
Bundle-Version: 22.6.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.faktorips.devtools.core.ui
Require-Bundle: org.faktorips.abstracttest,
org.hamcrest.core;bundle-version="1.3.0"
Require-Bundle: org.faktorips.abstracttest
Import-Package: org.faktorips.testsupport,
org.hamcrest;version="1.3.0",
org.hamcrest.core;version="1.3.0",
org.junit;version="4.5.0",
org.junit.runner;version="4.5.0",
org.mockito,
Expand Down
4 changes: 3 additions & 1 deletion org.faktorips.devtools.core.ui.test/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ bin.includes = META-INF/,\
LICENSE.txt

src.includes = agpl-3.0.txt,\
LICENSE.txt
LICENSE.txt
additional.bundles = org.mockito.mockito-core,\
org.hamcrest.core
2 changes: 2 additions & 0 deletions org.faktorips.devtools.htmlexport.test/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ bin.includes = META-INF/,\

src.includes = agpl-3.0.txt,\
LICENSE.txt
additional.bundles = org.hamcrest.core,\
org.mockito.mockito-core
2 changes: 2 additions & 0 deletions org.faktorips.devtools.model.builder.test/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ compilerArg=-g

src.includes = agpl-3.0.txt,\
LICENSE.txt
additional.bundles = org.hamcrest.core,\
org.mockito.mockito-core
2 changes: 2 additions & 0 deletions org.faktorips.devtools.model.decorators.test/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ compilerArg=-g

src.includes = agpl-3.0.txt,\
LICENSE.txt
additional.bundles = org.hamcrest.core,\
org.mockito.mockito-core
2 changes: 2 additions & 0 deletions org.faktorips.devtools.model.test/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ compilerArg=-g

src.includes = agpl-3.0.txt,\
LICENSE.txt
additional.bundles = org.hamcrest.core,\
org.mockito.mockito-core
Loading

0 comments on commit 347bc6c

Please sign in to comment.