Extractor Modules / Taverna Extractor / Diff of /pom.xml

Diff of /pom.xml [73c6e7] .. [b8d08d]

Switch to unified view


...
    <modelVersion>4.0.0</modelVersion>
    <groupId>net.timbusproject</groupId>
    <artifactId>tavernaextractor</artifactId>
    <packaging>${packaging.type}</packaging>
    <name>TavernaExtractor</name>
    <version>1.0</version>

    <properties>
       <!--<osgi.scope></osgi.scope> --><!-- set in OSGi profile -->


        <compiler.version>1.7</compiler.version>
        <springframework.version>3.2.3.RELEASE</springframework.version>
        <osgi.version>4.3.1</osgi.version>
        <jettison.version>1.3.4</jettison.version>
        <jcraft.version>0.1.41</jcraft.version>
...
        <dependency>
            <groupId>org.codehaus.jettison</groupId>
            <artifactId>jettison</artifactId>
            <version>${jettison.version}</version>
            <!--<scope>${osgi.scope}</scope>-->

        </dependency>

       <dependency>
            <groupId>com.jcraft.jsch</groupId>
            <artifactId>com.springsource.com.jcraft.jsch</artifactId>
            <version>${jcraft.version}</version>
            <scope>${osgi.scope}</scope>

       </dependency>

        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-core</artifactId>
            <version>${springframework.version}</version>
            <scope>${osgi.scope}</scope>
        </dependency>

        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-context</artifactId>
            <version>${springframework.version}</version>
            <scope>${osgi.scope}</scope>
        </dependency>

        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-tx</artifactId>
            <version>${springframework.version}</version>
            <scope>${osgi.scope}</scope>
        </dependency>

        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-orm</artifactId>
            <version>${springframework.version}</version>
            <scope>${osgi.scope}</scope>
        </dependency>

       <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-jdbc</artifactId>
            <version>${springframework.version}</version>
           <scope>${osgi.scope}</scope>
        </dependency>

        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-aop</artifactId>
            <version>${springframework.version}</version>
            <scope>${osgi.scope}</scope>
        </dependency>
        <!-- END OSGi relevant dependencies -->

        <dependency>
            <groupId>org.hibernate</groupId>
            <artifactId>hibernate-commons-annotations</artifactId>
            <version>${hibernate.commons.version}</version>










































        </dependency>

        <dependency>
            <groupId>uk.gov.nationalarchives</groupId>
            <artifactId>droid-command-line</artifactId>

	a/pom.xml		b/pom.xml
	...		...
3	<modelVersion>4.0.0</modelVersion>	3	<modelVersion>4.0.0</modelVersion>
4	<groupId>net.timbusproject</groupId>	4	<groupId>net.timbusproject</groupId>
5	<artifactId>tavernaextractor</artifactId>	5	<artifactId>tavernaextractor</artifactId>
6	<packaging>${packaging.type}</packaging>	6	<packaging>${packaging.type}</packaging>
7	<name>TavernaExtractor</name>	7	<name>TavernaExtractor</name>
8	<version>1.0-SNAPSHOT</version>	8	<version>1.0</version>
9		9
10	<properties>	10	<properties>
11		11	<!--<osgi.scope></osgi.scope> --><!-- set in OSGi profile -->
12	<!--<osgi.scope>compile</osgi.scope> --><!-- for local packaging -->
13	<!--<osgi.scope>provided</osgi.scope>-->
14	<compiler.version>1.7</compiler.version>	12	<compiler.version>1.7</compiler.version>
15	<springframework.version>3.2.3.RELEASE</springframework.version>	13	<springframework.version>3.2.3.RELEASE</springframework.version>
16	<osgi.version>4.3.1</osgi.version>	14	<osgi.version>4.3.1</osgi.version>
17	<jettison.version>1.3.4</jettison.version>	15	<jettison.version>1.3.4</jettison.version>
18	<jcraft.version>0.1.41</jcraft.version>	16	<jcraft.version>0.1.41</jcraft.version>
	...		...
64	<dependency>	62	<dependency>
65	<groupId>org.codehaus.jettison</groupId>	63	<groupId>org.codehaus.jettison</groupId>
66	<artifactId>jettison</artifactId>	64	<artifactId>jettison</artifactId>
67	<version>${jettison.version}</version>	65	<version>${jettison.version}</version>
68	<!--<scope>${osgi.scope}</scope>-->	66	<!--<scope>${osgi.scope}</scope>-->
69	<!-- is it provided -->
70	</dependency>	67	</dependency>
71		68
72	<dependency>	69	<dependency>
73	<groupId>com.jcraft.jsch</groupId>	70	<groupId>com.jcraft.jsch</groupId>
74	<artifactId>com.springsource.com.jcraft.jsch</artifactId>	71	<artifactId>com.springsource.com.jcraft.jsch</artifactId>
75	<version>${jcraft.version}</version>	72	<version>${jcraft.version}</version>
76	<scope>${osgi.scope}</scope>	73	<scope>${osgi.scope}</scope>
77	<!-- is it provided -->
78	</dependency>	74	</dependency>
		75
		76	<dependency>
		77	<groupId>org.springframework</groupId>
		78	<artifactId>spring-core</artifactId>
		79	<version>${springframework.version}</version>
		80	<scope>${osgi.scope}</scope>
		81	</dependency>
		82
		83	<dependency>
		84	<groupId>org.springframework</groupId>
		85	<artifactId>spring-context</artifactId>
		86	<version>${springframework.version}</version>
		87	<scope>${osgi.scope}</scope>
		88	</dependency>
		89
		90	<dependency>
		91	<groupId>org.springframework</groupId>
		92	<artifactId>spring-tx</artifactId>
		93	<version>${springframework.version}</version>
		94	<scope>${osgi.scope}</scope>
		95	</dependency>
		96
		97	<dependency>
		98	<groupId>org.springframework</groupId>
		99	<artifactId>spring-orm</artifactId>
		100	<version>${springframework.version}</version>
		101	<scope>${osgi.scope}</scope>
		102	</dependency>
		103
		104	<dependency>
		105	<groupId>org.springframework</groupId>
		106	<artifactId>spring-jdbc</artifactId>
		107	<version>${springframework.version}</version>
		108	<scope>${osgi.scope}</scope>
		109	</dependency>
		110
		111	<dependency>
		112	<groupId>org.springframework</groupId>
		113	<artifactId>spring-aop</artifactId>
		114	<version>${springframework.version}</version>
		115	<scope>${osgi.scope}</scope>
		116	</dependency>
79	<!-- END OSGi relevant dependencies -->	117	<!-- END OSGi relevant dependencies -->
80		118
81	<dependency>	119	<dependency>
82	<groupId>org.hibernate</groupId>	120	<groupId>org.hibernate</groupId>
83	<artifactId>hibernate-commons-annotations</artifactId>	121	<artifactId>hibernate-commons-annotations</artifactId>
84	<version>${hibernate.commons.version}</version>	122	<version>${hibernate.commons.version}</version>
85	</dependency>
86
87	<dependency>
88	<groupId>org.springframework</groupId>
89	<artifactId>spring-core</artifactId>
90	<version>${springframework.version}</version>
91	<scope>${osgi.scope}</scope>
92	</dependency>
93
94	<dependency>
95	<groupId>org.springframework</groupId>
96	<artifactId>spring-context</artifactId>
97	<version>${springframework.version}</version>
98	<scope>${osgi.scope}</scope>
99	</dependency>
100
101	<dependency>
102	<groupId>org.springframework</groupId>
103	<artifactId>spring-tx</artifactId>
104	<version>${springframework.version}</version>
105	<scope>${osgi.scope}</scope>
106	</dependency>
107
108	<dependency>
109	<groupId>org.springframework</groupId>
110	<artifactId>spring-orm</artifactId>
111	<version>${springframework.version}</version>
112	<scope>${osgi.scope}</scope>
113	</dependency>
114
115	<dependency>
116	<groupId>org.springframework</groupId>
117	<artifactId>spring-jdbc</artifactId>
118	<version>${springframework.version}</version>
119	<scope>${osgi.scope}</scope>
120	</dependency>
121
122	<dependency>
123	<groupId>org.springframework</groupId>
124	<artifactId>spring-aop</artifactId>
125	<version>${springframework.version}</version>
126	<scope>${osgi.scope}</scope>
127	</dependency>	123	</dependency>
128		124
129	<dependency>	125	<dependency>
130	<groupId>uk.gov.nationalarchives</groupId>	126	<groupId>uk.gov.nationalarchives</groupId>
131	<artifactId>droid-command-line</artifactId>	127	<artifactId>droid-command-line</artifactId>